aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoopur Gupta2014-11-26 12:11:17 -0500
committerDani Megert2014-11-26 12:13:36 -0500
commite2a60edba98333769411a6f7088f6a6a49482c27 (patch)
tree231234e13074354f7b6400f9c0a8eb25cfe00e99
parent91ffd9627c061dc5414344f0901d271a620880f6 (diff)
downloadeclipse.platform.ui-e2a60edba98333769411a6f7088f6a6a49482c27.tar.gz
eclipse.platform.ui-e2a60edba98333769411a6f7088f6a6a49482c27.tar.xz
eclipse.platform.ui-e2a60edba98333769411a6f7088f6a6a49482c27.zip
See https://bugs.eclipse.org/bugs/show_bug.cgi?id=264072#c27
Signed-off-by: Noopur Gupta <noopur_gupta@in.ibm.com>
-rw-r--r--bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/OpenWorkspaceAction.java3
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/OpenWorkspaceAction.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/OpenWorkspaceAction.java
index ac1ba61a3d..697d98f2c6 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/OpenWorkspaceAction.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/OpenWorkspaceAction.java
@@ -348,6 +348,9 @@ public class OpenWorkspaceAction extends Action implements
// put the vmargs back at the very end (the eclipse.commands property
// already contains the -vm arg)
if (vmargs != null) {
+ if (result.charAt(result.length() - 1) != '\n') {
+ result.append('\n');
+ }
result.append(CMD_VMARGS);
result.append(NEW_LINE);
result.append(vmargs);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index 039cec094f..b275387c54 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
@@ -2714,6 +2714,9 @@ UIEvents.Context.TOPIC_CONTEXT,
// put the vmargs back at the very end (the eclipse.commands property
// already contains the -vm arg)
if (vmargs != null) {
+ if (result.charAt(result.length() - 1) != '\n') {
+ result.append('\n');
+ }
result.append(CMD_VMARGS);
result.append('\n');
result.append(vmargs);