Fix PR 19516 - Wrong file separator for External Tools Variables

2 files changed, 6 insertions, 6 deletions

diff --git a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java
index b7f6b4001..eb5bc0626 100644
--- a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java
+++ b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/DefaultRunnerContext.java
@@ -163,7 +163,7 @@ public final class DefaultRunnerContext implements IRunnerContext {
 			if (varDef.argument != null && varDef.argument.length() > 0)
 				location = ToolUtil.getLocationFromFullPath(varDef.argument);
 			else
-				location = Platform.getLocation().toString();
+				location = Platform.getLocation().toOSString();
 			if (location != null)
 				buf.append(location);
 			return;
@@ -180,7 +180,7 @@ public final class DefaultRunnerContext implements IRunnerContext {
 					location = currentProject.getLocation();
 			}
 			if (location != null)
-				buf.append(location.toString());
+				buf.append(location.toOSString());
 			return;
 		}
 		
@@ -190,7 +190,7 @@ public final class DefaultRunnerContext implements IRunnerContext {
 				location = ToolUtil.getLocationFromFullPath(varDef.argument);
 			} else {
 				if (selectedResource != null)
-					location = selectedResource.getLocation().toString();
+					location = selectedResource.getLocation().toOSString();
 			}
 			if (location != null)
 				buf.append(location);
@@ -202,10 +202,10 @@ public final class DefaultRunnerContext implements IRunnerContext {
 			if (varDef.argument != null && varDef.argument.length() > 0) {
 				IResource member = ResourcesPlugin.getWorkspace().getRoot().findMember(varDef.argument);
 				if (member != null)
-					location = member.getParent().getLocation().toString();
+					location = member.getParent().getLocation().toOSString();
 			} else {
 				if (selectedResource != null)
-					location = selectedResource.getParent().getLocation().toString();
+					location = selectedResource.getParent().getLocation().toOSString();
 			}
 			if (location != null)
 				buf.append(location);
diff --git a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ToolUtil.java b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ToolUtil.java
index 1f3abf647..28e9f0410 100644
--- a/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ToolUtil.java
+++ b/org.eclipse.ui.externaltools/External Tools/org/eclipse/ui/externaltools/internal/core/ToolUtil.java
@@ -189,7 +189,7 @@ public final class ToolUtil {
 			if (varDef.argument != null && varDef.argument.length() > 0) {
 				return getLocationFromFullPath(varDef.argument);			
 			} else {
-				return Platform.getLocation().toString() + contents.substring(varDef.end);
+				return Platform.getLocation().toOSString() + contents.substring(varDef.end);
 			}
 		else
 			return contents;