diff options
author | vladt | 2011-02-11 16:36:56 +0000 |
---|---|---|
committer | vladt | 2011-02-11 16:37:21 +0000 |
commit | 168573d55be44d517ef0e43ad648e301a99c294c (patch) | |
tree | c5e7b6d9eb6564139ec6ba76e9aee19083433a05 /org.eclipse.m2e.logback.appender | |
parent | 987c3d80b68ba32de8aa941e129f1c49d02a8d7b (diff) | |
download | m2e-core-168573d55be44d517ef0e43ad648e301a99c294c.tar.gz m2e-core-168573d55be44d517ef0e43ad648e301a99c294c.tar.xz m2e-core-168573d55be44d517ef0e43ad648e301a99c294c.zip |
335872: Removed the now obsolete MavenConsoleService
Diffstat (limited to 'org.eclipse.m2e.logback.appender')
-rw-r--r-- | org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.m2e.logback.appender/src/main/java/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF index d8c76ad8..47f2a950 100644 --- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF @@ -8,4 +8,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5, Fragment-Host: ch.qos.logback.classic Export-Package: org.eclipse.m2e.logback.appender Require-Bundle: org.eclipse.core.runtime, - org.eclipse.m2e.core;bundle-version="0.13.0" + org.eclipse.jface, + org.eclipse.ui.console, + org.eclipse.m2e.core.ui;bundle-version="0.13.0" 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 100e2bb2..6363074f 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 @@ -19,14 +19,14 @@ import ch.qos.logback.core.UnsynchronizedAppenderBase; import org.eclipse.core.runtime.Platform; -import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.MavenConsole; +import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; +import org.eclipse.m2e.core.ui.internal.console.MavenConsole; public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEvent> { - private static final String M2E_CORE_BUNDLE_ID = "org.eclipse.m2e.core"; //$NON-NLS-1$ + private static final String M2E_CORE_UI_BUNDLE_ID = "org.eclipse.m2e.core.ui"; //$NON-NLS-1$ - private Bundle m2eCoreBundle; + private Bundle m2eCoreUIBundle; @Override protected void append(ILoggingEvent logEvent) { @@ -34,11 +34,11 @@ public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEve return; } - MavenConsole mavenConsole = MavenPlugin.getDefault().getConsole(); - if(!mavenConsole.wasInitialized()) { + if(!M2EUIPluginActivator.getDefault().hasMavenConsoleImpl()) { return; } + MavenConsole mavenConsole = M2EUIPluginActivator.getDefault().getMavenConsole(); if(logEvent.getLevel().levelInt == Level.ERROR_INT) { mavenConsole.logError(logEvent.toString()); } else { @@ -47,14 +47,14 @@ public class MavenConsoleAppender extends UnsynchronizedAppenderBase<ILoggingEve } private boolean isActive() { - if(m2eCoreBundle == null) { - m2eCoreBundle = Platform.getBundle(M2E_CORE_BUNDLE_ID); - if(m2eCoreBundle == null) { - System.out.println("Could not find " + M2E_CORE_BUNDLE_ID + " bundle."); + if(m2eCoreUIBundle == null) { + m2eCoreUIBundle = Platform.getBundle(M2E_CORE_UI_BUNDLE_ID); + if(m2eCoreUIBundle == null) { + System.out.println("Could not find " + M2E_CORE_UI_BUNDLE_ID + " bundle."); return false; } } - return m2eCoreBundle.getState() == Bundle.ACTIVE; + return m2eCoreUIBundle.getState() == Bundle.ACTIVE; } } |