Bug 83738 - Allow unqualified tool name in location field for External Tools

3 files changed, 3 insertions, 2 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java
index 8a298e3e2..fe9552896 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/SystemPathResolver.java
@@ -29,7 +29,7 @@ public class SystemPathResolver implements IDynamicVariableResolver {
 	 */
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
         if (argument == null) {
-            throw new CoreException(new Status(IStatus.ERROR,  IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, "External tool not specified", null)); //$NON-NLS-1$
+            throw new CoreException(new Status(IStatus.ERROR,  IExternalToolConstants.PLUGIN_ID, IExternalToolConstants.ERR_INTERNAL_ERROR, VariableMessages.getString("SystemPathResolver.0"), null)); //$NON-NLS-1$
         }
         Map map= DebugPlugin.getDefault().getLaunchManager().getNativeEnvironmentCasePreserved();
         String path= (String) map.get("Path"); //$NON-NLS-1$
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties
index c5749fc68..e5d83a871 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/variables/VariableMessages.properties
@@ -10,3 +10,4 @@
 ###############################################################################
 
 BuildProjectResolver.3=Variable references non-existent resource : {0}
+SystemPathResolver.0=External tool argument must be specified for the system_path variable
diff --git a/org.eclipse.ui.externaltools/plugin.properties b/org.eclipse.ui.externaltools/plugin.properties
index 96dbc9f27..3aa242bdb 100644
--- a/org.eclipse.ui.externaltools/plugin.properties
+++ b/org.eclipse.ui.externaltools/plugin.properties
@@ -14,7 +14,7 @@ Plugin.providerName = Eclipse.org
 
 build_type.description= Returns the type of build being performed - "incremental", "full", "auto", or "none".
 build_project.description= Returns the absolute file system path of the project currently being built, or the absolute file system path of the resource identified by an optional argument interpreted as a path relative to the project currently being built.
-system_path.description= Returns the absolute file system path of the external tool. Resolved by finding the first occurrence of the named tool based on the system path specification. The tool name argument must be supplied.
+system_path.description= Returns the absolute file system path of the external tool. Resolved by finding the first occurrence of the named tool based on the system path specification. The tool name must be supplied as an argument.
 
 ExtPoint.configurationDuplicationMaps = Launch Configuration Duplication Maps
 ExtPoint.toolTypes = External Tool Types