introduced MavenRuntimeLaunchSupport applyMavenRuntime and applyWorkspaceArtifacts

Change-Id: Ib78eb65589e34529a6e1a04595bbbf82b5cc8e19
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenRuntimeLaunchSupport.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenRuntimeLaunchSupport.java
index e6fcc9a2..d3ef04b9 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenRuntimeLaunchSupport.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenRuntimeLaunchSupport.java
@@ -173,12 +173,14 @@ public class MavenRuntimeLaunchSupport {
   public VMArguments getVMArguments() {
     VMArguments properties = new VMArguments();
 
-    // workspace artifact resolution
-    if(resolveWorkspaceArtifacts) {
-      File state = MavenPluginActivator.getDefault().getMavenProjectManager().getWorkspaceStateFile();
-      properties.appendProperty(WorkspaceState.SYSPROP_STATEFILE_LOCATION, quote(state.getAbsolutePath())); //$NON-NLS-1$
-    }
+    applyMavenRuntime(properties);
+
+    applyWorkspaceArtifacts(properties); // workspace artifact resolution
+
+    return properties;
+  }
 
+  public void applyMavenRuntime(VMArguments properties) {
     // maven.home
     String location = runtime.getLocation();
     if(location != null) {
@@ -187,8 +189,13 @@ public class MavenRuntimeLaunchSupport {
 
     // m2.conf
     properties.appendProperty("classworlds.conf", quote(cwconfFile.getAbsolutePath())); //$NON-NLS-1$
+  }
 
-    return properties;
+  public void applyWorkspaceArtifacts(VMArguments properties) {
+    if(resolveWorkspaceArtifacts) {
+      File state = MavenPluginActivator.getDefault().getMavenProjectManager().getWorkspaceStateFile();
+      properties.appendProperty(WorkspaceState.SYSPROP_STATEFILE_LOCATION, quote(state.getAbsolutePath())); //$NON-NLS-1$
+    }
   }
 
   public IVMRunner decorateVMRunner(final IVMRunner runner) {