Bug 37241 - Support for core variables

3 files changed, 11 insertions, 21 deletions

diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java
index 05563301e..33d0e793e 100644
--- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java
+++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/BackgroundResourceRefresher.java
@@ -24,7 +24,6 @@ import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
 import org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin;
-import org.eclipse.debug.ui.variables.ExpandVariableContext;
 
 /**
  * Refreshes resources as specified by a lanunch configuration, when 
@@ -32,14 +31,12 @@ import org.eclipse.debug.ui.variables.ExpandVariableContext;
  */
 public class BackgroundResourceRefresher implements IDebugEventSetListener, Runnable, IRunnableWithProgress  {
 
-	private ExpandVariableContext fContext;
 	private ILaunchConfiguration fConfiguration;
 	private IProcess fProcess;
 	
-	public BackgroundResourceRefresher(ILaunchConfiguration configuration, IProcess process, ExpandVariableContext context) {
+	public BackgroundResourceRefresher(ILaunchConfiguration configuration, IProcess process) {
 		fConfiguration = configuration;
 		fProcess = process;
-		fContext = context;
 	}
 	
 	/**
@@ -99,7 +96,7 @@ public class BackgroundResourceRefresher implements IDebugEventSetListener, Runn
 	 */
 	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 		try {
-			ExternalToolsUtil.refreshResources(fConfiguration, fContext, monitor);
+			ExternalToolsUtil.refreshResources(fConfiguration, monitor);
 		} catch (CoreException e) {
 			throw new InvocationTargetException(e);
 		}				
diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java
index 0cbd47702..3ed2c2c42 100644
--- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java
+++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java
@@ -26,13 +26,13 @@ import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.ui.launchVariables.VariableUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.ui.IWindowListener;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
 import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-import org.eclipse.debug.ui.variables.ExpandVariableContext;
 
 /**
  * Launch delegate for a program.
@@ -95,29 +95,22 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
 			return;
 		}
 		
-		// get variable context
-		ExpandVariableContext resourceContext = ExternalToolsUtil.getVariableContext();
-
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
 		// resolve location
-		IPath location = ExternalToolsUtil.getLocation(configuration, resourceContext);
+		IPath location = ExternalToolsUtil.getLocation(configuration);
 		
 		if (monitor.isCanceled()) {
 			return;
 		}		
 		
 		// resolve working directory
-		IPath workingDirectory = ExternalToolsUtil.getWorkingDirectory(configuration, resourceContext);
+		IPath workingDirectory = ExternalToolsUtil.getWorkingDirectory(configuration);
 		
 		if (monitor.isCanceled()) {
 			return;
 		}
 		
 		// resolve arguments
-		String[] arguments = ExternalToolsUtil.getArguments(configuration, resourceContext);
+		String[] arguments = ExternalToolsUtil.getArguments(configuration);
 		
 		if (monitor.isCanceled()) {
 			return;
@@ -142,7 +135,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
 			return;
 		}
 		
-		String[] envp = ExternalToolsUtil.getEnvironment(configuration, resourceContext);
+		String[] envp = VariableUtil.getEnvironment(configuration);
 		
 		if (monitor.isCanceled()) {
 			return;
@@ -173,7 +166,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
 		if (ExternalToolsUtil.isBackground(configuration)) {
 			// refresh resources after process finishes
 			if (ExternalToolsUtil.getRefreshScope(configuration) != null) {
-				BackgroundResourceRefresher refresher = new BackgroundResourceRefresher(configuration, process, resourceContext);
+				BackgroundResourceRefresher refresher = new BackgroundResourceRefresher(configuration, process);
 				refresher.startBackgroundRefresh();
 			}				
 		} else {
@@ -190,7 +183,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate {
 			}
 			
 			// refresh resources
-			ExternalToolsUtil.refreshResources(configuration, resourceContext, monitor);
+			ExternalToolsUtil.refreshResources(configuration, monitor);
 		}
 	}
 	
diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java
index b4777f7d1..bb02d3952 100644
--- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java
+++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramMainTab.java
@@ -13,8 +13,8 @@ package org.eclipse.ui.externaltools.internal.program.launchConfigurations;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.debug.ui.variables.IVariableConstants;
-import org.eclipse.debug.ui.variables.VariableUtil;
+import org.eclipse.debug.ui.launchVariables.IVariableConstants;
+import org.eclipse.debug.ui.launchVariables.VariableUtil;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsMainTab;
 import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;