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/10/01 16:57:04 UTC
[logging-chainsaw] branch master updated (809821a -> 6e2d8e4)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
from 809821a replaced SmallButtons with builder
new 359b94a proper use of logging
new 1f48355 removed unclosed html tag
new 93bd884 corrected javadoc
new 28e93e6 removed "default" constructor
new 5539ed2 removed empty comment
new 6e2d8e4 removed: useless updateReceiverTreeInDispatchThread method
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../log4j/chainsaw/receivers/ReceiversPanel.java | 74 ++++++----------------
1 file changed, 19 insertions(+), 55 deletions(-)
[logging-chainsaw] 06/06: removed: useless updateReceiverTreeInDispatchThread method
Posted by gr...@apache.org.
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 6e2d8e4aaf0dcfb1bf69f9267001a955621b689a
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 18:56:58 2023 +0200
removed: useless updateReceiverTreeInDispatchThread method
---
.../log4j/chainsaw/receivers/ReceiversPanel.java | 57 ++++++----------------
1 file changed, 14 insertions(+), 43 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index 55dbaef..c5434fe 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -17,23 +17,31 @@
package org.apache.log4j.chainsaw.receivers;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.log4j.chainsaw.ChainsawReceiver;
+import org.apache.log4j.chainsaw.ChainsawReceiverFactory;
+import org.apache.log4j.chainsaw.ChainsawStatusBar;
+import org.apache.log4j.chainsaw.LogUI;
import org.apache.log4j.chainsaw.PopupListener;
import org.apache.log4j.chainsaw.SmallButton;
import org.apache.log4j.chainsaw.help.HelpManager;
import org.apache.log4j.chainsaw.helper.SwingHelper;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
import org.apache.log4j.chainsaw.icons.LevelIconFactory;
-import org.apache.log4j.chainsaw.icons.LineIconFactory;
+import org.apache.log4j.chainsaw.logevents.Level;
import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SettingsListener;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
-import org.apache.log4j.net.SocketNodeEventListener;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.event.TreeWillExpandListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreePath;
@@ -48,11 +56,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
-import org.apache.log4j.chainsaw.ChainsawReceiver;
-import org.apache.log4j.chainsaw.LogUI;
-import org.apache.log4j.chainsaw.ChainsawReceiverFactory;
-import org.apache.log4j.chainsaw.ChainsawStatusBar;
-import org.apache.log4j.chainsaw.logevents.Level;
/**
@@ -308,7 +311,6 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
rx.start();
}
- updateReceiverTreeInDispatchThread();
m_statusBar.setMessage(
"All Receivers have been (re)started");
}).start();
@@ -331,8 +333,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
receiversTree.addMouseListener(popupListener);
this.addMouseListener(popupListener);
- JComponent component = receiversTree;
- JScrollPane pane = new JScrollPane(component);
+ JScrollPane pane = new JScrollPane(receiversTree);
splitter.setOrientation(JSplitPane.VERTICAL_SPLIT);
@@ -342,21 +343,6 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
splitter.setResizeWeight(0.7);
add(buttonPanel, BorderLayout.NORTH);
add(splitter, BorderLayout.CENTER);
-
- /**
- * This Tree likes to be notified when Socket's are accepted so
- * we listen for them and update the Tree.
- */
- SocketNodeEventListener listener =
- new SocketNodeEventListener() {
- public void socketOpened(String remoteInfo) {
- updateReceiverTreeInDispatchThread();
- }
-
- public void socketClosedEvent(Exception e) {
- updateReceiverTreeInDispatchThread();
- }
- };
}
private void saveReceivers() {
@@ -525,21 +511,6 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
}
}
- /**
- * Ensures that the Receiver tree is updated with the latest information
- * and that this operation occurs in the Swing Event Dispatch thread.
- */
- public void updateReceiverTreeInDispatchThread() {
- logger.debug(
- "updateReceiverTreeInDispatchThread, should not be needed now");
-
- // if (SwingUtilities.isEventDispatchThread()) {
- // updateReceiverTree.run();
- // } else {
- // SwingUtilities.invokeLater(updateReceiverTree);
- // }
- }
-
/* (non-Javadoc)
* @see java.awt.Component#setVisible(boolean)
*/
[logging-chainsaw] 03/06: corrected javadoc
Posted by gr...@apache.org.
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 93bd884938bfed6a4d8de6a76a5364f300f2a66c
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 18:56:17 2023 +0200
corrected javadoc
---
src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index 52c29cc..5b02d0d 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -587,12 +587,12 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
dialog.pack();
SwingHelper.centerOnScreen(dialog);
- /**
+ /*
* Make the default button the ok button
*/
dialog.getRootPane().setDefaultButton(panel.getOkPanel().getOkButton());
- /**
+ /*
* Use the standard Cancel metaphor
*/
SwingHelper.configureCancelForDialog(dialog, panel.getOkPanel().getCancelButton());
[logging-chainsaw] 05/06: removed empty comment
Posted by gr...@apache.org.
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 5539ed2617ab7e91e3aff967cd4378d7f92805d4
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 18:56:36 2023 +0200
removed empty comment
---
src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index ac4216b..55dbaef 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -658,9 +658,6 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
super.show(invoker, x, y);
}
- /**
- *
- */
private DefaultMutableTreeNode getRootOfTree() {
return (DefaultMutableTreeNode) receiversTree.getModel().getRoot();
}
@@ -670,7 +667,6 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
* Receiver node in the Tree.
*/
private void buildForReceiverNode() {
-
add(playReceiverButtonAction);
add(pauseReceiverButtonAction);
add(restartReceiverButtonAction);
[logging-chainsaw] 04/06: removed "default" constructor
Posted by gr...@apache.org.
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 28e93e61dddf8c797110fc6d9bb6e913e5be5c1d
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 18:56:26 2023 +0200
removed "default" constructor
---
src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index 5b02d0d..ac4216b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -630,9 +630,6 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
* @author Paul Smith <psmith@apache.org>
*/
class ReceiverPopupMenu extends JPopupMenu {
- ReceiverPopupMenu() {
- }
-
/* (non-Javadoc)
* @see javax.swing.JPopupMenu#show(java.awt.Component, int, int)
*/
[logging-chainsaw] 02/06: removed unclosed html tag
Posted by gr...@apache.org.
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 1f48355b62200efbfea418362b1c4d55e9684d44
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 18:56:03 2023 +0200
removed unclosed html tag
---
src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index 1d432e0..52c29cc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -451,7 +451,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
* Takes the currently selected Receiver and pauess it, effectively
* discarding any received event BEFORE it is even posted to the logger
* repository.
- * <p>
+ *
* The user is NOT asked to confirm this operation
*/
private void pauseCurrentlySelectedReceiver() {
@@ -471,7 +471,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
/**
* Takes the currently selected Receiver and stops it, which effectively
* removes it from the PluginRegistry.
- * <p>
+ *
* The user is asked to confirm this operation
*/
private void shutdownCurrentlySelectedReceiver() {
[logging-chainsaw] 01/06: proper use of logging
Posted by gr...@apache.org.
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 359b94ae3fd82992441a152f009aa576632c949b
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Sun Oct 1 18:55:47 2023 +0200
proper use of logging
---
src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index ae67661..1d432e0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -146,7 +146,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
(node != null) && (node.getUserObject() != null)
&& (node.getUserObject() instanceof ChainsawReceiver)) {
ChainsawReceiver p = (ChainsawReceiver) node.getUserObject();
- logger.debug("plugin=" + p);
+ logger.debug("plugin={}", p);
pluginEditorPanel.setReceiverAndProperties(p,
m_classToProperties.get(p.getClass()));
} else {