Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladt2011-02-10 18:06:15 -0500
committervladt2011-02-10 18:06:15 -0500
commitd8a4a3e181fe1b241d7e7785312a5e2c4a8bbce5 (patch)
tree8dae073380652d49577e6ac914930a5c2de3fc96 /org.eclipse.m2e.launching
parenta1639bf8aa6a6a8ba1575b1a4d183e6815128f6b (diff)
downloadm2e-core-d8a4a3e181fe1b241d7e7785312a5e2c4a8bbce5.tar.gz
m2e-core-d8a4a3e181fe1b241d7e7785312a5e2c4a8bbce5.tar.xz
m2e-core-d8a4a3e181fe1b241d7e7785312a5e2c4a8bbce5.zip
335872: Replaced direct calls to maven console logMessage/logError with slf4j log calls
Diffstat (limited to 'org.eclipse.m2e.launching')
-rw-r--r--org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java4
-rw-r--r--org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java6
2 files changed, 4 insertions, 6 deletions
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java
index 78796491..329ad91c 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java
@@ -295,7 +295,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
}
if(matchingConfigs.size()==1) {
- MavenPlugin.getDefault().getConsole().logMessage("Using existing launch configuration");
+ log.info("Using existing launch configuration");
return matchingConfigs.get(0);
} else if(matchingConfigs.size()>1) {
final IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
@@ -352,7 +352,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
}
}
- MavenPlugin.getDefault().getConsole().logMessage("Creating new launch configuration");
+ log.info("Creating new launch configuration");
String newName = launchManager.generateUniqueLaunchConfigurationNameFrom(basedirLocation.lastSegment());
try {
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java
index 9ac8550d..7fdb2c1d 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java
@@ -37,7 +37,6 @@ import org.eclipse.jdt.launching.VMRunnerConfiguration;
import org.eclipse.m2e.actions.MavenLaunchConstants;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenConsole;
import org.eclipse.m2e.core.embedder.IMavenConfiguration;
import org.eclipse.m2e.core.embedder.IMavenLauncherConfiguration;
import org.slf4j.Logger;
@@ -57,9 +56,8 @@ public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaun
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
throws CoreException {
- MavenConsole console = MavenPlugin.getDefault().getConsole();
- console.logMessage("" + getWorkingDirectory(configuration)); //$NON-NLS-1$
- console.logMessage(" mvn" + getProgramArguments(configuration)); //$NON-NLS-1$
+ log.info("" + getWorkingDirectory(configuration)); //$NON-NLS-1$
+ log.info(" mvn" + getProgramArguments(configuration)); //$NON-NLS-1$
runtime = MavenLaunchUtils.getMavenRuntime(configuration);

Back to the top