launch variables refactoring/cleanup
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java
index a6e82ea..ccca029 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java
@@ -216,9 +216,8 @@
name= manager.generateUniqueLaunchConfigurationNameFrom(name);
try {
ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, name);
- StringBuffer buf = new StringBuffer();
- LaunchVariableUtil.buildVariableTag(ILaunchVariableManager.VAR_WORKSPACE_LOC, file.getFullPath().toString(), buf);
- workingCopy.setAttribute(IExternalToolConstants.ATTR_LOCATION, buf.toString());
+ workingCopy.setAttribute(IExternalToolConstants.ATTR_LOCATION,
+ LaunchVariableUtil.newVariableExpression(ILaunchVariableManager.VAR_WORKSPACE_LOC, file.getFullPath().toString()));
// set default for common settings
CommonTab tab = new CommonTab();
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java
index 4c6c7c2..2f57fad 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java
@@ -115,12 +115,7 @@
if (file == null) {
return;
}
- StringBuffer buf = new StringBuffer();
- LaunchVariableUtil.buildVariableTag(ILaunchVariableManager.VAR_WORKSPACE_LOC, file.getFullPath().toString(), buf);
- String text= buf.toString();
- if (text != null) {
- locationField.setText(text);
- }
+ locationField.setText(LaunchVariableUtil.newVariableExpression(ILaunchVariableManager.VAR_WORKSPACE_LOC, file.getFullPath().toString()));
}
/**
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java
index c2dd090..6e5987c 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java
@@ -64,13 +64,8 @@
String name = buffer.toString().trim();
name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name);
configuration.rename(name);
-
- StringBuffer buf = new StringBuffer();
- LaunchVariableUtil.buildVariableTag(ILaunchVariableManager.VAR_WORKSPACE_LOC, file.getFullPath().toString(), buf);
- String text= buf.toString();
- if (text != null) {
- configuration.setAttribute(IExternalToolConstants.ATTR_LOCATION, text);
- }
+ configuration.setAttribute(IExternalToolConstants.ATTR_LOCATION,
+ LaunchVariableUtil.newVariableExpression(ILaunchVariableManager.VAR_WORKSPACE_LOC, file.getFullPath().toString()));
}
}
}
