Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2013-01-26 11:21:00 -0500
committerUwe Stieber2013-01-26 11:21:00 -0500
commitc235f129e53b173f311e93b9a1ad550e195a9ca0 (patch)
tree63ccf5d1b81b5438c038cf8f3169f5f909fee4a3 /target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core
parentd64077bd618263ff6a07f30c63b6a29c597607c9 (diff)
downloadorg.eclipse.tcf-c235f129e53b173f311e93b9a1ad550e195a9ca0.tar.gz
org.eclipse.tcf-c235f129e53b173f311e93b9a1ad550e195a9ca0.tar.xz
org.eclipse.tcf-c235f129e53b173f311e93b9a1ad550e195a9ca0.zip
Target Exploer: Clean up process launcher
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.java77
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.properties33
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/LaunchProcessStep.java4
3 files changed, 56 insertions, 58 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.java
index 28bcaf3e3..b69b7bb1e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.java
@@ -1,39 +1,38 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tcf.te.tcf.launch.core.nls;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * TCF Launch Core Plug-in externalized strings management.
- */
-public class Messages extends NLS {
-
- // The plug-in resource bundle name
- private static final String BUNDLE_NAME = "org.eclipse.tcf.te.tcf.launch.core.nls.Messages"; //$NON-NLS-1$
-
- /**
- * Static constructor.
- */
- static {
- // Load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- // **** Declare externalized string id's down here *****
-
- public static String FileTransferItemValidator_missingFile;
- public static String FileTransferItemValidator_missingFileOrDirectory;
- public static String FileTransferItemValidator_notExistingFile;
- public static String FileTransferItemValidator_notExistingFileOrDirectory;
- public static String FileTransferItemValidator_invalidFile;
- public static String FileTransferItemValidator_invalidFileOrDirectory;
-
-}
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.tcf.launch.core.nls;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * TCF Launch Core Plug-in externalized strings management.
+ */
+public class Messages extends NLS {
+
+ // The plug-in resource bundle name
+ private static final String BUNDLE_NAME = "org.eclipse.tcf.te.tcf.launch.core.nls.Messages"; //$NON-NLS-1$
+
+ /**
+ * Static constructor.
+ */
+ static {
+ // Load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ // **** Declare externalized string id's down here *****
+
+ public static String FileTransferItemValidator_missingFile;
+ public static String FileTransferItemValidator_missingFileOrDirectory;
+ public static String FileTransferItemValidator_notExistingFile;
+ public static String FileTransferItemValidator_notExistingFileOrDirectory;
+ public static String FileTransferItemValidator_invalidFile;
+ public static String FileTransferItemValidator_invalidFileOrDirectory;
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.properties
index 26050f02a..90ef201a0 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/nls/Messages.properties
@@ -1,17 +1,16 @@
-###############################################################################
-# Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved.
-# This program and the accompanying materials are made available under the terms
-# of the Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Wind River Systems - initial API and implementation
-###############################################################################
-
-FileTransferItemValidator_missingFile = Missing file
-FileTransferItemValidator_missingFileOrDirectory = Missing file or directory
-FileTransferItemValidator_notExistingFile = File does not exist or is not readable
-FileTransferItemValidator_notExistingFileOrDirectory = File or directory does not exist or is not writeable
-FileTransferItemValidator_invalidFile = File is not valid
-FileTransferItemValidator_invalidFileOrDirectory = File or directory is not valid
-
+###############################################################################
+# Copyright (c) 2012, 2013 Wind River Systems, Inc. and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License v1.0 which accompanies this distribution, and is
+# available at http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Wind River Systems - initial API and implementation
+###############################################################################
+
+FileTransferItemValidator_missingFile = Missing file
+FileTransferItemValidator_missingFileOrDirectory = Missing file or directory
+FileTransferItemValidator_notExistingFile = File does not exist or is not readable
+FileTransferItemValidator_notExistingFileOrDirectory = File or directory does not exist or is not writeable
+FileTransferItemValidator_invalidFile = File is not valid
+FileTransferItemValidator_invalidFileOrDirectory = File or directory is not valid
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/LaunchProcessStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/LaunchProcessStep.java
index 124957d5d..71de3914f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/LaunchProcessStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/LaunchProcessStep.java
@@ -82,7 +82,7 @@ public class LaunchProcessStep extends AbstractTcfLaunchStep {
* @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStep#execute(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)
*/
@Override
- public void execute(IStepContext context, final IPropertiesContainer data, final IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, final ICallback callback) {
+ public void execute(final IStepContext context, final IPropertiesContainer data, final IFullQualifiedId fullQualifiedId, final IProgressMonitor monitor, final ICallback callback) {
final IChannel channel = (IChannel)StepperAttributeUtil.getProperty(ICommonTCFLaunchAttributes.ATTR_CHANNEL, fullQualifiedId, data);
Assert.isTrue(channel != null && channel.getState() == IChannel.STATE_OPEN, "channel is missing or closed"); //$NON-NLS-1$
@@ -93,7 +93,7 @@ public class LaunchProcessStep extends AbstractTcfLaunchStep {
// Construct the launcher object
final ProcessLauncher launcher = new ProcessLauncher();
- Map<String, Object> launchAttributes = new HashMap<String, Object>();
+ final Map<String, Object> launchAttributes = new HashMap<String, Object>();
launchAttributes.put(IProcessLauncher.PROP_PROCESS_PATH, StepperAttributeUtil.getStringProperty(IRemoteAppLaunchAttributes.ATTR_PROCESS_IMAGE, fullQualifiedId, data));

Back to the top