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/09/29 17:13:48 UTC
[logging-chainsaw] branch master updated (a311ec1 -> dfe6fc4)
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 a311ec1 upgraded to log4j 2.20.0
new 544533b organized imports
new 8a69a2c removed final on static methods
new 8aebcce removed unused parameter storage
new d0b2403 removed isGUiFullyInitialized variable as it is never used
new 6e3650f removed commented code
new dfe6fc4 made use of better logging syntax
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:
.../chainsaw/ApplicationPreferenceModelPanel.java | 9 +--
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 72 +++++++++++-----------
2 files changed, 37 insertions(+), 44 deletions(-)
[logging-chainsaw] 02/06: removed final on static methods
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 8a69a2ce41150fd279fb3025a68cf15a18e3d188
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Sep 29 19:09:21 2023 +0200
removed final on static methods
---
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index e3afb4f..dcc4777 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -175,13 +175,13 @@ public class LogUI extends JFrame {
}
}
- private static final void showSplash(Frame owner) {
+ private static void showSplash(Frame owner) {
splash = new ChainsawSplash(owner);
SwingHelper.centerOnScreen(splash);
splash.setVisible(true);
}
- private static final void removeSplash() {
+ private static void removeSplash() {
if (splash != null) {
splash.setVisible(false);
splash.dispose();
[logging-chainsaw] 04/06: removed isGUiFullyInitialized variable as it is never used
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 d0b240321c147cd7a8cb6a5754adc2c71e243c6e
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Sep 29 19:10:22 2023 +0200
removed isGUiFullyInitialized variable as it is never used
---
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 2dbcfeb..0fcb688 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -130,13 +130,6 @@ public class LogUI extends JFrame {
private static org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger();
- /**
- * Set to true, if and only if the GUI has completed it's full
- * initialization. Any logging events that come in must wait until this is
- * true, and if it is false, should wait on the initializationLock object
- * until notified.
- */
- private boolean isGUIFullyInitialized = false;
private final Object initializationLock = new Object();
/**
@@ -798,7 +791,6 @@ public class LogUI extends JFrame {
removeSplash();
synchronized (initializationLock) {
- isGUIFullyInitialized = true;
initializationLock.notifyAll();
}
[logging-chainsaw] 01/06: organized imports
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 544533be39a184ec4e85f177fb3f6bb407b23467
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Sep 29 19:01:45 2023 +0200
organized imports
---
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 55 +++++++++++++---------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index ff90d58..e3afb4f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -17,28 +17,47 @@
package org.apache.log4j.chainsaw;
-import org.apache.log4j.*;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.log4j.chainsaw.color.RuleColorizer;
import org.apache.log4j.chainsaw.dnd.FileDnDTarget;
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.LineIconFactory;
+import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
import org.apache.log4j.chainsaw.osx.OSXIntegration;
-import org.apache.log4j.chainsaw.prefs.*;
+import org.apache.log4j.chainsaw.prefs.SettingsManager;
import org.apache.log4j.chainsaw.receivers.ReceiversPanel;
+import org.apache.log4j.chainsaw.zeroconf.ZeroConfPlugin;
import org.apache.log4j.rule.ExpressionRule;
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.Decoder;
import org.apache.log4j.xml.XMLDecoder;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
import javax.swing.event.HyperlinkEvent;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyChangeListener;
@@ -46,27 +65,19 @@ import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
-import java.security.*;
-import java.util.*;
+import java.security.AllPermission;
+import java.security.CodeSource;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.apache.commons.configuration2.AbstractConfiguration;
-import org.apache.commons.configuration2.event.ConfigurationEvent;
-import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
-import org.apache.log4j.chainsaw.zeroconf.ZeroConfPlugin;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
/**
[logging-chainsaw] 03/06: removed unused parameter storage
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 8aebccebeebca9212c7b5d98c7a0c8d0f7a399b5
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Sep 29 19:09:51 2023 +0200
removed unused parameter storage
---
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index dcc4777..2dbcfeb 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -124,7 +124,6 @@ public class LogUI extends JFrame {
private final List<LogPanel> identifierPanels = new ArrayList<>();
private int dividerSize;
private int cyclicBufferSize;
- private static String configurationURLAppArg;
private List<ChainsawReceiver> m_receivers = new ArrayList<>();
private List<ReceiverEventListener> m_receiverListeners = new ArrayList<>();
private ZeroConfPlugin m_zeroConf = new ZeroConfPlugin();
@@ -215,10 +214,6 @@ public class LogUI extends JFrame {
* @param args
*/
public static void main(String[] args) {
- if (args.length > 0) {
- configurationURLAppArg = args[0];
- }
-
if (OSXIntegration.IS_OSX) {
System.setProperty("apple.laf.useScreenMenuBar", "true");
}
[logging-chainsaw] 05/06: removed commented code
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 6e3650fb07e398390c693edd7ac4eb978e014277
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Sep 29 19:13:32 2023 +0200
removed commented code
---
.../org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
index d88167c..6c9d92e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
@@ -365,9 +365,6 @@ public class ApplicationPreferenceModelPanel extends AbstractPreferencePanel {
responsiveSlider.setPaintTrack(true);
responsiveSlider.setBorder(BorderFactory.createTitledBorder(" Responsiveness "));
-
- // responsiveSlider.setAlignmentY(0);
- // responsiveSlider.setAlignmentX(0);
}
private void setupListeners() {
[logging-chainsaw] 06/06: made use of better logging syntax
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 dfe6fc4e57629942b6ebea99a3875cfaec191f3f
Author: Christian Grobmeier <cg...@grobmeier.de>
AuthorDate: Fri Sep 29 19:13:41 2023 +0200
made use of better logging syntax
---
.../org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
index 6c9d92e..262891a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
@@ -382,9 +382,7 @@ public class ApplicationPreferenceModelPanel extends AbstractPreferencePanel {
int value = (Integer) evt.getPropertyValue();
if (value >= 1000) {
int newValue = (value - 750) / 1000;
- logger.debug(
- "Adjusting old Responsiveness value from " + value + " to "
- + newValue);
+ logger.debug("Adjusting old Responsiveness value from {} to {}", value, newValue);
value = newValue;
}
@@ -428,7 +426,7 @@ public class ApplicationPreferenceModelPanel extends AbstractPreferencePanel {
value = 1;
}
- logger.debug("Adjust responsiveness to " + value);
+ logger.debug("Adjust responsiveness to {}", value);
m_globalConfiguration.setProperty("responsiveness", value);
}
});