You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2023/12/15 15:45:55 UTC
(logging-chainsaw) 03/03: extracted methods for better readability
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit 53cb1cabda4168994442d610537afb8664a2ca15
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Dec 15 16:45:46 2023 +0100
extracted methods for better readability
---
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 125 ++++++++++++---------
1 file changed, 72 insertions(+), 53 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 0a3f420..f220390 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -318,28 +318,8 @@ public class LogUI extends JFrame {
* We listen for double clicks, and auto-undock currently selected Tab if
* the mouse event location matches the currently selected tab
*/
- getTabbedPane().addMouseListener(
- new MouseAdapter() {
- public void mouseClicked(MouseEvent e) {
- super.mouseClicked(e);
-
- if (
- (e.getClickCount() > 1)
- && ((e.getModifiers() & InputEvent.BUTTON1_MASK) > 0)) {
- int tabIndex = getTabbedPane().getSelectedIndex();
-
- if (
- (tabIndex != -1)
- && (tabIndex == getTabbedPane().getSelectedIndex())) {
- LogPanel logPanel = getCurrentLogPanel();
-
- if (logPanel != null) {
- logPanel.undock();
- }
- }
- }
- }
- });
+ MouseAdapter mouseAdapter = createMouseAdapter();
+ getTabbedPane().addMouseListener(mouseAdapter);
panePanel.add(getTabbedPane());
addWelcomePanel();
@@ -371,7 +351,69 @@ public class LogUI extends JFrame {
pack();
- final JPopupMenu tabPopup = new JPopupMenu();
+ JPopupMenu tabPopup = new JPopupMenu();
+
+ Action hideCurrentTabAction = ceateHideCurrentTabAction();
+ Action hideOtherTabsAction = createHideOtherTabsAction();
+ Action showHiddenTabsAction = createShowHiddenTabsAction();
+
+ tabPopup.add(hideCurrentTabAction);
+ tabPopup.add(hideOtherTabsAction);
+ tabPopup.addSeparator();
+ tabPopup.add(showHiddenTabsAction);
+
+ final PopupListener tabPopupListener = new PopupListener(tabPopup);
+ getTabbedPane().addMouseListener(tabPopupListener);
+
+ initPrefModelListeners();
+ setVisible(true);
+
+ if (configuration.getBoolean("showReceivers", false)) {
+ logUiReceiversPanel.showReceiverPanel();
+ } else {
+ logUiReceiversPanel.hideReceiverPanel();
+ }
+
+ /*
+ * loads the saved tab settings and if there are hidden tabs,
+ * hide those tabs out of currently loaded tabs..
+ */
+
+ if (!configuration.getBoolean("displayWelcomeTab", true)) {
+ displayPanel(ChainsawTabbedPane.WELCOME_TAB, false);
+ }
+ if (!configuration.getBoolean("displayZeroconfTab", true)) {
+ displayPanel(ChainsawTabbedPane.ZEROCONF, false);
+ }
+ chainsawToolBarAndMenus.stateChange();
+ }
+
+ private MouseAdapter createMouseAdapter() {
+ MouseAdapter mouseAdapter = new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+ super.mouseClicked(e);
+
+ if (
+ (e.getClickCount() > 1)
+ && ((e.getModifiers() & InputEvent.BUTTON1_MASK) > 0)) {
+ int tabIndex = getTabbedPane().getSelectedIndex();
+
+ if (
+ (tabIndex != -1)
+ && (tabIndex == getTabbedPane().getSelectedIndex())) {
+ LogPanel logPanel = getCurrentLogPanel();
+
+ if (logPanel != null) {
+ logPanel.undock();
+ }
+ }
+ }
+ }
+ };
+ return mouseAdapter;
+ }
+
+ private Action ceateHideCurrentTabAction() {
final Action hideCurrentTabAction =
new AbstractAction("Hide") {
public void actionPerformed(ActionEvent e) {
@@ -384,7 +426,10 @@ public class LogUI extends JFrame {
}
}
};
+ return hideCurrentTabAction;
+ }
+ private Action createHideOtherTabsAction() {
final Action hideOtherTabsAction =
new AbstractAction("Hide Others") {
public void actionPerformed(ActionEvent e) {
@@ -414,7 +459,10 @@ public class LogUI extends JFrame {
}
}
};
+ return hideOtherTabsAction;
+ }
+ private Action createShowHiddenTabsAction() {
Action showHiddenTabsAction =
new AbstractAction("Show All Hidden") {
public void actionPerformed(ActionEvent e) {
@@ -443,36 +491,7 @@ public class LogUI extends JFrame {
}
}
};
-
- tabPopup.add(hideCurrentTabAction);
- tabPopup.add(hideOtherTabsAction);
- tabPopup.addSeparator();
- tabPopup.add(showHiddenTabsAction);
-
- final PopupListener tabPopupListener = new PopupListener(tabPopup);
- getTabbedPane().addMouseListener(tabPopupListener);
-
- initPrefModelListeners();
- setVisible(true);
-
- if (configuration.getBoolean("showReceivers", false)) {
- logUiReceiversPanel.showReceiverPanel();
- } else {
- logUiReceiversPanel.hideReceiverPanel();
- }
-
- /*
- * loads the saved tab settings and if there are hidden tabs,
- * hide those tabs out of currently loaded tabs..
- */
-
- if (!configuration.getBoolean("displayWelcomeTab", true)) {
- displayPanel(ChainsawTabbedPane.WELCOME_TAB, false);
- }
- if (!configuration.getBoolean("displayZeroconfTab", true)) {
- displayPanel(ChainsawTabbedPane.ZEROCONF, false);
- }
- chainsawToolBarAndMenus.stateChange();
+ return showHiddenTabsAction;
}
private void initPrefModelListeners() {