Use slf4j instead of log4j

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/name/herlin/command/DefaultCommandProcessor.java

@@ -21,7 +21,8 @@
 
 package name.herlin.command;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 
@@ -34,7 +35,7 @@
  */
 @Deprecated
 public class DefaultCommandProcessor implements CommandProcessor {
-    private static final Logger LOG = Logger.getLogger(DefaultCommandProcessor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultCommandProcessor.class);
 
     /**
      * Execute the command.

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java

@@ -15,7 +15,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
@@ -51,6 +50,7 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.PMDConfiguration;
@@ -89,7 +89,7 @@
  * The activator class controls the plug-in life cycle
  */
 public class PMDPlugin extends AbstractUIPlugin {
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(PMDPlugin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PMDPlugin.class);
 
     private static File pluginFolder;
 
@@ -111,8 +111,6 @@ public class PMDPlugin extends AbstractUIPlugin {
     private static final Integer[] PRIORITY_VALUES = new Integer[] { Integer.valueOf(1), Integer.valueOf(2),
         Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), };
 
-    private static final Logger LOG = Logger.getLogger(PMDPlugin.class);
-
     private StringTable stringTable; // NOPMD by Herlin on 11/10/06 00:22
 
     @Deprecated
@@ -260,7 +258,7 @@ public void resourceChanged(IResourceChangeEvent arg0) {
         PriorityFilter.getInstance().initialize();
 
         version = context.getBundle().getHeaders().get("Bundle-Version");
-        LOGGER.debug("PMD Plugin {} has started...", version);
+        LOG.debug("PMD Plugin {} has started...", version);
     }
 
     /**
@@ -296,7 +294,7 @@ public void run() {
                 try {
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(viewId);
                 } catch (PartInitException e) {
-                    LOG.error(e);
+                    LOG.error("Error while showing {}", viewId, e);
                 }
             }
         });
@@ -362,7 +360,7 @@ public void run() {
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().hideView(view); 
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(viewId); 
                 } catch (PartInitException e) { 
-                    LOG.error(e); 
+                    LOG.error("Error while refreshing view {}", viewId, e);
                 } 
             } 
         }); 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/builder/PMDBuilder.java

@@ -6,14 +6,15 @@
 
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.cmd.ReviewCodeCmd;
@@ -27,7 +28,7 @@
  */
 public class PMDBuilder extends IncrementalProjectBuilder {
 
-    public static final Logger LOG = Logger.getLogger(PMDBuilder.class);
+    public static final Logger LOG = LoggerFactory.getLogger(PMDBuilder.class);
     public static final String PMD_BUILDER = "net.sourceforge.pmd.eclipse.plugin.pmdBuilder";
 
     public static final IProject[] EMPTY_PROJECT_ARRAY = new IProject[0];

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/BaseVisitor.java

@@ -20,14 +20,15 @@
 import java.util.Set;
 import java.util.Stack;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.ResourceWorkingSetFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.PMDConfiguration;
@@ -66,7 +67,7 @@
  *
  */
 public class BaseVisitor {
-    private static final Logger LOG = Logger.getLogger(BaseVisitor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BaseVisitor.class);
     private IProgressMonitor monitor;
     private boolean useTaskMarker = false;
     private Map<IFile, Set<MarkerInfo2>> accumulator;
@@ -394,8 +395,7 @@ public String defaultFileExtension() {
                         ConfigurationError error = errors.next();
                         message.append(error.rule().getName()).append(": ").append(error.issue()).append('\n');
                     }
-                    PMDPlugin.getDefault().logWarn(message.toString());
-                    LOG.warn(message);
+                    LOG.warn(message.toString());
                 }
                 if (collectingReport.hasErrors()) {
                     StringBuilder message = new StringBuilder("There were processing errors!\n");

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/CPDVisitor.java

@@ -7,13 +7,14 @@
 import java.io.File;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.ResourceWorkingSetFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.cpd.Language;
 import net.sourceforge.pmd.eclipse.runtime.properties.PropertiesException;
@@ -28,7 +29,7 @@
  */
 public class CPDVisitor implements IResourceVisitor {
 
-    private static final Logger LOG = Logger.getLogger(CPDVisitor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CPDVisitor.class);
     private boolean includeDerivedFiles;
     private ResourceWorkingSetFilter workingSetFilter;
     private Language language;

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/DeltaVisitor.java

@@ -4,12 +4,13 @@
 
 package net.sourceforge.pmd.eclipse.runtime.cmd;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A PMD visitor for processing resource deltas
@@ -19,7 +20,7 @@
  */
 public class DeltaVisitor extends BaseVisitor implements IResourceDeltaVisitor {
 
-    private static final Logger LOG = Logger.getLogger(DeltaVisitor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DeltaVisitor.class);
 
     /**
      * Default constructor

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/DetectCutAndPasteCmd.java

@@ -12,13 +12,14 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IPropertyListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.cpd.CPD;
 import net.sourceforge.pmd.cpd.CPDConfiguration;
@@ -49,7 +50,7 @@ public class DetectCutAndPasteCmd extends AbstractProjectCommand {
     private List<IPropertyListener> listeners;
 
     private static final long serialVersionUID = 1L;
-    private static final Logger LOG = Logger.getLogger(DetectCutAndPasteCmd.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DetectCutAndPasteCmd.class);
 
     /**
      * Default Constructor

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/JavaProjectClassLoader.java

@@ -10,20 +10,21 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is a ClassLoader for the Build Path of an IJavaProject.
  */
 public class JavaProjectClassLoader extends URLClassLoader {
-    private static final Logger LOG = Logger.getLogger(JavaProjectClassLoader.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JavaProjectClassLoader.class);
 
     private Set<IJavaProject> javaProjects = new HashSet<IJavaProject>();
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/JobCommandProcessor.java

@@ -12,11 +12,12 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 
@@ -28,7 +29,7 @@
  *
  */
 public class JobCommandProcessor {
-    private static final Logger LOG = Logger.getLogger(JobCommandProcessor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JobCommandProcessor.class);
     private final Map<AbstractDefaultCommand, Job> jobs = Collections
             .synchronizedMap(new HashMap<AbstractDefaultCommand, Job>());
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/RenderReportsCmd.java

@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
@@ -23,6 +22,8 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Rule;
@@ -44,7 +45,7 @@ public class RenderReportsCmd extends AbstractProjectCommand {
 
     private static final long serialVersionUID = 1L;
 
-    private static final Logger LOG = Logger.getLogger(RenderReportsCmd.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RenderReportsCmd.class);
 
     /**
      * Table containing the renderers indexed by the file name.