335872: Replaced MavenLogger with slf4j loggers

5 files changed, 22 insertions, 11 deletions

diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java
index 12882164..b9c4edfd 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/AbstractPomRefactoring.java
@@ -44,7 +44,6 @@ import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.eclipse.ltk.core.refactoring.TextFileChange;
 import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectManager;
@@ -53,6 +52,8 @@ import org.eclipse.m2e.model.edit.pom.PropertyElement;
 import org.eclipse.m2e.refactoring.RefactoringModelResources.PropertyInfo;
 import org.eclipse.m2e.refactoring.internal.Activator;
 import org.eclipse.osgi.util.NLS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -62,6 +63,7 @@ import org.eclipse.osgi.util.NLS;
  */
 @SuppressWarnings("restriction")
 public abstract class AbstractPomRefactoring extends Refactoring {
+  private static final Logger log = LoggerFactory.getLogger(AbstractPomRefactoring.class);
 
   protected static final String PROBLEMS_DURING_REFACTORING = Messages.AbstractPomRefactoring_error;
 
@@ -314,7 +316,7 @@ public abstract class AbstractPomRefactoring extends Refactoring {
       Resource resource = MavenPlugin.getDefault().getMavenModelManager().loadResource(file);
       return (Model) resource.getContents().get(0);
     } catch(CoreException ex) {
-      MavenLogger.log(PROBLEMS_DURING_REFACTORING, ex);
+      log.error(PROBLEMS_DURING_REFACTORING, ex);
       return null;
     }
   }
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java
index 5a49dc99..8bb0368d 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/ChangeCreator.java
@@ -22,13 +22,14 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.text.edits.DeleteEdit;
 import org.eclipse.text.edits.InsertEdit;
 import org.eclipse.text.edits.MultiTextEdit;
 import org.eclipse.text.edits.ReplaceEdit;
 import org.eclipse.text.edits.TextEdit;
 import org.eclipse.text.edits.TextEditGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -37,6 +38,8 @@ import org.eclipse.text.edits.TextEditGroup;
  * @author Anton Kraev
  */
 public class ChangeCreator {
+  private static final Logger log = LoggerFactory.getLogger(ChangeCreator.class);
+
   private String label;
 
   private IDocument oldDocument;
@@ -139,7 +142,7 @@ public class ChangeCreator {
       try {
         return getHash(thisIndex).equals(((LineComparator) other).getHash(otherIndex));
       } catch (BadLocationException e) {
-        MavenLogger.log("Problem comparing", e);
+        log.error("Problem comparing", e);
         return false;
       }
     }
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/RefactoringModelResources.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/RefactoringModelResources.java
index c47bd0d8..a6dc79a3 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/RefactoringModelResources.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/RefactoringModelResources.java
@@ -28,10 +28,11 @@ import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.model.edit.pom.Model;
 import org.eclipse.m2e.model.edit.pom.PropertyElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class manages all refactoring-related resources for a particular maven project
@@ -39,6 +40,8 @@ import org.eclipse.m2e.model.edit.pom.PropertyElement;
  * @author Anton Kraev
  */
 public class RefactoringModelResources {
+  private static final Logger log = LoggerFactory.getLogger(RefactoringModelResources.class);
+
   private static final String TMP_PROJECT_NAME = ".m2eclipse_refactoring"; //$NON-NLS-1$
   protected IFile pomFile;
   protected IFile tmpFile;
@@ -61,7 +64,7 @@ public class RefactoringModelResources {
         tmpProject.create(null);
         tmpProject.open(null);
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
     }
     return tmpProject;
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/internal/RefactoringImages.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/internal/RefactoringImages.java
index 949c5ef8..41cb9dfe 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/internal/RefactoringImages.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/internal/RefactoringImages.java
@@ -13,13 +13,15 @@ package org.eclipse.m2e.refactoring.internal;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Eugene Kuleshov
  */
 public class RefactoringImages {
+  private static final Logger log = LoggerFactory.getLogger(RefactoringImages.class);
 
   // images
   
@@ -39,7 +41,7 @@ public class RefactoringImages {
       }
       return imageDescriptor;
     } catch (Exception ex) {
-      MavenLogger.log(key, ex);
+      log.error(key, ex);
       return null;
     }
   }
diff --git a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/rename/RenameArtifactAction.java b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/rename/RenameArtifactAction.java
index 0556df63..3ded0280 100644
--- a/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/rename/RenameArtifactAction.java
+++ b/org.eclipse.m2e.refactoring/src/org/eclipse/m2e/refactoring/rename/RenameArtifactAction.java
@@ -16,13 +16,14 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.refactoring.internal.SaveDirtyFilesDialog;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionDelegate;
 import org.eclipse.ui.internal.ObjectPluginAction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -30,6 +31,7 @@ import org.eclipse.ui.internal.ObjectPluginAction;
  */
 @SuppressWarnings("restriction")
 public class RenameArtifactAction extends ActionDelegate {
+  private static final Logger log = LoggerFactory.getLogger(RenameArtifactAction.class);
 
   @Override
   public void init(IAction action) {
@@ -71,9 +73,8 @@ public class RenameArtifactAction extends ActionDelegate {
       String titleForFailedChecks = ""; //$NON-NLS-1$
       op.run(shell, titleForFailedChecks);
     } catch(Exception e) {
-      MavenLogger.log("Unable to rename " + file, e);
+      log.error("Unable to rename " + file, e);
     }
   }
-
 }