Consistently use the internal workbench.Logger

Only the workbench.Logger should be aware of the logging implementation used, all other classes should use the workbench.Logger class
openjump-gis · May 6, 2022 · 9e76b65 · 9e76b65
1 parent 2196719
commit 9e76b65
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,9 @@ target/
 hs_err_pid*
 /bin/
 
+# IntelliJ IDE config files
+.idea/
+
 .okhttpcache/*
 .settings/*
 .classpath

diff --git a/src/com/vividsolutions/jump/workbench/ui/SchemaPanel.java b/src/com/vividsolutions/jump/workbench/ui/SchemaPanel.java
@@ -76,13 +76,13 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
-import org.apache.log4j.Logger;
 import org.openjump.core.ui.util.FeatureSchemaUtils;
 
 import org.locationtech.jts.util.Assert;
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.feature.AttributeType;
 import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
 import com.vividsolutions.jump.workbench.model.CategoryEvent;
 import com.vividsolutions.jump.workbench.model.FeatureEvent;
@@ -345,14 +345,13 @@ public boolean execute(PlugInContext context) throws Exception {
 
             } catch (final Exception ex) {
 
-                final Logger LOG = Logger.getLogger(this.getClass());
                 JUMPWorkbench
                         .getInstance()
                         .getFrame()
                         .warnUser(
                                 this.getClass().getSimpleName() + " " + Error
                                         + ": " + ex.toString());
-                LOG.error(this.getClass().getName() + " " + Error + ": ", ex);
+                Logger.error(this.getClass().getName() + " " + Error + ": ", ex);
                 JOptionPane.showMessageDialog(JUMPWorkbench.getInstance()
                         .getFrame(), Error + ": " + ex, getName(), 0);
             }

diff --git a/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java b/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
@@ -80,7 +80,6 @@
 import javax.swing.text.JTextComponent;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Level;
 import org.openjump.core.CheckOS;
 import org.openjump.core.model.TaskEvent;
 import org.openjump.core.model.TaskListener;
@@ -614,7 +613,7 @@ public void setMaximumFeatureExtentForEnvelopeRenderingInPixels(
      */
     @Deprecated
     public void log(String message) {
-        log(message, null, new Exception().getStackTrace()[0]);
+        Logger.info(message);
     }
 
     /**
@@ -624,7 +623,7 @@ public void log(String message) {
      */
     @Deprecated
     public void log(String message, Class clazz) {
-        log(message, null, new Exception().getStackTrace()[0]);
+        Logger.info(message);
     }
 
     /**
@@ -633,11 +632,7 @@ public void log(String message, Class clazz) {
      */
     @Deprecated
     public void log(String message, Throwable t) {
-        log(message, t, new Exception().getStackTrace()[0]);
-    }
-
-    private void log(String message, Throwable t, StackTraceElement calledFrom) {
-        Logger.log(message, Logger.isDebugEnabled() ? t : null, Level.INFO, calledFrom);
+        Logger.info(message, t);
     }
 
     public void setMinimumFeatureExtentForAnyRenderingInPixels(
@@ -1941,7 +1936,7 @@ private void closeTaskFrame(TaskFrame taskFrame) {
                         return;
                     }
                 } catch (Exception e) {
-                    log("", e);
+                    Logger.info(e);
                 }
 
                 // There are other internal frames associated with this task

diff --git a/src/org/openjump/core/rasterimage/styler/RasterLegendPlugIn.java b/src/org/openjump/core/rasterimage/styler/RasterLegendPlugIn.java
@@ -22,7 +22,6 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 
-import org.apache.log4j.Logger;
 import org.openjump.core.apitools.LayerTools;
 import org.openjump.core.rasterimage.RasterImageLayer;
 import org.openjump.core.rasterimage.RasterSymbology;
@@ -40,6 +39,7 @@
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.task.TaskMonitor;
 import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
 import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
 import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
@@ -365,13 +365,12 @@ public static BufferedImage joinBufferedImage(BufferedImage img1,
     }
 
     public static void Logger(Class<?> plugin, Exception e) {
-        final Logger LOG = Logger.getLogger(plugin);
         JUMPWorkbench
                 .getInstance()
                 .getFrame()
                 .warnUser(
                         plugin.getSimpleName() + " Exception: " + e.toString());
-        LOG.error(plugin.getName() + " Exception: ", e);
+        Logger.error(plugin.getName() + " Exception: ", e);
     }
 
     protected void saved(File file) {

diff --git a/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java b/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java
@@ -27,13 +27,13 @@
 import javax.swing.JScrollPane;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
 import org.openjump.core.apitools.LayerTools;
 import org.openjump.core.ui.io.file.FileNameExtensionFilter;
 import org.openjump.core.ui.swing.DetachableInternalFrame;
 
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
 import com.vividsolutions.jump.workbench.model.WMSLayer;
 import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
@@ -213,13 +213,12 @@ public void save(JScrollPane pane) {
     }
 
     public static void Logger(Class<?> plugin, Exception e) {
-        final Logger LOG = Logger.getLogger(plugin);
         JUMPWorkbench
                 .getInstance()
                 .getFrame()
                 .warnUser(
                         plugin.getSimpleName() + " Exception: " + e.toString());
-        LOG.error(plugin.getName() + " Exception: ", e);
+        Logger.error(plugin.getName() + " Exception: ", e);
     }
 
     protected void saved(File file) {

diff --git a/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java b/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
@@ -46,7 +46,6 @@
 import javax.swing.tree.TreePath;
 import javax.xml.namespace.QName;
 
-import org.apache.log4j.Logger;
 import org.math.plot.PlotPanel;
 import org.math.plot.plots.Plot;
 import org.openjump.core.apitools.IOTools;
@@ -58,6 +57,7 @@
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
 import com.vividsolutions.jump.workbench.model.Task;
 import com.vividsolutions.jump.workbench.ui.FeatureCollectionPanel;
@@ -663,13 +663,12 @@ private DefaultMutableTreeNode findNode(final ObjectAndDescription oad) {
     }
 
     public static void Logger(Class<?> plugin, Exception e) {
-        final Logger LOG = Logger.getLogger(plugin);
         JUMPWorkbench
                 .getInstance()
                 .getFrame()
                 .warnUser(
                         plugin.getSimpleName() + " Exception: " + e.toString());
-        LOG.error(plugin.getName() + " Exception: ", e);
+        Logger.error(plugin.getName() + " Exception: ", e);
     }
 
     protected JPanel getOKSavePanel() {

diff --git a/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java b/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
@@ -30,7 +30,6 @@
 
 import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.log4j.Logger;
 import org.math.plot.PlotPanel;
 import org.math.plot.plots.Plot;
 import org.openjump.core.apitools.IOTools;
@@ -43,6 +42,7 @@
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
 import com.vividsolutions.jump.workbench.model.Task;
 import com.vividsolutions.jump.workbench.ui.FeatureCollectionPanel;
@@ -361,13 +361,12 @@ protected static void notsaved() {
 	}
 
 	public static void Logger(Class<?> plugin, Exception e) {
-		final Logger LOG = Logger.getLogger(plugin);
 		JUMPWorkbench
 		.getInstance()
 		.getFrame()
 		.warnUser(
 				plugin.getSimpleName() + " Exception: " + e.toString());
-		LOG.error(plugin.getName() + " Exception: ", e);
+		Logger.error(plugin.getName() + " Exception: ", e);
 	}