[logging-chainsaw] 01/02: Make sure that chainsaw and zeroconf don't always pop to front

[rmiddleton]

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git

commit b73d132488220db0b5b0f7f61141c5f21d2c27a6
Author: Robert Middleton <robert.middle...@rm5248.com>
AuthorDate: Thu May 26 22:01:08 2022 -0400

    Make sure that chainsaw and zeroconf don't always pop to front
---
 .../org/apache/log4j/chainsaw/ChainsawTabbedPane.java     |  4 ++--
 src/main/java/org/apache/log4j/chainsaw/LogUI.java        | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
index ce79562..9e91cc9 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
@@ -89,11 +89,11 @@ class ChainsawTabbedPane extends JTabbedPane implements 
SettingsListener {
      * @param name
      * @param component
      */
-    public void addANewTab(String name, JComponent component, Icon icon) {
+    public void addANewTab(String name, JComponent component, Icon icon, 
boolean switchToTab) {
         super.insertTab(name, icon, component, null, getTabCount());
 
         super.fireStateChanged();
-        if (!"chainsaw-log".equals(name)) {
+        if (!"chainsaw-log".equals(name) && switchToTab) {
             EventQueue.invokeLater(() -> setSelectedTab(getTabCount() - 1));
         }
     }
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 89e2b51..6e36c26 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -1701,7 +1701,8 @@ public class LogUI extends JFrame implements 
ChainsawViewer, SettingsListener {
                 if (logPanel.isDocked()) {
                     getPanelMap().put(logPanel.getIdentifier(), logPanel);
                     getTabbedPane().addANewTab(
-                        logPanel.getIdentifier(), logPanel, null);
+                        logPanel.getIdentifier(), logPanel, null,
+                            true);
                     
getTabbedPane().setSelectedTab(getTabbedPane().indexOfTab(logPanel.getIdentifier()));
                 } else {
                     getTabbedPane().remove(logPanel);
@@ -1723,16 +1724,16 @@ public class LogUI extends JFrame implements 
ChainsawViewer, SettingsListener {
         SwingUtilities.invokeLater(
             () -> {
                 getTabbedPane().addANewTab(
-                    ident, thisPanel, new 
ImageIcon(ChainsawIcons.ANIM_RADIO_TOWER));
+                    ident,
+                        thisPanel,
+                        new ImageIcon(ChainsawIcons.ANIM_RADIO_TOWER),
+                        false);
                 thisPanel.layoutComponents();
-//                thisPanel.receiveEventBatch(ident, events);
-                if (!getTabbedPane().tabSetting.isChainsawLog()) {
-                    displayPanel("chainsaw-log", false);
-                }
 
                 getTabbedPane().addANewTab(ChainsawTabbedPane.ZEROCONF,
                         m_zeroConf,
-                        new ImageIcon(ChainsawIcons.ANIM_NET_CONNECT));
+                        new ImageIcon(ChainsawIcons.ANIM_NET_CONNECT),
+                        false);
             });
 
         String msg = "added tab " + ident;