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 3bb9516652451d28c374920ecaada28086bb6bb0 Author: Christian Grobmeier <[email protected]> AuthorDate: Sun Dec 17 18:55:29 2023 +0100 removed initPrefModelListener --- .../apache/log4j/chainsaw/ChainsawStatusBar.java | 13 ++++++- .../log4j/chainsaw/ChainsawToolBarAndMenus.java | 10 ++++++ .../org/apache/log4j/chainsaw/logui/LogUI.java | 40 ++++++---------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java index 013e729..a35c33f 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java +++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java @@ -17,6 +17,8 @@ package org.apache.log4j.chainsaw; +import org.apache.commons.configuration2.AbstractConfiguration; +import org.apache.commons.configuration2.event.ConfigurationEvent; import org.apache.log4j.chainsaw.icons.ChainsawIcons; import org.apache.log4j.chainsaw.logui.LogUI; @@ -51,9 +53,18 @@ public class ChainsawStatusBar extends JPanel { BorderFactory.createLineBorder(statusMsg.getBackground().darker()); private final LogUI logUI; - public ChainsawStatusBar(LogUI logUI) { + public ChainsawStatusBar(LogUI logUI, AbstractConfiguration configuration) { setLayout(new GridBagLayout()); this.logUI = logUI; + + configuration.addEventListener(ConfigurationEvent.SET_PROPERTY, + evt -> { + if (evt.getPropertyName().equals("statusBar")) { + boolean value = (Boolean) evt.getPropertyValue(); + setVisible(value); + } + }); + nf.setMaximumFractionDigits(0); nf.setMinimumFractionDigits(0); nf.setGroupingUsed(false); diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java index 88d0b24..b65f2f3 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java +++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java @@ -131,6 +131,16 @@ public class ChainsawToolBarAndMenus implements ChangeListener { createMenuBar(); createToolbar(); + configuration.addEventListener(ConfigurationEvent.SET_PROPERTY, + evt -> { + if (evt.getPropertyName().equals("toolbar")) { + boolean value = (Boolean) evt.getPropertyValue(); + toolbar.setVisible(value); + } + }); + boolean showToolbar = configuration.getBoolean("toolbar", true); + toolbar.setVisible(showToolbar); + logPanelSpecificActions = new Action[]{ pauseAction, findNextColorizedEventAction, findPreviousColorizedEventAction, diff --git a/src/main/java/org/apache/log4j/chainsaw/logui/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/logui/LogUI.java index 45988aa..7425e2f 100644 --- a/src/main/java/org/apache/log4j/chainsaw/logui/LogUI.java +++ b/src/main/java/org/apache/log4j/chainsaw/logui/LogUI.java @@ -147,7 +147,10 @@ public class LogUI extends JFrame { private void initGUI() { setupHelpSystem(); - statusBar = new ChainsawStatusBar(this); + statusBar = new ChainsawStatusBar(this, configuration); + + boolean showStatusBar = configuration.getBoolean("statusBar", true); + setStatusBarVisible(showStatusBar); this.chainsawToolBarAndMenus = new ChainsawToolBarAndMenus(this, configuration); toolbar = chainsawToolBarAndMenus.getToolbar(); @@ -352,9 +355,13 @@ public class LogUI extends JFrame { final PopupListener tabPopupListener = new PopupListener(tabPopup); tabbedPane.addMouseListener(tabPopupListener); - initPrefModelListeners(); - setVisible(true); + int tooltipDisplayMillis = configuration.getInt("tooltipDisplayMillis", 4000); + ToolTipManager.sharedInstance().setDismissDelay(tooltipDisplayMillis); + + boolean showToolbar = configuration.getBoolean("toolbar", true); + toolbar.setVisible(showToolbar); + setVisible(true); /* * loads the saved tab settings and if there are hidden tabs, @@ -399,33 +406,6 @@ public class LogUI extends JFrame { logUIPanelBuilder.buildLogPanel(false, "Chainsaw", chainsawAppender.getReceiver()); } - private void initPrefModelListeners() { - int tooltipDisplayMillis = configuration.getInt("tooltipDisplayMillis", 4000); - - ToolTipManager.sharedInstance().setDismissDelay(tooltipDisplayMillis); - - configuration.addEventListener(ConfigurationEvent.SET_PROPERTY, - evt -> { - if (evt.getPropertyName().equals("statusBar")) { - boolean value = (Boolean) evt.getPropertyValue(); - statusBar.setVisible(value); - } - }); - boolean showStatusBar = configuration.getBoolean("statusBar", true); - setStatusBarVisible(showStatusBar); - - configuration.addEventListener(ConfigurationEvent.SET_PROPERTY, - evt -> { - if (evt.getPropertyName().equals("toolbar")) { - boolean value = (Boolean) evt.getPropertyValue(); - toolbar.setVisible(value); - } - }); - boolean showToolbar = configuration.getBoolean("toolbar", true); - toolbar.setVisible(showToolbar); - - } - /** * Exits the application, ensuring Settings are saved. */
