335872: Added debug level to the MavenConsole

3 files changed, 34 insertions, 8 deletions

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsole.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsole.java
index b2e7f5cf..8f1821e4 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsole.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsole.java
@@ -18,7 +18,9 @@ package org.eclipse.m2e.core.ui.internal.console;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface MavenConsole {
-  void logMessage(String msg);
+  void debug(String msg);
 
-  void logError(String msg);
+  void info(String msg);
+
+  void error(String msg);
 }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java
index 3317ca62..e6b4077d 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/console/MavenConsoleImpl.java
@@ -245,7 +245,25 @@ public class MavenConsoleImpl extends IOConsole implements MavenConsole, IProper
 
   // MavenConsole
 
-  public void logMessage(String message) {
+  public void debug(String message) {
+    if(!M2EUIPluginActivator.getDefault().getPreferenceStore().getBoolean(MavenPreferenceConstants.P_DEBUG_OUTPUT)) {
+      return;
+    }
+    if(showConsoleOnOutput()) {
+      bringConsoleToFront();
+    }
+    appendLine(ConsoleDocument.MESSAGE, getDateFormat().format(new Date()) + ": " + message);
+
+    for(IMavenConsoleListener listener : listeners) {
+      try {
+        listener.loggingMessage(message);
+      } catch(Exception e) {
+        e.printStackTrace();
+      }
+    }
+  }
+
+  public void info(String message) {
     if(showConsoleOnOutput()){
       bringConsoleToFront();
     }
@@ -260,7 +278,7 @@ public class MavenConsoleImpl extends IOConsole implements MavenConsole, IProper
     }
   }
   
-  public void logError(String message) {
+  public void error(String message) {
     if(showConsoleOnError()){
       bringConsoleToFront();
     }
diff --git a/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java b/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java
index 6363074f..5619e859 100644
--- a/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java
+++ b/org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java
@@ -39,10 +39,16 @@ public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEve
     }
 
     MavenConsole mavenConsole = M2EUIPluginActivator.getDefault().getMavenConsole();
-    if(logEvent.getLevel().levelInt == Level.ERROR_INT) {
-      mavenConsole.logError(logEvent.toString());
-    } else {
-      mavenConsole.logMessage(logEvent.toString());
+    switch(logEvent.getLevel().levelInt) {
+      case Level.DEBUG_INT:
+        mavenConsole.debug(logEvent.toString());
+        return;
+      case Level.ERROR_INT:
+        mavenConsole.error(logEvent.toString());
+        return;
+      case Level.WARN_INT:
+        mavenConsole.info(logEvent.toString());
+        return;
     }
   }