From 56c060f2c25774b44226174cb9180869c1f26b2d Mon Sep 17 00:00:00 2001 From: Jared Burns Date: Thu, 22 May 2003 16:22:22 +0000 Subject: Bug 37241 - Support for core variables --- .../ExternalToolsBuilderTab.java | 8 +-- ...rnalToolsLaunchConfigurationMessages.properties | 2 - .../launchConfigurations/ExternalToolsMainTab.java | 21 +++--- .../ExternalToolsRefreshTab.java | 12 ++-- .../launchConfigurations/ExternalToolsUtil.java | 82 +++++----------------- .../internal/model/ExternalToolBuilder.java | 2 +- .../internal/registry/ExternalToolMigration.java | 12 ++-- .../internal/variables/BuildTypeExpander.java | 4 +- .../variables/RefreshScopeVariableRegistry.java | 4 +- 9 files changed, 52 insertions(+), 95 deletions(-) (limited to 'org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui') diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java index 65569f8b9..5f85f57a5 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsBuilderTab.java @@ -16,9 +16,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; -import org.eclipse.debug.ui.variables.IVariableComponentContainer; -import org.eclipse.debug.ui.variables.VariableUtil; -import org.eclipse.debug.ui.variables.WorkingSetComponent; +import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; +import org.eclipse.debug.ui.launchVariables.VariableUtil; +import org.eclipse.debug.ui.launchVariables.WorkingSetComponent; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -132,7 +132,7 @@ public class ExternalToolsBuilderTab extends AbstractLaunchConfigurationTab impl workingSetButton.setSelection(buildScope != null); if (buildScope != null) { - VariableUtil.VariableDefinition variable= VariableUtil.extractVariableTag(buildScope, 0); + VariableUtil.VariableDefinition variable= VariableUtil.extractVariableDefinition(buildScope, 0); workingSetComponent.setVariableValue(variable.argument); } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties index 00a36bf38..9f619bbf6 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsLaunchConfigurationMessages.properties @@ -63,7 +63,5 @@ ExternalToolsBuilderTab.workingSet_label=&Run this builder for the specified wor ExternalToolsBuilderTab.workingSet_tooltip=Runs whenever a resource changes that is specified in the working set and a build of the correct type has occurred ExternalToolsBuilderTab.buildKindError=At least one type of build kind must be selected ExternalToolsUtil.Could_not_resolve_an_argument._1=Could not resolve an argument. -ExternalToolsUtil.Could_not_resolve_environment._1=Could not resolve environment. -ExternalToolsUtil.Invalid_environment_specified_for_the_launch_configuration_named_{0}._2=Invalid environment specified for the launch configuration named {0}. ExternalToolsUtil.Could_not_resolve_location._3=Could not resolve location. ExternalToolsUtil.Could_not_resolve_working_directory._4=Could not resolve working directory. diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java index cc49b750b..03bb5ff0d 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java @@ -18,14 +18,16 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.core.variables.ISimpleVariableRegistry; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; -import org.eclipse.debug.ui.variables.LaunchConfigurationVariableRegistry; -import org.eclipse.debug.ui.variables.IVariableConstants; -import org.eclipse.debug.ui.variables.VariableSelectionDialog; -import org.eclipse.debug.ui.variables.VariableUtil; +import org.eclipse.debug.ui.launchVariables.IVariableConstants; +import org.eclipse.debug.ui.launchVariables.ContextLaunchVariableRegistry; +import org.eclipse.debug.ui.launchVariables.VariableSelectionDialog; +import org.eclipse.debug.ui.launchVariables.VariableUtil; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -434,7 +436,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa */ private String validateVariables(String value) { int start= 0; - VariableUtil.VariableDefinition variable = VariableUtil.extractVariableTag(value, start); + VariableUtil.VariableDefinition variable = VariableUtil.extractVariableDefinition(value, start); while (variable.start != -1) { if (variable.end == -1) { return ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Invalid_Expected_closing_}"); //$NON-NLS-1$ @@ -442,18 +444,19 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa if (variable.name == null || variable.name.length() == 0) { return ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.No_variable_specified"); //$NON-NLS-1$ } - LaunchConfigurationVariableRegistry registry = DebugUIPlugin.getDefault().getToolVariableRegistry(); - if (registry.getVariable(variable.name) == null) { + ContextLaunchVariableRegistry contextVariableRegistry = DebugUIPlugin.getDefault().getContextVariableRegistry(); + ISimpleVariableRegistry simpleVariableRegistry= DebugPlugin.getDefault().getSimpleVariableRegistry(); + if (contextVariableRegistry.getVariable(variable.name) == null && simpleVariableRegistry.getVariable(variable.name) == null) { return MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Unknown_variable"), new String[] {variable.name}); //$NON-NLS-1$ } start= variable.end; - variable = VariableUtil.extractVariableTag(value, start); + variable = VariableUtil.extractVariableDefinition(value, start); } return null; } private boolean containsVariable(String value) { - return VariableUtil.extractVariableTag(value, 0).start != -1; + return VariableUtil.extractVariableDefinition(value, 0).start != -1; } /** diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsRefreshTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsRefreshTab.java index 06bdde2a1..fe38eb911 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsRefreshTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsRefreshTab.java @@ -15,10 +15,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; -import org.eclipse.debug.ui.variables.LaunchConfigurationVariable; -import org.eclipse.debug.ui.variables.LaunchConfigurationVariableForm; -import org.eclipse.debug.ui.variables.IVariableComponentContainer; -import org.eclipse.debug.ui.variables.VariableUtil; +import org.eclipse.debug.ui.launchVariables.IContextLaunchVariable; +import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; +import org.eclipse.debug.ui.launchVariables.LaunchConfigurationVariableForm; +import org.eclipse.debug.ui.launchVariables.VariableUtil; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -108,7 +108,7 @@ public class ExternalToolsRefreshTab extends AbstractLaunchConfigurationTab impl */ private void createScopeComponent(Composite parent) { String label = ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsRefreshTab.Choose_scope_v&ariable___2"); //$NON-NLS-1$ - LaunchConfigurationVariable[] vars = ExternalToolsPlugin.getDefault().getRefreshVariableRegistry().getVariables(); + IContextLaunchVariable[] vars = ExternalToolsPlugin.getDefault().getRefreshVariableRegistry().getVariables(); variableForm = new LaunchConfigurationVariableForm(label, vars); variableForm.createContents(parent, this); } @@ -142,7 +142,7 @@ public class ExternalToolsRefreshTab extends AbstractLaunchConfigurationTab impl String varName = null; String varValue = null; if (scope != null) { - VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableTag(scope, 0); + VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableDefinition(scope, 0); varName = varDef.name; varValue = varDef.argument; } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java index 77012af7c..727329968 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java @@ -26,11 +26,9 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.debug.ui.variables.ExpandVariableContext; -import org.eclipse.debug.ui.variables.LaunchConfigurationVariable; -import org.eclipse.debug.ui.variables.VariableContextManager; -import org.eclipse.debug.ui.variables.VariableUtil; +import org.eclipse.debug.ui.launchVariables.IContextLaunchVariable; +import org.eclipse.debug.ui.launchVariables.VariableContextManager; +import org.eclipse.debug.ui.launchVariables.VariableUtil; import org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin; import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants; import org.eclipse.ui.externaltools.internal.registry.ExternalToolMigration; @@ -65,48 +63,6 @@ public class ExternalToolsUtil { throw new CoreException(new Status(IStatus.ERROR, IExternalToolConstants.PLUGIN_ID, code, message, exception)); } - /** - * Returns an array of (expanded) environment variables to be used when - * running the launch configuration or null if unspecified - * - * @param configuration launch configuration - * @param context context used to expand environment variable values - * @return String[] the array of "variable=value" pairs, suitable for - * passing to Process.exec - * @throws CoreException if unable to access associated attribute or if - * unable to resolve a variable in an environment variable's value - */ - public static String[] getEnvironment(ILaunchConfiguration configuration, ExpandVariableContext context) throws CoreException { - Map envMap = configuration.getAttribute(IDebugUIConstants.ATTR_ENVIRONMENT_VARIABLES, (Map) null); - if (envMap != null) { - MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_environment._1"), null); //$NON-NLS-1$ - String[] expandedEnvironment = VariableUtil.expandEnvironment(envMap, context, status); - if (status.isOK()) { - if (expandedEnvironment != null && expandedEnvironment.length > 0) { - return expandedEnvironment; - } else { - String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Invalid_environment_specified_for_the_launch_configuration_named_{0}._2"), new Object[] { configuration.getName()}); //$NON-NLS-1$ - abort(msg, null, 0); - } - } else { - throw new CoreException(status); - } - } - return null; - } - - /** - * Returns active variable context. The active variable context is used to - * expand variable expressions. If the workspace is currently being built, - * the context is associated with the project being built. Otherwise, the - * context is associated with the selected resource. - * - * @return active variable context - */ - public static ExpandVariableContext getVariableContext() { - return VariableContextManager.getDefault().getVariableContext(); - } - /** * Expands and returns the location attribute of the given launch * configuration, based on the given variable context. The location is @@ -120,13 +76,13 @@ public class ExternalToolsUtil { * resolved location does not point to an existing file in the local file * system */ - public static IPath getLocation(ILaunchConfiguration configuration, ExpandVariableContext context) throws CoreException { + public static IPath getLocation(ILaunchConfiguration configuration) throws CoreException { String location = configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, (String) null); if (location == null) { abort(MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Location_not_specified_by_{0}_1"), new String[] { configuration.getName()}), null, 0); //$NON-NLS-1$ } else { MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_location._3"), null); //$NON-NLS-1$ - String expandedLocation = VariableUtil.expandLocationText(location, context, status); + String expandedLocation = VariableUtil.expandVariables(location, status); if (status.isOK()) { if (expandedLocation == null || expandedLocation.length() == 0) { String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.invalidLocation_{0}"), new Object[] { configuration.getName()}); //$NON-NLS-1$ @@ -177,11 +133,11 @@ public class ExternalToolsUtil { * resolved location does not point to an existing directory in the local * file system */ - public static IPath getWorkingDirectory(ILaunchConfiguration configuration, ExpandVariableContext context) throws CoreException { + public static IPath getWorkingDirectory(ILaunchConfiguration configuration) throws CoreException { String location = configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, (String) null); if (location != null) { MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_working_directory._4"), null); //$NON-NLS-1$ - String expandedLocation = VariableUtil.expandLocationText(location, context, status); + String expandedLocation = VariableUtil.expandVariables(location, status); if (status.isOK()) { if (expandedLocation != null && expandedLocation.length() > 0) { File path = new File(expandedLocation); @@ -211,11 +167,11 @@ public class ExternalToolsUtil { * @throws CoreException if unable to retrieve the associated launch * configuration attribute, or if unable to resolve any variables */ - public static String[] getArguments(ILaunchConfiguration configuration, ExpandVariableContext context) throws CoreException { + public static String[] getArguments(ILaunchConfiguration configuration) throws CoreException { String args = configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, (String) null); if (args != null) { MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_an_argument._1"), null); //$NON-NLS-1$ - String[] expandedArgs = VariableUtil.expandArguments(args, context, status); + String[] expandedArgs = VariableUtil.expandStrings(args, status); if (status.isOK()) { return expandedArgs; } else { @@ -257,8 +213,8 @@ public class ExternalToolsUtil { * @param monitor progress monitor * @throws CoreException if an exception occurrs while refreshing resources */ - public static void refreshResources(ILaunchConfiguration configuration, ExpandVariableContext context, IProgressMonitor monitor) throws CoreException { - IResource[] resources= getResourcesForRefreshScope(configuration, context, monitor); + public static void refreshResources(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException { + IResource[] resources= getResourcesForRefreshScope(configuration, monitor); if (resources == null || resources.length == 0){ return; } @@ -301,13 +257,13 @@ public class ExternalToolsUtil { * @param monitor progress monitor * @throws CoreException if an exception occurs while refreshing resources */ - public static IResource[] getResourcesForRefreshScope(ILaunchConfiguration configuration, ExpandVariableContext context, IProgressMonitor monitor) throws CoreException { + public static IResource[] getResourcesForRefreshScope(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException { String scope = getRefreshScope(configuration); if (scope == null) { return null; } - return getResourcesForScope(configuration, context, monitor, scope); + return getResourcesForScope(configuration, monitor, scope); } /** @@ -318,25 +274,25 @@ public class ExternalToolsUtil { * @param monitor progress monitor * @throws CoreException if an exception occurs while refreshing resources */ - public static IResource[] getResourcesForBuildScope(ILaunchConfiguration configuration, ExpandVariableContext context, IProgressMonitor monitor) throws CoreException { + public static IResource[] getResourcesForBuildScope(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException { String scope = configuration.getAttribute(IExternalToolConstants.ATTR_BUILD_SCOPE, (String) null); if (scope == null) { return null; } - return getResourcesForScope(configuration, context, monitor, scope); + return getResourcesForScope(configuration, monitor, scope); } - private static IResource[] getResourcesForScope(ILaunchConfiguration configuration, ExpandVariableContext context, IProgressMonitor monitor, String scope) throws CoreException { - VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableTag(scope, 0); + private static IResource[] getResourcesForScope(ILaunchConfiguration configuration, IProgressMonitor monitor, String scope) throws CoreException { + VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableDefinition(scope, 0); if (varDef.start == -1 || varDef.end == -1 || varDef.name == null) { String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.invalidRefreshVarFormat"), new Object[] { configuration.getName()}); //$NON-NLS-1$ abort(msg, null, 0); } RefreshScopeVariableRegistry registry = ExternalToolsPlugin.getDefault().getRefreshVariableRegistry(); - LaunchConfigurationVariable variable = registry.getVariable(varDef.name); + IContextLaunchVariable variable = registry.getVariable(varDef.name); if (variable == null) { String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.noRefreshVarNamed"), new Object[] { configuration.getName(), varDef.name }); //$NON-NLS-1$ abort(msg, null, 0); @@ -346,7 +302,7 @@ public class ExternalToolsUtil { return null; } - return variable.getExpander().getResources(varDef.name, varDef.argument, context); + return variable.getExpander().getResources(varDef.name, varDef.argument, VariableContextManager.getDefault().getVariableContext()); } /** diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java index 45f6e0868..826933e04 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java @@ -64,7 +64,7 @@ public final class ExternalToolBuilder extends IncrementalProjectBuilder { return null; } - IResource[] resources= ExternalToolsUtil.getResourcesForBuildScope(config, ExternalToolsUtil.getVariableContext(), monitor); + IResource[] resources= ExternalToolsUtil.getResourcesForBuildScope(config, monitor); boolean buildForChange= true; if (resources != null && resources.length > 0) { buildForChange= buildScopeIndicatesBuild(resources); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java index 8f0918cf5..dc44ea47f 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/registry/ExternalToolMigration.java @@ -20,8 +20,8 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; -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.ui.externaltools.internal.model.IExternalToolConstants; /** @@ -172,7 +172,7 @@ public final class ExternalToolMigration { // Update the location... String location = (String) args.get(TAG_TOOL_LOCATION); if (location != null) { - VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableTag(location, 0); + VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableDefinition(location, 0); if (IVariableConstants.VAR_WORKSPACE_LOC.equals(varDef.name)) { location = VariableUtil.buildVariableTag(IVariableConstants.VAR_RESOURCE_LOC, varDef.argument); } @@ -182,7 +182,7 @@ public final class ExternalToolMigration { // Update the refresh scope... String refresh = (String) args.get(TAG_TOOL_REFRESH); if (refresh != null) { - VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableTag(refresh, 0); + VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableDefinition(refresh, 0); if ("none".equals(varDef.name)) { //$NON-NLS-1$ refresh = null; } @@ -196,7 +196,7 @@ public final class ExternalToolMigration { int start = 0; ArrayList targets = new ArrayList(); StringBuffer buffer = new StringBuffer(); - VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableTag(arguments, start); + VariableUtil.VariableDefinition varDef = VariableUtil.extractVariableDefinition(arguments, start); while (varDef.end != -1) { if ("ant_target".equals(varDef.name) && varDef.argument != null) { //$NON-NLS-1$ targets.add(varDef.argument); @@ -205,7 +205,7 @@ public final class ExternalToolMigration { buffer.append(arguments.substring(start, varDef.end)); } start = varDef.end; - varDef = VariableUtil.extractVariableTag(arguments, start); + varDef = VariableUtil.extractVariableDefinition(arguments, start); } buffer.append(arguments.substring(start, arguments.length())); arguments = buffer.toString(); diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildTypeExpander.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildTypeExpander.java index b514b5268..8fee23eeb 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildTypeExpander.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/BuildTypeExpander.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.ui.externaltools.internal.variables; -import org.eclipse.debug.ui.variables.DefaultVariableExpander; -import org.eclipse.debug.ui.variables.ExpandVariableContext; +import org.eclipse.debug.ui.launchVariables.DefaultVariableExpander; +import org.eclipse.debug.ui.launchVariables.ExpandVariableContext; import org.eclipse.ui.externaltools.internal.model.ExternalToolBuilder; diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/RefreshScopeVariableRegistry.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/RefreshScopeVariableRegistry.java index 5e07b262b..6a94c9308 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/RefreshScopeVariableRegistry.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/RefreshScopeVariableRegistry.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.ui.externaltools.internal.variables; -import org.eclipse.debug.ui.variables.LaunchConfigurationVariableRegistry; +import org.eclipse.debug.ui.launchVariables.ContextLaunchVariableRegistry; import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants; /** * Registry of all available refresh scope variables. */ -public class RefreshScopeVariableRegistry extends LaunchConfigurationVariableRegistry { +public class RefreshScopeVariableRegistry extends ContextLaunchVariableRegistry { /** * Creates the registry and loads the variables. -- cgit v1.2.3