(logging-chainsaw) branch master updated: Prevent calling static methods using object

[grobmeier]

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


The following commit(s) were added to refs/heads/master by this push:
     new 32e0490  Prevent calling static methods using object
32e0490 is described below

commit 32e049064ab5a83fafe305b4c7aba09eebc327f0
Author: Christian Grobmeier <c...@grobmeier.de>
AuthorDate: Sat Dec 2 17:12:16 2023 +0100

    Prevent calling static methods using object
---
 src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java       | 2 +-
 src/main/java/org/apache/log4j/chainsaw/LogUI.java                    | 4 ++--
 .../java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java    | 2 +-
 src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 2 +-
 src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
index 014c453..4b0777e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
@@ -125,7 +125,7 @@ class ChainsawTabbedPane extends JTabbedPane implements 
SettingsListener {
      */
 
     public void saveSettings(SaveSettingsEvent event) {
-//        File file = new 
File(SettingsManager.getInstance().getSettingsDirectory(), "tab-settings.xml");
+        File file = new File(SettingsManager.getSettingsDirectory(), 
"tab-settings.xml");
 //        XStream stream = new XStream(new DomDriver());
 //        try {
 //            FileWriter writer = new FileWriter(file);
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java 
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index e3d753e..38f9c2c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -987,7 +987,7 @@ public class LogUI extends JFrame {
 
     public void loadReceiver() {
         Runnable r = () -> {
-            JFileChooser jfc = new 
JFileChooser(settingsManager.getSettingsDirectory());
+            JFileChooser jfc = new 
JFileChooser(SettingsManager.getSettingsDirectory());
             int returnVal = jfc.showOpenDialog(this);
             if(returnVal != JFileChooser.APPROVE_OPTION) {
                 return;
@@ -1470,7 +1470,7 @@ public class LogUI extends JFrame {
             }
         }
     }
-    
+
     public void addReceiver(ChainsawReceiver rx){
         m_receivers.add(rx);
         List<ChainsawLoggingEvent> list = new ArrayList<>();
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
index a21b756..5a26abc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
@@ -673,7 +673,7 @@ class ReceiverConfigurationPanel extends JPanel {
         private File saveConfigFile;
 
         public PanelModel(SettingsManager settingsManager) {
-            file = new File(settingsManager.getSettingsDirectory(), 
"receiver-config.xml");
+            file = new File(SettingsManager.getSettingsDirectory(), 
"receiver-config.xml");
         }
 
         boolean isNetworkReceiverMode() {
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 38f7e65..535e31e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -594,7 +594,7 @@ public class ReceiversPanel extends JPanel implements 
SettingsListener {
      */
 
     public void saveSettings(SaveSettingsEvent event) {
-        File file = new File(settingsManager.getSettingsDirectory(), 
"receiver-config.xml");
+        File file = new File(SettingsManager.getSettingsDirectory(), 
"receiver-config.xml");
         saveReceiversToFile(file);
     }
 
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java 
b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
index c01906a..4b2701f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -109,7 +109,7 @@ public class ZeroConfPlugin extends DockablePanel {
     }
 
     private File getPreferenceFileLocation() {
-        return new File(settingsManager.getSettingsDirectory(), 
"zeroconfprefs.xml");
+        return new File(SettingsManager.getSettingsDirectory(), 
"zeroconfprefs.xml");
     }
 
     private void activateOptions() throws IOException {