From 94bdf4704acd84fd4cb4a7ab13d89c1208fa138c Mon Sep 17 00:00:00 2001 From: "Robert C. Martin" Date: Thu, 8 Jun 2023 08:16:30 -0500 Subject: [PATCH] at-util -> tabs-util --- src/more_speech/nostr/tab_searcher.clj | 6 +++--- src/more_speech/ui/swing/article_panel_util.clj | 6 +++--- src/more_speech/ui/swing/tabs.clj | 4 ++-- src/more_speech/ui/swing/util.clj | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/more_speech/nostr/tab_searcher.clj b/src/more_speech/nostr/tab_searcher.clj index 5bc6ac6..531ed8d 100644 --- a/src/more_speech/nostr/tab_searcher.clj +++ b/src/more_speech/nostr/tab_searcher.clj @@ -8,7 +8,7 @@ [more-speech.bech32 :as bech32] [more-speech.db.gateway :as gateway] [more-speech.nostr.contact-list :as contact-list] - [more-speech.ui.swing.tabs-util :as at-util] + [more-speech.ui.swing.tabs-util :as tabs-util] [more-speech.config :as config])) (defn get-subject [event] @@ -112,8 +112,8 @@ tree (get-mem [:tab-tree-map tab-name]) model (config tree :model) root-node (.getRoot model) - node (at-util/find-header-node root-node event-id)] - (at-util/select-tree-node tree node)))))) + node (tabs-util/find-header-node root-node event-id)] + (tabs-util/select-tree-node tree node)))))) (defn select-next [tab-name _e] (update-position-and-select tab-name inc-n)) diff --git a/src/more_speech/ui/swing/article_panel_util.clj b/src/more_speech/ui/swing/article_panel_util.clj index 76b0cb4..e07bf58 100644 --- a/src/more_speech/ui/swing/article_panel_util.clj +++ b/src/more_speech/ui/swing/article_panel_util.clj @@ -2,7 +2,7 @@ (:use [seesaw core]) (:require [more-speech.mem :refer :all] [more-speech.ui.swing.util :as util] - [more-speech.ui.swing.tabs-util :as at-util])) + [more-speech.ui.swing.tabs-util :as tabs-util])) (defn display-event [tab-index event-id] (let [tabs-list (get-mem :tabs-list) @@ -12,10 +12,10 @@ (when (some? tree) (let [model (config tree :model) root-node (.getRoot model) - node (at-util/find-header-node root-node event-id)] + node (tabs-util/find-header-node root-node event-id)] (when (some? node) (util/select-tab tab-index) - (at-util/select-tree-node tree node)))))) + (tabs-util/select-tree-node tree node)))))) (defn adjust-back-count [n] (let [event-history (get-mem :event-history) diff --git a/src/more_speech/ui/swing/tabs.clj b/src/more_speech/ui/swing/tabs.clj index 8be79b7..2f56e29 100644 --- a/src/more_speech/ui/swing/tabs.clj +++ b/src/more_speech/ui/swing/tabs.clj @@ -14,7 +14,7 @@ [more-speech.ui.formatters :as formatters] [more-speech.ui.swing.article-panel :as article-panel] [more-speech.ui.swing.edit-window :as edit-window] - [more-speech.ui.swing.tabs-util :as at-util] + [more-speech.ui.swing.tabs-util :as tabs-util] [more-speech.ui.swing.util :as swing-util]) (:use (seesaw [color] [core] [font] [tree])) (:import (javax.swing.tree DefaultMutableTreeNode DefaultTreeModel TreePath))) @@ -157,7 +157,7 @@ (defn add-event-to-tab-tree [tree event-id] (let [model (config tree :model) root (.getRoot model) - insertion-point (at-util/find-chronological-insertion-point root event-id) + insertion-point (tabs-util/find-chronological-insertion-point root event-id) child (DefaultMutableTreeNode. event-id)] (.insertNodeInto model child root insertion-point) (.makeVisible tree (TreePath. (.getPath child))) diff --git a/src/more_speech/ui/swing/util.clj b/src/more_speech/ui/swing/util.clj index c550b9a..94cc583 100644 --- a/src/more_speech/ui/swing/util.clj +++ b/src/more_speech/ui/swing/util.clj @@ -5,7 +5,7 @@ [more-speech.mem :refer :all] [more-speech.nostr.event-dispatcher :as event-handlers] [more-speech.nostr.util :as util] - [more-speech.ui.swing.tabs-util :as at-util]) + [more-speech.ui.swing.tabs-util :as tabs-util]) (:use (seesaw [core]))) (defn clear-popup [popup] @@ -127,7 +127,7 @@ (if (some? tree) (let [model (config tree :model) root-node (.getRoot model)] - (at-util/find-header-node root-node id)) + (tabs-util/find-header-node root-node id)) nil) )) @@ -140,7 +140,7 @@ tree (get-mem [:tab-tree-map tab-name]) node (get-node tab-name id)] (if (some? node) - (at-util/select-tree-node tree node) + (tabs-util/select-tree-node tree node) (loop [tabs (get-mem :tabs-list)] (if (empty? tabs) nil @@ -148,9 +148,9 @@ tree (get-mem [:tab-tree-map tab-name]) model (config tree :model) root-node (.getRoot model) - node (at-util/find-header-node root-node id)] + node (tabs-util/find-header-node root-node id)] (if (some? node) (do (select-tab tab-name) - (at-util/select-tree-node tree node)) + (tabs-util/select-tree-node tree node)) (recur (rest tabs)))))))))