diff options
| author | Greg Watson | 2015-03-31 18:31:08 +0000 |
|---|---|---|
| committer | Greg Watson | 2015-03-31 18:31:08 +0000 |
| commit | 96d506f89a15e77812de621f99bc5a77632448dd (patch) | |
| tree | 6af9b984b79587587327d4469ca0db7d803035f8 | |
| parent | cb6f3e7d1eeafd354ae6518fe901b87db62fab83 (diff) | |
| download | org.eclipse.ptp-96d506f89a15e77812de621f99bc5a77632448dd.tar.gz org.eclipse.ptp-96d506f89a15e77812de621f99bc5a77632448dd.tar.xz org.eclipse.ptp-96d506f89a15e77812de621f99bc5a77632448dd.zip | |
Bug 463033 - Copy environment tab values to script (master)
Change-Id: I0c3709c66baa0f98105ab5fa967f158b6946c79e
Signed-off-by: Greg Watson <g.watson@computer.org>
| -rw-r--r-- | rms/org.eclipse.ptp.rm.jaxb.control.core/src/org/eclipse/ptp/internal/rm/jaxb/control/core/LaunchController.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/rms/org.eclipse.ptp.rm.jaxb.control.core/src/org/eclipse/ptp/internal/rm/jaxb/control/core/LaunchController.java b/rms/org.eclipse.ptp.rm.jaxb.control.core/src/org/eclipse/ptp/internal/rm/jaxb/control/core/LaunchController.java index 1cb666af5..b929f6a52 100644 --- a/rms/org.eclipse.ptp.rm.jaxb.control.core/src/org/eclipse/ptp/internal/rm/jaxb/control/core/LaunchController.java +++ b/rms/org.eclipse.ptp.rm.jaxb.control.core/src/org/eclipse/ptp/internal/rm/jaxb/control/core/LaunchController.java @@ -307,8 +307,8 @@ public class LaunchController implements ILaunchController { } if (command == null) { - throw CoreExceptionUtils.newException(Messages.MissingRunCommandsError + JAXBControlConstants.SP + uuid - + JAXBControlConstants.SP + launchMode, null); + throw CoreExceptionUtils.newException( + Messages.MissingRunCommandsError + JAXBControlConstants.SP + uuid + JAXBControlConstants.SP + launchMode, null); } /* @@ -693,10 +693,8 @@ public class LaunchController implements ILaunchController { * @throws CoreException */ private void maybeCleanupManagedFiles(String uuid, List<ManagedFilesType> lists) throws CoreException { - if (lists == null - || lists.isEmpty() - || Preferences - .getBoolean(JAXBControlCorePlugin.getUniqueIdentifier(), JAXBRMPreferenceConstants.KEEP_MANAGED_FILES)) { + if (lists == null || lists.isEmpty() || Preferences.getBoolean(JAXBControlCorePlugin.getUniqueIdentifier(), + JAXBRMPreferenceConstants.KEEP_MANAGED_FILES)) { return; } for (ManagedFilesType files : lists) { @@ -807,8 +805,8 @@ public class LaunchController implements ILaunchController { SubMonitor progress = SubMonitor.convert(monitor, 100); IRemoteConnection conn = fRemoteServicesDelegate.getRemoteConnection(); LMLDAServer server = (LMLDAServer) RemoteServerManager.getServer(LMLDAServer.SERVER_ID, conn); - server.setWorkDir(new Path(fRemoteServicesDelegate.getRemoteFileService().getBaseDirectory()).append( - JAXBControlConstants.ECLIPSESETTINGS).toString()); + server.setWorkDir(new Path(fRemoteServicesDelegate.getRemoteFileService().getBaseDirectory()) + .append(JAXBControlConstants.ECLIPSESETTINGS).toString()); try { server.updateServer(progress.newChild(100)); } catch (IOException e) { @@ -1305,6 +1303,10 @@ public class LaunchController implements ILaunchController { a.setValue(emsStr); } } + + launchEnv.clear(); + launchEnv.putAll(configuration.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, launchEnv)); + appendLaunchEnv = configuration.getAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, appendLaunchEnv); } /** |