summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorTobias Schwarz2012-05-08 03:50:50 (EDT)
committer Uwe Stieber2012-05-08 03:50:50 (EDT)
commit9bf931c765f00676a7f695c8f97a20357645909e (patch)
tree9be797baa02907a3661fff8b4a5dda61f25759cf
parent79868a126db1e5d0cea06a46512ec13bc93576c1 (diff)
downloadorg.eclipse.tcf-9bf931c765f00676a7f695c8f97a20357645909e.zip
org.eclipse.tcf-9bf931c765f00676a7f695c8f97a20357645909e.tar.gz
org.eclipse.tcf-9bf931c765f00676a7f695c8f97a20357645909e.tar.bz2
Target Explorer: Remove run process action, add run and debug actions to peer
and resource nodes
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml22
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/DebugHandler.java25
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchDialogHandler.java63
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchHandler.java28
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchShortcutHandler.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchShortcut.java)228
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/OpenActionProvider.java63
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/RunHandler.java25
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/RemoteAppLaunchManagerDelegate.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties44
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml156
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF85
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml39
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/dialogs/ProcessSelectionDialog.java125
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/dialogs/LaunchObjectDialog.java398
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/handler/LaunchProcessesCommandHandler.java116
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.java367
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.properties250
17 files changed, 767 insertions, 1270 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml
index 44b2306..2d249bd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/plugin.xml
@@ -62,6 +62,14 @@
<commonSorter
class="org.eclipse.tcf.te.launch.ui.internal.viewer.LaunchTreeViewerSorter">
</commonSorter>
+ <actionProvider
+ class="org.eclipse.tcf.te.launch.ui.internal.handler.OpenActionProvider"
+ id="org.eclipse.tcf.te.launch.ui.actions.open"
+ overrides="org.eclipse.ui.navigator.resources.OpenActions">
+ <enablement>
+ <reference definitionId="launch.expressions.isSingleLaunchConfig"/>
+ </enablement>
+ </actionProvider>
</navigatorContent>
</extension>
@@ -560,9 +568,10 @@
</and>
</activeWhen>
</handler>
- <handler
- commandId="org.eclipse.tcf.te.ui.launch.command.run"
- class="org.eclipse.tcf.te.launch.ui.internal.handler.RunHandler">
+ <handler commandId="org.eclipse.tcf.te.ui.launch.command.run">
+ <class class="org.eclipse.tcf.te.launch.ui.internal.handler.LaunchHandler">
+ <parameter name="mode" value="run"/>
+ </class>
<activeWhen>
<and>
<with variable="activePartId">
@@ -583,9 +592,10 @@
</with>
</enabledWhen>
</handler>
- <handler
- commandId="org.eclipse.tcf.te.ui.launch.command.debug"
- class="org.eclipse.tcf.te.launch.ui.internal.handler.DebugHandler">
+ <handler commandId="org.eclipse.tcf.te.ui.launch.command.debug">
+ <class class="org.eclipse.tcf.te.launch.ui.internal.handler.LaunchHandler">
+ <parameter name="mode" value="debug"/>
+ </class>
<activeWhen>
<and>
<with variable="activePartId">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/DebugHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/DebugHandler.java
deleted file mode 100644
index d40b7ff..0000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/DebugHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.tcf.te.launch.ui.internal.handler;
-
-import org.eclipse.debug.core.ILaunchManager;
-
-/**
- * Run launch handler implementation.
- */
-public class DebugHandler extends LaunchHandler {
-
- /**
- * Constructor.
- */
- public DebugHandler() {
- super(ILaunchManager.DEBUG_MODE);
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchDialogHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchDialogHandler.java
index 7215c0d..fc91556 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchDialogHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchDialogHandler.java
@@ -47,39 +47,42 @@ public class LaunchDialogHandler extends AbstractHandler {
if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
Object element = ((IStructuredSelection)selection).getFirstElement();
if (element instanceof LaunchNode) {
- LaunchNode node = (LaunchNode)element;
- if (node.getLaunchConfiguration() != null) {
- final String[] modes = LaunchConfigHelper.getLaunchConfigTypeModes(node.getLaunchConfigurationType(), false);
- List<String> modeLabels = new ArrayList<String>();
- int defaultIndex = 0;
- for (String mode : modes) {
- if (LaunchManager.getInstance().validate(node.getLaunchConfiguration(), mode)) {
- ILaunchMode launchMode = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(mode);
- modeLabels.add(launchMode.getLabel());
- if (mode.equals(ILaunchManager.DEBUG_MODE)) {
- defaultIndex = modeLabels.size()-1;
- }
- }
- }
- if (modeLabels.size() >= 1) {
- modeLabels.add(IDialogConstants.CANCEL_LABEL);
- OptionalMessageDialog dialog = new OptionalMessageDialog(
- UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),
- Messages.LaunchDialogHandler_dialog_title,
- null,
- NLS.bind(Messages.LaunchDialogHandler_dialog_message, node.getLaunchConfigurationType().getName(), node.getLaunchConfiguration().getName()),
- MessageDialog.QUESTION,
- modeLabels.toArray(new String[modeLabels.size()]),
- defaultIndex,
- null, null);
- int result = dialog.open();
- if (result >= IDialogConstants.INTERNAL_ID) {
- DebugUITools.launch(node.getLaunchConfiguration(), modes[result - IDialogConstants.INTERNAL_ID]);
- }
+ doLaunch((LaunchNode)element);
+ }
+ }
+ return null;
+ }
+
+ protected void doLaunch(LaunchNode node) {
+ if (node != null && node.getLaunchConfiguration() != null) {
+ final String[] modes = LaunchConfigHelper.getLaunchConfigTypeModes(node.getLaunchConfigurationType(), false);
+ List<String> modeLabels = new ArrayList<String>();
+ int defaultIndex = 0;
+ for (String mode : modes) {
+ if (LaunchManager.getInstance().validate(node.getLaunchConfiguration(), mode)) {
+ ILaunchMode launchMode = DebugPlugin.getDefault().getLaunchManager().getLaunchMode(mode);
+ modeLabels.add(launchMode.getLabel());
+ if (mode.equals(ILaunchManager.DEBUG_MODE)) {
+ defaultIndex = modeLabels.size()-1;
}
}
}
+ if (modeLabels.size() >= 1) {
+ modeLabels.add(IDialogConstants.CANCEL_LABEL);
+ OptionalMessageDialog dialog = new OptionalMessageDialog(
+ UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.LaunchDialogHandler_dialog_title,
+ null,
+ NLS.bind(Messages.LaunchDialogHandler_dialog_message, node.getLaunchConfigurationType().getName(), node.getLaunchConfiguration().getName()),
+ MessageDialog.QUESTION,
+ modeLabels.toArray(new String[modeLabels.size()]),
+ defaultIndex,
+ null, null);
+ int result = dialog.open();
+ if (result >= IDialogConstants.INTERNAL_ID) {
+ DebugUITools.launch(node.getLaunchConfiguration(), modes[result - IDialogConstants.INTERNAL_ID]);
+ }
+ }
}
- return null;
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchHandler.java
index 1a13c38..bbfbb1d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchHandler.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchHandler.java
@@ -9,9 +9,15 @@
*******************************************************************************/
package org.eclipse.tcf.te.launch.ui.internal.handler;
+import java.util.Map;
+
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -21,19 +27,16 @@ import org.eclipse.ui.handlers.HandlerUtil;
/**
* Launch handler implementation.
*/
-public class LaunchHandler extends AbstractHandler {
-
- private String mode;
+public class LaunchHandler extends AbstractHandler implements IExecutableExtension {
- public LaunchHandler(String mode) {
- this.mode = mode;
- }
+ private String mode = null;
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
+ Assert.isNotNull(mode);
// Get the current selection
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
@@ -47,4 +50,17 @@ public class LaunchHandler extends AbstractHandler {
}
return null;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ */
+ @Override
+ public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+ if (data != null && data instanceof Map) {
+ String launchMode = (String)((Map<?,?>)data).get("mode"); //$NON-NLS-1$
+ if (launchMode != null) {
+ mode = launchMode;
+ }
+ }
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchShortcut.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchShortcutHandler.java
index 2ba8721..856ee91 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchShortcut.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/LaunchShortcutHandler.java
@@ -1,113 +1,115 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-
-package org.eclipse.tcf.te.tcf.launch.ui.remote.app;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.ILaunchGroup;
-import org.eclipse.debug.ui.ILaunchShortcut2;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.tcf.te.launch.core.lm.LaunchManager;
-import org.eclipse.tcf.te.launch.core.lm.interfaces.ILaunchManagerDelegate;
-import org.eclipse.tcf.te.launch.core.lm.interfaces.ILaunchSpecification;
-import org.eclipse.tcf.te.launch.core.selection.interfaces.ILaunchSelection;
-import org.eclipse.tcf.te.launch.ui.selection.LaunchSelectionManager;
-import org.eclipse.tcf.te.tcf.launch.core.interfaces.ILaunchTypes;
-import org.eclipse.tcf.te.tcf.launch.ui.activator.UIPlugin;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * LaunchShortcut
- */
-public class LaunchShortcut implements ILaunchShortcut2 {
-
- /**
- * Constructor.
- */
- public LaunchShortcut() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.jface.viewers.ISelection, java.lang.String)
- */
- @Override
- public void launch(ISelection selection, String mode) {
- ILaunchConfigurationType launchConfigType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(ILaunchTypes.REMOTE_APPLICATION);
- try {
- ILaunchSelection launchSelection = LaunchSelectionManager.getInstance().getLaunchSelection(launchConfigType, mode, null);
- ILaunchManagerDelegate delegate = LaunchManager.getInstance().getLaunchManagerDelegate(launchConfigType, mode);
- if (delegate != null && launchSelection != null) {
- // create an empty launch configuration specification to initialize all attributes with their default defaults.
- ILaunchSpecification launchSpec = delegate.getLaunchSpecification(launchConfigType.getIdentifier(), launchSelection);
- // initialize the new launch config.
- // ignore validation result of launch spec - init as much attributes as possible
- if (launchSpec != null) {
- ILaunchConfiguration[] launchConfigs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(launchConfigType);
- launchConfigs = delegate.getMatchingLaunchConfigurations(launchSpec, launchConfigs);
-
- ILaunchConfiguration config = launchConfigs != null && launchConfigs.length > 0 ? launchConfigs[0] : null;
- config = LaunchManager.getInstance().createOrUpdateLaunchConfiguration(config, launchSpec);
-
- ILaunchGroup launchGroup = DebugUITools.getLaunchGroup(config, mode);
- DebugUITools.openLaunchConfigurationDialogOnGroup(UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), new StructuredSelection(config), launchGroup.getIdentifier());
- }
- }
- }
- catch (Exception e) {
- DebugUITools.openLaunchConfigurationDialogOnGroup(UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), null, null);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.ui.IEditorPart, java.lang.String)
- */
- @Override
- public void launch(IEditorPart editor, String mode) {
- launch((ISelection)null, mode);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.jface.viewers.ISelection)
- */
- @Override
- public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchConfigurations(org.eclipse.ui.IEditorPart)
- */
- @Override
- public ILaunchConfiguration[] getLaunchConfigurations(IEditorPart editorpart) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.jface.viewers.ISelection)
- */
- @Override
- public IResource getLaunchableResource(ISelection selection) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchShortcut2#getLaunchableResource(org.eclipse.ui.IEditorPart)
- */
- @Override
- public IResource getLaunchableResource(IEditorPart editorpart) {
- return null;
- }
-
-}
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+
+package org.eclipse.tcf.te.launch.ui.internal.handler;
+
+import java.util.Map;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.ILaunchGroup;
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.tcf.te.launch.core.lm.LaunchManager;
+import org.eclipse.tcf.te.launch.core.lm.interfaces.ILaunchManagerDelegate;
+import org.eclipse.tcf.te.launch.core.lm.interfaces.ILaunchSpecification;
+import org.eclipse.tcf.te.launch.core.selection.interfaces.ILaunchSelection;
+import org.eclipse.tcf.te.launch.ui.activator.UIPlugin;
+import org.eclipse.tcf.te.launch.ui.selection.LaunchSelectionManager;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * LaunchShortcutHandler
+ */
+public class LaunchShortcutHandler extends AbstractHandler implements ILaunchShortcut, IExecutableExtension {
+
+ private String mode = null;
+ private String typeId = null;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.jface.viewers.ISelection, java.lang.String)
+ */
+ @Override
+ public void launch(ISelection selection, String mode) {
+ Assert.isNotNull(typeId);
+ ILaunchConfigurationType launchConfigType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(typeId);
+ try {
+ ILaunchSelection launchSelection = LaunchSelectionManager.getInstance().getLaunchSelection(launchConfigType, mode, null);
+ ILaunchManagerDelegate delegate = LaunchManager.getInstance().getLaunchManagerDelegate(launchConfigType, mode);
+ if (delegate != null && launchSelection != null) {
+ // create an empty launch configuration specification to initialize all attributes with their default defaults.
+ ILaunchSpecification launchSpec = delegate.getLaunchSpecification(launchConfigType.getIdentifier(), launchSelection);
+ // initialize the new launch config.
+ // ignore validation result of launch spec - init as much attributes as possible
+ if (launchSpec != null) {
+ ILaunchConfiguration[] launchConfigs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(launchConfigType);
+ launchConfigs = delegate.getMatchingLaunchConfigurations(launchSpec, launchConfigs);
+
+ ILaunchConfiguration config = launchConfigs != null && launchConfigs.length > 0 ? launchConfigs[0] : null;
+ config = LaunchManager.getInstance().createOrUpdateLaunchConfiguration(config, launchSpec);
+
+ ILaunchGroup launchGroup = DebugUITools.getLaunchGroup(config, mode);
+ DebugUITools.openLaunchConfigurationDialogOnGroup(UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), new StructuredSelection(config), launchGroup.getIdentifier());
+ }
+ }
+ }
+ catch (Exception e) {
+ DebugUITools.openLaunchConfigurationDialogOnGroup(UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(), null, null);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.ui.IEditorPart, java.lang.String)
+ */
+ @Override
+ public void launch(IEditorPart editor, String mode) {
+ launch((ISelection)null, mode);
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ */
+ @Override
+ public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
+ if (data != null && data instanceof Map) {
+ String launchMode = (String)((Map<?,?>)data).get("mode"); //$NON-NLS-1$
+ if (launchMode != null) {
+ mode = launchMode;
+ }
+ String launchTypeId = (String)((Map<?,?>)data).get("typeId"); //$NON-NLS-1$
+ if (launchTypeId != null) {
+ typeId = launchTypeId;
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+ */
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ Assert.isNotNull(mode);
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ launch(selection, mode);
+ return null;
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/OpenActionProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/OpenActionProvider.java
new file mode 100644
index 0000000..15860d7
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/OpenActionProvider.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+
+package org.eclipse.tcf.te.launch.ui.internal.handler;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.tcf.te.launch.ui.model.LaunchNode;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionConstants;
+
+/**
+ * OpenActionProvider
+ */
+public class OpenActionProvider extends CommonActionProvider {
+
+ private OpenAction openAction = new OpenAction();
+
+ protected static class OpenAction extends Action {
+
+ private LaunchDialogHandler handler = new LaunchDialogHandler();
+ private LaunchNode node = null;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @Override
+ public void run() {
+ handler.doLaunch(node);
+ }
+
+ public void selectionChanged(ISelection selection) {
+ node = null;
+ if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+ Object element = ((IStructuredSelection)selection).getFirstElement();
+ if (element instanceof LaunchNode && ((LaunchNode)element).getLaunchConfiguration() != null) {
+ node = (LaunchNode)element;
+ }
+ }
+ setEnabled(node != null);
+ }
+ }
+
+ /*
+ * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
+ */
+ @Override
+ public void fillActionBars(IActionBars actionBars) {
+ openAction.selectionChanged(getContext().getSelection());
+ if (openAction.isEnabled()) {
+ actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
+ }
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/RunHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/RunHandler.java
deleted file mode 100644
index e65d0ac..0000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/handler/RunHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.tcf.te.launch.ui.internal.handler;
-
-import org.eclipse.debug.core.ILaunchManager;
-
-/**
- * Run launch handler implementation.
- */
-public class RunHandler extends LaunchHandler {
-
- /**
- * Constructor.
- */
- public RunHandler() {
- super(ILaunchManager.RUN_MODE);
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/RemoteAppLaunchManagerDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/RemoteAppLaunchManagerDelegate.java
index 9772277..8e5ff5f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/RemoteAppLaunchManagerDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/RemoteAppLaunchManagerDelegate.java
@@ -97,7 +97,10 @@ public class RemoteAppLaunchManagerDelegate extends DefaultLaunchManagerDelegate
}
IPropertiesAccessService service = ServiceManager.getInstance().getService(remoteCtx, IPropertiesAccessService.class);
+
+ Object dnsName = service != null ? service.getProperty(remoteCtx, "dns.name.transient") : null; //$NON-NLS-1$
String ctxName = service != null ? (String)service.getTargetAddress(remoteCtx).get(IPropertiesAccessServiceConstants.PROP_ADDRESS) : null;
+ ctxName = dnsName != null && dnsName.toString().trim().length() > 0 ? dnsName.toString().trim() : ctxName;
if (ctxName != null) {
if (launchSpec.getLaunchConfigName() == null ||
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties
index eed629c..cbb457b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.properties
@@ -1,21 +1,23 @@
-##################################################################################
-# Copyright (c) 2011 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
-##################################################################################
-
-pluginName = Target Explorer, TCF Launching, UI
-providerName = Eclipse.org - TCF
-
-# ***** Command contributions *****
-
-Command.showInDebugView.name=Show In Debug View Command
-Command.showInDebugView.description=Show the selection in the Debug View.
-
-LauchTree.name=Launches
-
-LaunchShortcut.Remote.App.name=Remote Application
+##################################################################################
+# Copyright (c) 2011 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
+##################################################################################
+
+pluginName = Target Explorer, TCF Launching, UI
+providerName = Eclipse.org - TCF
+
+# ***** Command contributions *****
+
+Command.showInDebugView.name=Show In Debug View Command
+Command.showInDebugView.description=Show the selection in the Debug View.
+
+LauchTree.name=Launches
+
+LaunchShortcutHandler.Remote.App.run.name=Run Remote Application
+LaunchShortcutHandler.Remote.App.debug.name=Debug Remote Application
+LaunchShortcut.Remote.App.name=Remote Application
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
index db4d925..1671f23 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
@@ -30,11 +30,13 @@
<!-- Launch shortcut contributions -->
<extension point="org.eclipse.debug.ui.launchShortcuts">
<shortcut
- class="org.eclipse.tcf.te.tcf.launch.ui.remote.app.LaunchShortcut"
id="org.eclipse.tcf.te.tcf.launch.ui.launchshortcut.remote.app.run"
label="%LaunchShortcut.Remote.App.name"
icon="icons/obj16/remote_app.gif"
modes="run">
+ <class class="org.eclipse.tcf.te.launch.ui.internal.handler.LaunchShortcutHandler">
+ <parameter name="typeId" value="org.eclipse.tcf.te.tcf.launch.type.remote.app"/>
+ </class>
<contextualLaunch>
<enablement>
<with variable="selection">
@@ -53,11 +55,13 @@
</contextualLaunch>
</shortcut>
<shortcut
- class="org.eclipse.tcf.te.tcf.launch.ui.remote.app.LaunchShortcut"
id="org.eclipse.tcf.te.tcf.launch.ui.launchshortcut.remote.app.debug"
label="%LaunchShortcut.Remote.App.name"
icon="icons/obj16/remote_app.gif"
modes="debug">
+ <class class="org.eclipse.tcf.te.launch.ui.internal.handler.LaunchShortcutHandler">
+ <parameter name="typeId" value="org.eclipse.tcf.te.tcf.launch.type.remote.app"/>
+ </class>
<contextualLaunch>
<enablement>
<with variable="selection">
@@ -122,6 +126,154 @@
</navigatorContent>
</extension>
+<!-- Menu contributions -->
+ <extension point="org.eclipse.ui.menus">
+ <!-- Project explorer menu contributions -->
+ <menuContribution locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?before=additions">
+ <separator name="org.eclipse.tcf.te.tcf.ui.launch.remote.app.launch" visible="true"/>
+ <command
+ commandId="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.run"
+ disabledIcon="platform:/plugin/org.eclipse.debug.ui/icons/full/dtool16/run_exc.gif"
+ icon="platform:/plugin/org.eclipse.debug.ui/icons/full/etool16/run_exc.gif"
+ id="org.eclipse.tcf.te.tcf.ui.launch.remote.app.run"
+ label="%LaunchShortcutHandler.Remote.App.run.name"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <with variable="selection">
+ <iterate
+ operator="and"
+ ifEmpty="false">
+ <instanceof value="org.eclipse.core.resources.IResource"/>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.debug"
+ disabledIcon="platform:/plugin/org.eclipse.debug.ui/icons/full/dtool16/debug_exc.gif"
+ icon="platform:/plugin/org.eclipse.debug.ui/icons/full/etool16/debug_exc.gif"
+ id="org.eclipse.tcf.te.tcf.ui.launch.remote.app.debug"
+ label="%LaunchShortcutHandler.Remote.App.debug.name"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <with variable="selection">
+ <iterate
+ operator="and"
+ ifEmpty="false">
+ <instanceof value="org.eclipse.core.resources.IResource"/>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <!-- Target explorer menu contributions -->
+ <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?before=additions">
+ <separator name="org.eclipse.tcf.te.tcf.ui.launch.remote.app.launch" visible="true"/>
+ <command
+ commandId="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.run"
+ disabledIcon="platform:/plugin/org.eclipse.debug.ui/icons/full/dtool16/run_exc.gif"
+ icon="platform:/plugin/org.eclipse.debug.ui/icons/full/etool16/run_exc.gif"
+ id="org.eclipse.tcf.te.tcf.ui.launch.remote.app.run"
+ label="%LaunchShortcutHandler.Remote.App.run.name"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <with variable="selection">
+ <iterate
+ operator="and"
+ ifEmpty="false">
+ <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.debug"
+ disabledIcon="platform:/plugin/org.eclipse.debug.ui/icons/full/dtool16/debug_exc.gif"
+ icon="platform:/plugin/org.eclipse.debug.ui/icons/full/etool16/debug_exc.gif"
+ id="org.eclipse.tcf.te.tcf.ui.launch.remote.app.debug"
+ label="%LaunchShortcutHandler.Remote.App.debug.name"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <with variable="selection">
+ <iterate
+ operator="and"
+ ifEmpty="false">
+ <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+
+<!-- Command contributions -->
+ <extension point="org.eclipse.ui.commands">
+ <command
+ categoryId="org.eclipse.tcf.te.ui.commands.category"
+ id="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.run"
+ name="%LaunchShortcutHandler.Remote.App.run.name"/>
+ <command
+ categoryId="org.eclipse.tcf.te.ui.commands.category"
+ id="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.debug"
+ name="%LaunchShortcutHandler.Remote.App.debug.name"/>
+ </extension>
+
+<!-- Handler contributions -->
+ <extension point="org.eclipse.ui.handlers">
+ <handler commandId="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.run">
+ <class class="org.eclipse.tcf.te.launch.ui.internal.handler.LaunchShortcutHandler">
+ <parameter name="mode" value="run"/>
+ <parameter name="typeId" value="org.eclipse.tcf.te.tcf.launch.type.remote.app"/>
+ </class>
+ <activeWhen>
+ <with variable="activePartId">
+ <or>
+ <equals value="org.eclipse.tcf.te.ui.views.View"/>
+ <equals value="org.eclipse.ui.navigator.ProjectExplorer"/>
+ </or>
+ </with>
+ </activeWhen>
+ <enabledWhen>
+ <with variable="selection">
+ <iterate
+ operator="and"
+ ifEmpty="false">
+ <or>
+ <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+ <instanceof value="org.eclipse.core.resources.IResource"/>
+ </or>
+ </iterate>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler commandId="org.eclipse.tcf.te.tcf.ui.launch.remote.app.command.debug">
+ <class class="org.eclipse.tcf.te.launch.ui.internal.handler.LaunchShortcutHandler">
+ <parameter name="mode" value="debug"/>
+ <parameter name="typeId" value="org.eclipse.tcf.te.tcf.launch.type.remote.app"/>
+ </class>
+ <activeWhen>
+ <with variable="activePartId">
+ <or>
+ <equals value="org.eclipse.tcf.te.ui.views.View"/>
+ <equals value="org.eclipse.ui.navigator.ProjectExplorer"/>
+ </or>
+ </with>
+ </activeWhen>
+ <enabledWhen>
+ <with variable="selection">
+ <iterate
+ operator="and"
+ ifEmpty="false">
+ <or>
+ <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+ <instanceof value="org.eclipse.core.resources.IResource"/>
+ </or>
+ </iterate>
+ </with>
+ </enabledWhen>
+ </handler>
+ </extension>
+
<!-- Property section contributions -->
<extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
<propertySections contributorId="org.eclipse.tcf.te.ui">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF
index a47553d..68e1010 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/META-INF/MANIFEST.MF
@@ -1,43 +1,42 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tcf.te.tcf.processes.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.tcf.te.tcf.processes.ui.activator.UIPlugin
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.core.expressions,
- org.eclipse.ui.navigator,
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.tcf.core;bundle-version="1.0.0",
- org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
- org.eclipse.tcf.te.runtime.model;bundle-version="1.0.0",
- org.eclipse.tcf.te.runtime.services;bundle-version="1.0.0",
- org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.0.0",
- org.eclipse.tcf.te.core;bundle-version="1.0.0",
- org.eclipse.tcf.te.ui;bundle-version="1.0.0",
- org.eclipse.tcf.te.ui.swt;bundle-version="1.0.0",
- org.eclipse.tcf.te.ui.views;bundle-version="1.0.0",
- org.eclipse.tcf.te.tcf.locator;bundle-version="1.0.0",
- org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.0.0",
- org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.0.0",
- org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.0.0",
- org.eclipse.tcf.te.tcf.ui;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tcf.te.tcf.processes.ui.activator;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.controls,
- org.eclipse.tcf.te.tcf.processes.ui.dialogs,
- org.eclipse.tcf.te.tcf.processes.ui.help,
- org.eclipse.tcf.te.tcf.processes.ui.interfaces,
- org.eclipse.tcf.te.tcf.processes.ui.internal.adapters;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.columns;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.dialogs;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.filters;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.handler;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.preferences;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.properties;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.tabbed;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.internal.testers;x-internal:=true,
- org.eclipse.tcf.te.tcf.processes.ui.nls;x-internal:=true
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tcf.te.tcf.processes.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tcf.te.tcf.processes.ui.activator.UIPlugin
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.core.expressions,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
+ org.eclipse.tcf.core;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.model;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.services;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.0.0",
+ org.eclipse.tcf.te.core;bundle-version="1.0.0",
+ org.eclipse.tcf.te.ui;bundle-version="1.0.0",
+ org.eclipse.tcf.te.ui.swt;bundle-version="1.0.0",
+ org.eclipse.tcf.te.ui.views;bundle-version="1.0.0",
+ org.eclipse.tcf.te.tcf.locator;bundle-version="1.0.0",
+ org.eclipse.tcf.te.tcf.filesystem.core;bundle-version="1.0.0",
+ org.eclipse.tcf.te.tcf.filesystem.ui;bundle-version="1.0.0",
+ org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.0.0",
+ org.eclipse.tcf.te.tcf.ui;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.eclipse.tcf.te.tcf.processes.ui.activator;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.controls,
+ org.eclipse.tcf.te.tcf.processes.ui.help,
+ org.eclipse.tcf.te.tcf.processes.ui.interfaces,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.adapters;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.columns;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.dialogs;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.filters;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.handler;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.preferences;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.properties;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.tabbed;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.internal.testers;x-internal:=true,
+ org.eclipse.tcf.te.tcf.processes.ui.nls;x-internal:=true
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
index c0867a7..123f1b7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
@@ -39,33 +39,7 @@
<!-- Processes menu contributions -->
<extension point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.launch">
- <command
- commandId="org.eclipse.tcf.te.tcf.processes.ui.command.launch"
- helpContextId="org.eclipse.tcf.te.tcf.processes.ui.command_Launch"
- icon="platform:/plugin/org.eclipse.debug.ui/icons/full/obj16/lrun_obj.gif"
- id="org.eclipse.tcf.te.tcf.processes.ui.commands.launch"
- label="%command.launch.label"
- style="push"
- tooltip="%command.launch.tooltip">
- <visibleWhen checkEnabled="false">
- <and>
- <with variable="selection">
- <count value="1"/>
- <iterate operator="and" ifEmpty="false">
- <adapt type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel">
- <test
- property="org.eclipse.tcf.te.tcf.locator.hasRemoteService"
- value="Processes">
- </test>
- </adapt>
- </iterate>
- </with>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
-
+
<menuContribution locationURI="toolbar:org.eclipse.tcf.te.ui.controls.menu.processes?before=additions">
<command
commandId="org.eclipse.tcf.te.tcf.processes.ui.command.refreshViewer"
@@ -306,12 +280,6 @@
<extension point="org.eclipse.ui.commands">
<command
categoryId="org.eclipse.tcf.te.ui.commands.category"
- helpContextId="org.eclipse.tcf.te.tcf.processes.ui.command_Launch"
- id="org.eclipse.tcf.te.tcf.processes.ui.command.launch"
- name="%command.launch.name">
- </command>
- <command
- categoryId="org.eclipse.tcf.te.ui.commands.category"
helpContextId="org.eclipse.tcf.te.tcf.processes.ui.command_Refresh"
id="org.eclipse.tcf.te.tcf.processes.ui.command.refreshViewer"
name="%command.refresh.name">
@@ -333,11 +301,6 @@
<!-- Handler contributions -->
<extension point="org.eclipse.ui.handlers">
<handler
- class="org.eclipse.tcf.te.tcf.processes.ui.internal.handler.LaunchProcessesCommandHandler"
- commandId="org.eclipse.tcf.te.tcf.processes.ui.command.launch">
- </handler>
-
- <handler
class="org.eclipse.tcf.te.tcf.processes.ui.internal.handler.RefreshProcessListHandler"
commandId="org.eclipse.tcf.te.tcf.processes.ui.command.refreshViewer">
</handler>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/dialogs/ProcessSelectionDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/dialogs/ProcessSelectionDialog.java
deleted file mode 100644
index be6713d..0000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/dialogs/ProcessSelectionDialog.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.processes.ui.dialogs;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tcf.te.tcf.processes.core.model.ProcessTreeNode;
-import org.eclipse.tcf.te.tcf.processes.ui.controls.ProcessTreeContentProvider;
-import org.eclipse.tcf.te.tcf.processes.ui.controls.ProcessViewerSorter;
-import org.eclipse.tcf.te.tcf.processes.ui.internal.columns.ProcessLabelProvider;
-import org.eclipse.tcf.te.ui.activator.UIPlugin;
-import org.eclipse.tcf.te.ui.interfaces.IUIConstants;
-import org.eclipse.tcf.te.ui.trees.FilterDescriptor;
-import org.eclipse.tcf.te.ui.trees.ViewerStateManager;
-import org.eclipse.ui.IDecoratorManager;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Process selection dialog.
- */
-public class ProcessSelectionDialog extends ElementTreeSelectionDialog {
- /**
- * Create an FSFolderSelectionDialog using the specified shell as the parent.
- *
- * @param parentShell The parent shell.
- */
- public ProcessSelectionDialog(Shell parentShell) {
- this(parentShell, new ProcessLabelProvider(), new ProcessTreeContentProvider());
- }
-
- /**
- * Create an FSFolderSelectionDialog using the specified shell, an FSTreeLabelProvider, and a
- * content provider that provides the tree nodes.
- *
- * @param parentShell The parent shell.
- * @param labelProvider The label provider.
- * @param contentProvider The content provider.
- */
- private ProcessSelectionDialog(Shell parentShell, ILabelProvider labelProvider, ITreeContentProvider contentProvider) {
- super(parentShell, createDecoratingLabelProvider(labelProvider), contentProvider);
- this.setAllowMultiple(false);
- this.setStatusLineAboveButtons(false);
- this.setComparator(new ProcessViewerSorter());
- this.setValidator(new ISelectionStatusValidator() {
- @Override
- public IStatus validate(Object[] selection) {
- return isValidSelection(selection);
- }
- });
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.dialogs.ElementTreeSelectionDialog#setInput(java.lang.Object)
- */
- @Override
- public void setInput(Object input) {
- super.setInput(input);
- FilterDescriptor[] filterDescriptors = ViewerStateManager.getInstance().
- getFilterDescriptors(IUIConstants.ID_CONTROL_MENUS_BASE + ".viewer.processes", input); //$NON-NLS-1$
- if (filterDescriptors != null) {
- for(FilterDescriptor descriptor : filterDescriptors) {
- if(descriptor.isEnabled()) addFilter(descriptor.getFilter());
- }
- }
- }
-
- /**
- * Create a decorating label provider using the specified label provider.
- *
- * @param labelProvider The label provider that actually provides labels and images.
- * @return The decorating label provider.
- */
- private static ILabelProvider createDecoratingLabelProvider(ILabelProvider labelProvider) {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IDecoratorManager manager = workbench.getDecoratorManager();
- ILabelDecorator decorator = manager.getLabelDecorator();
- return new DecoratingLabelProvider(labelProvider,decorator);
- }
-
- /**
- * Create the tree viewer and set it to the label provider.
- */
- @Override
- protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
- TreeViewer viewer = super.doCreateTreeViewer(parent, style);
- viewer.getTree().setLinesVisible(false);
- return viewer;
- }
-
- /**
- * If the specified selection is a valid folder to be selected.
- *
- * @param selection The selected folders.
- * @return An error status if it is invalid or an OK status indicating it is valid.
- */
- IStatus isValidSelection(Object[] selection) {
- String pluginId = UIPlugin.getUniqueIdentifier();
- IStatus error = new Status(IStatus.ERROR, pluginId, null);
- if (selection == null || selection.length == 0) {
- return error;
- }
- if (!(selection[0] instanceof ProcessTreeNode)) {
- return error;
- }
- return new Status(IStatus.OK, pluginId, null);
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/dialogs/LaunchObjectDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/dialogs/LaunchObjectDialog.java
deleted file mode 100644
index 45f7049..0000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/dialogs/LaunchObjectDialog.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.processes.ui.internal.dialogs;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.tcf.te.core.utils.text.StringUtil;
-import org.eclipse.tcf.te.runtime.services.interfaces.constants.ILineSeparatorConstants;
-import org.eclipse.tcf.te.runtime.services.interfaces.constants.ITerminalsConnectorConstants;
-import org.eclipse.tcf.te.tcf.filesystem.core.model.FSTreeNode;
-import org.eclipse.tcf.te.tcf.filesystem.ui.dialogs.FSOpenFileDialog;
-import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
-import org.eclipse.tcf.te.tcf.processes.core.interfaces.launcher.IProcessLauncher;
-import org.eclipse.tcf.te.tcf.processes.ui.help.IContextHelpIds;
-import org.eclipse.tcf.te.tcf.processes.ui.nls.Messages;
-import org.eclipse.tcf.te.ui.jface.dialogs.CustomTrayDialog;
-import org.eclipse.tcf.te.ui.swt.SWTControlUtil;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Launch object at selected peer dialog.
- */
-public class LaunchObjectDialog extends CustomTrayDialog {
- private Text imagePath;
- private Button imagePathBrowse;
- private Text arguments;
- /* default */ IPeerModel node;
- /* default */ Button lineSeparatorDefault;
- /* default */ Button lineSeparatorLF;
- /* default */ Button lineSeparatorCRLF;
- /* default */ Button lineSeparatorCR;
-
- private Map<String, Object> launchAttributes = null;
- /* default */ final IEditorPart part;
-
- /**
- * Constructor.
- *
- * @param parent The parent shell used to view the dialog.
- */
- public LaunchObjectDialog(Shell parent) {
- this(null, parent);
- }
-
- /**
- * Constructor.
- *
- * @param parent The parent shell used to view the dialog.
- */
- public LaunchObjectDialog(IEditorPart part, Shell parent) {
- this(part, parent, IContextHelpIds.LAUNCH_OBJECT_DIALOG);
- }
-
- /**
- * Constructor.
- *
- * @param part The parent editor part or <code>null</code>.
- * @param parent The parent shell used to view the dialog.
- * @param contextHelpId The dialog context help id or <code>null</code>.
- */
- public LaunchObjectDialog(IEditorPart part, Shell parent, String contextHelpId) {
- super(parent, contextHelpId);
- this.part = part;
- }
-
- /**
- * Set the peer node that this dialog relates to.
- *
- * @param node The peer node.
- */
- public void setNode(IPeerModel node) {
- this.node = node;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.ui.jface.dialogs.CustomTrayDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
-
- configureTitles();
-
- Composite panel = new Composite(composite, SWT.NONE);
- panel.setLayout(new GridLayout(3, false));
- panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- // Add the controls
- Label label = new Label(panel, SWT.NONE);
- label.setText(Messages.LaunchObjectDialog_image_label);
-
- imagePath = new Text(panel, SWT.SINGLE | SWT.BORDER);
- GridData layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- layoutData.widthHint = SWTControlUtil.convertWidthInCharsToPixels(imagePath, 40);
- imagePath.setLayoutData(layoutData);
- imagePath.addModifyListener(new ModifyListener() {
- @Override
- public void modifyText(ModifyEvent e) {
- validateDialog();
- }
- });
-
- imagePathBrowse = new Button(panel, SWT.PUSH);
- imagePathBrowse.setText(org.eclipse.tcf.te.ui.nls.Messages.EditBrowseTextControl_button_label);
- imagePathBrowse.addSelectionListener(new SelectionAdapter() {
- @SuppressWarnings("synthetic-access")
- @Override
- public void widgetSelected(SelectionEvent e) {
- FSOpenFileDialog dialog = new FSOpenFileDialog(getShell());
- dialog.setInput(node);
- if (dialog.open() == Window.OK) {
- Object candidate = dialog.getFirstResult();
- if (candidate instanceof FSTreeNode) {
- String absPath = ((FSTreeNode) candidate).getLocation();
- if (absPath != null) {
- imagePath.setText(absPath);
- }
- }
- }
- }
- });
-
- label = new Label(panel, SWT.NONE);
- label.setText(Messages.LaunchObjectDialog_arguments_label);
-
- arguments = new Text(panel, SWT.SINGLE | SWT.BORDER);
- layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- layoutData.horizontalSpan = 2;
- arguments.setLayoutData(layoutData);
- arguments.addModifyListener(new ModifyListener() {
- @Override
- public void modifyText(ModifyEvent e) {
- validateDialog();
- }
- });
-
- Group group = new Group(composite, SWT.NONE);
- layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- group.setLayoutData(layoutData);
- group.setText(Messages.LaunchObjectDialog_group_label);
- group.setLayout(new GridLayout());
-
- label = new Label(group, SWT.NONE);
- label.setText(Messages.LaunchObjectDialog_lineseparator_label);
- layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- label.setLayoutData(layoutData);
-
- Composite panel2 = new Composite(group, SWT.NONE);
- GridLayout layout = new GridLayout(4, false);
- layout.marginLeft = 15; layout.marginHeight = 2;
- panel2.setLayout(layout);
- layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- panel2.setLayoutData(layoutData);
-
- lineSeparatorDefault = new Button(panel2, SWT.RADIO);
- lineSeparatorDefault.setText(Messages.LaunchObjectDialog_lineseparator_default);
- lineSeparatorDefault.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (lineSeparatorDefault.getSelection()) {
- SWTControlUtil.setSelection(lineSeparatorLF, false);
- SWTControlUtil.setSelection(lineSeparatorCRLF, false);
- SWTControlUtil.setSelection(lineSeparatorCR, false);
- }
- }
- });
-
- lineSeparatorLF = new Button(panel2, SWT.RADIO);
- lineSeparatorLF.setText(Messages.LaunchObjectDialog_lineseparator_lf);
- lineSeparatorLF.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (lineSeparatorDefault.getSelection()) {
- SWTControlUtil.setSelection(lineSeparatorDefault, false);
- SWTControlUtil.setSelection(lineSeparatorCRLF, false);
- SWTControlUtil.setSelection(lineSeparatorCR, false);
- }
- }
- });
-
- lineSeparatorCRLF = new Button(panel2, SWT.RADIO);
- lineSeparatorCRLF.setText(Messages.LaunchObjectDialog_lineseparator_crlf);
- lineSeparatorCRLF.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (lineSeparatorDefault.getSelection()) {
- SWTControlUtil.setSelection(lineSeparatorDefault, false);
- SWTControlUtil.setSelection(lineSeparatorLF, false);
- SWTControlUtil.setSelection(lineSeparatorCR, false);
- }
- }
- });
-
- lineSeparatorCR = new Button(panel2, SWT.RADIO);
- lineSeparatorCR.setText(Messages.LaunchObjectDialog_lineseparator_cr);
- lineSeparatorCR.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (lineSeparatorDefault.getSelection()) {
- SWTControlUtil.setSelection(lineSeparatorDefault, false);
- SWTControlUtil.setSelection(lineSeparatorLF, false);
- SWTControlUtil.setSelection(lineSeparatorCRLF, false);
- }
- }
- });
-
- // Setup the control content
- setupContent();
-
- // Adjust the font
- applyDialogFont(composite);
-
- return composite;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.TrayDialog#createButtonBar(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Control createButtonBar(Composite parent) {
- Control control = super.createButtonBar(parent);
- validateDialog();
- return control;
- }
-
- /**
- * Configure the dialog title and the title area content. The method is called from
- * {@link #createDialogArea(Composite)}.
- */
- protected void configureTitles() {
- setDialogTitle(Messages.LaunchObjectDialog_title);
- }
-
- /**
- * Setup the control content.
- */
- protected void setupContent() {
- restoreWidgetValues();
- }
-
- /**
- * Validates the dialog.
- */
- protected void validateDialog() {
-
- boolean valid = !"".equals(imagePath.getText()); //$NON-NLS-1$
-
- if (getButton(IDialogConstants.OK_ID) != null) getButton(IDialogConstants.OK_ID).setEnabled(valid);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
- */
- @Override
- protected void cancelPressed() {
- // Dispose the launch attributes
- launchAttributes = null;
-
- super.cancelPressed();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
- @Override
- protected void okPressed() {
- // Create a new launch attributes map
- launchAttributes = new HashMap<String, Object>();
- // Update with the current control content
- updateLaunchAttributes(launchAttributes);
-
- super.okPressed();
- }
-
- /**
- * Updates the given attributes map with the current control content.
- */
- protected void updateLaunchAttributes(Map<String, Object> launchAttributes) {
- Assert.isNotNull(launchAttributes);
-
- launchAttributes.put(IProcessLauncher.PROP_PROCESS_PATH, imagePath.getText());
-
- String argumentsString = arguments.getText();
- String[] args = argumentsString != null && !"".equals(argumentsString.trim()) ? StringUtil.tokenize(argumentsString, 0, true) : null; //$NON-NLS-1$
- launchAttributes.put(IProcessLauncher.PROP_PROCESS_ARGS, args);
-
- // Local Echo is OFF.
- launchAttributes.put(ITerminalsConnectorConstants.PROP_LOCAL_ECHO, Boolean.FALSE);
-
- String lineSeparator = null;
- if (SWTControlUtil.getSelection(lineSeparatorLF)) {
- lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_LF;
- }
- else if (SWTControlUtil.getSelection(lineSeparatorCRLF)) {
- lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_CRLF;
- }
- else if (SWTControlUtil.getSelection(lineSeparatorCR)) {
- lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_CR;
- }
- launchAttributes.put(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR, lineSeparator);
- }
-
- /**
- * Returns the launch attributes.
- *
- * @return The launch attributes or <code>null</code> if canceled.
- */
- public final Map<String, Object> getLaunchAttributes() {
- return launchAttributes;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.ui.jface.dialogs.CustomTrayDialog#dispose()
- */
- @Override
- protected void dispose() {
- super.dispose();
- }
-
- /**
- * Saves the widget history to the dialog settings.
- */
- @Override
- protected void saveWidgetValues() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- settings.put(IProcessLauncher.PROP_PROCESS_PATH, imagePath.getText());
- settings.put(IProcessLauncher.PROP_PROCESS_ARGS, arguments.getText());
-
- String lineSeparator = null;
- if (SWTControlUtil.getSelection(lineSeparatorLF)) {
- lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_LF;
- }
- else if (SWTControlUtil.getSelection(lineSeparatorCRLF)) {
- lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_CRLF;
- }
- else if (SWTControlUtil.getSelection(lineSeparatorCR)) {
- lineSeparator = ILineSeparatorConstants.LINE_SEPARATOR_CR;
- }
- settings.put(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR, lineSeparator);
- }
- }
-
- /**
- * Restores the widget history from the dialog settings.
- */
- @Override
- protected void restoreWidgetValues() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String path = settings.get(IProcessLauncher.PROP_PROCESS_PATH);
- if (path != null) imagePath.setText(path);
- String args = settings.get(IProcessLauncher.PROP_PROCESS_ARGS);
- if (args != null) arguments.setText(args);
-
- String lineSeparator = settings.get(ITerminalsConnectorConstants.PROP_LINE_SEPARATOR);
- if (lineSeparator == null) {
- SWTControlUtil.setSelection(lineSeparatorDefault, true);
- }
- else if (ILineSeparatorConstants.LINE_SEPARATOR_LF.equals(lineSeparator)) {
- SWTControlUtil.setSelection(lineSeparatorLF, true);
- }
- else if (ILineSeparatorConstants.LINE_SEPARATOR_CRLF.equals(lineSeparator)) {
- SWTControlUtil.setSelection(lineSeparatorCRLF, true);
- }
- else if (ILineSeparatorConstants.LINE_SEPARATOR_CR.equals(lineSeparator)) {
- SWTControlUtil.setSelection(lineSeparatorCR, true);
- }
- }
- }
-
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/handler/LaunchProcessesCommandHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/handler/LaunchProcessesCommandHandler.java
deleted file mode 100644
index 3750337..0000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/internal/handler/LaunchProcessesCommandHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.processes.ui.internal.handler;
-
-import java.util.Map;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tcf.te.runtime.callback.Callback;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
-import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
-import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
-import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandlerConstants;
-import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
-import org.eclipse.tcf.te.tcf.processes.core.interfaces.launcher.IProcessLauncher;
-import org.eclipse.tcf.te.tcf.processes.core.launcher.ProcessLauncher;
-import org.eclipse.tcf.te.tcf.processes.ui.help.IContextHelpIds;
-import org.eclipse.tcf.te.tcf.processes.ui.internal.dialogs.LaunchObjectDialog;
-import org.eclipse.tcf.te.tcf.processes.ui.nls.Messages;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * Launch a process on the selected peer.
- */
-public class LaunchProcessesCommandHandler extends AbstractHandler {
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- LaunchObjectDialog dialog = createLaunchDialog(event);
- IPeerModel node = getPeerNode(event);
- dialog.setNode(node);
- if (dialog.open() == Window.OK) {
- Map<String, Object> attrs = dialog.getLaunchAttributes();
- if (attrs != null) {
- ProcessLauncher launcher = new ProcessLauncher();
- attrs.put(IProcessLauncher.PROP_PROCESS_ASSOCIATE_CONSOLE, Boolean.TRUE);
- IPropertiesContainer properties = new PropertiesContainer();
- properties.setProperties(attrs);
- launcher.launch(node.getPeer(), properties, new Callback() {
- @Override
- public void internalDone(Object caller, IStatus status) {
- handleStatus(status);
- }
- });
- }
- }
- return null;
- }
-
- /**
- * Get the selected peer model from the execution event.
- *
- * @param event The execution event with which the handler is invoked.
- * @return The peer model selected in this execution event.
- * @throws ExecutionException The exception when getting this peer model.
- */
- private IPeerModel getPeerNode(ExecutionEvent event) throws ExecutionException {
- IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelectionChecked(event);
- Assert.isTrue(selection.size() == 1);
- Object element = selection.getFirstElement();
- Assert.isTrue(element instanceof IPeerModel);
- return (IPeerModel) element;
- }
-
- /**
- * Create a launch dialog in which the configuration for this launch is entered.
- *
- * @param event The execution event with which the handler is invoked.
- * @return The launch dialog to input the configuration.
- * @throws ExecutionException Exception thrown during creating the dialog
- */
- private LaunchObjectDialog createLaunchDialog(ExecutionEvent event) throws ExecutionException {
- Shell shell = HandlerUtil.getActiveShellChecked(event);
- IWorkbenchPart activePart = HandlerUtil.getActivePartChecked(event);
- IEditorPart editorPart = (IEditorPart) activePart.getAdapter(IEditorPart.class);
- return new LaunchObjectDialog(editorPart, shell);
- }
-
- /**
- * Handle the resulting status of the process launching.
- *
- * @param status The resulting status of the process launching.
- */
- protected void handleStatus(IStatus status) {
- if (status.getSeverity() != IStatus.OK && status.getSeverity() != IStatus.CANCEL) {
- IStatusHandler[] handlers = StatusHandlerManager.getInstance().getHandler(getClass());
- if (handlers != null && handlers.length > 0) {
- IPropertiesContainer data = new PropertiesContainer();
- data.setProperty(IStatusHandlerConstants.PROPERTY_TITLE, Messages.AbstractChannelCommandHandler_statusDialog_title);
- data.setProperty(IStatusHandlerConstants.PROPERTY_CONTEXT_HELP_ID, IContextHelpIds.CHANNEL_COMMAND_HANDLER_STATUS_DIALOG);
- data.setProperty(IStatusHandlerConstants.PROPERTY_DONT_ASK_AGAIN_ID, null);
- data.setProperty(IStatusHandlerConstants.PROPERTY_CALLER, this);
- handlers[0].handleStatus(status, data, null);
- }
- }
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.java
index d91ecf6..a14d4bf 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.java
@@ -1,190 +1,177 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.processes.ui.nls;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Target Explorer TCF processes extensions UI 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.processes.ui.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 ProcessExplorerTreeControl_section_title;
-
- public static String ProcessesTreeControl_column_name_label;
- public static String ProcessesTreeControl_column_pid_label;
- public static String ProcessesTreeControl_column_ppid_label;
- public static String ProcessesTreeControl_column_state_label;
- public static String ProcessesTreeControl_column_user_label;
-
- public static String ProcessLabelProvider_NullNameNodeLabel;
-
- public static String ProcessPreferencePage_BiggerThanZero;
- public static String ProcessPreferencePage_DefineMoreThanOne;
-
- public static String ProcessPreferencePage_EditButtonLabel;
- public static String ProcessPreferencePage_InvalidNumber;
- public static String ProcessPreferencePage_MaxMRUCount;
- public static String ProcessPreferencePage_MRUCountLabel;
- public static String ProcessPreferencePage_NameLabel;
- public static String ProcessPreferencePage_NewButtonLabel;
- public static String ProcessPreferencePage_PageDescription;
- public static String ProcessPreferencePage_RemoveButtonLabel;
- public static String ProcessPreferencePage_ValueLabel;
- public static String ProcessSelectionDialog_title;
-
- public static String LaunchObjectDialog_title;
- public static String LaunchObjectDialog_image_label;
- public static String LaunchObjectDialog_arguments_label;
- public static String LaunchObjectDialog_group_label;
- public static String LaunchObjectDialog_lineseparator_label;
- public static String LaunchObjectDialog_lineseparator_default;
- public static String LaunchObjectDialog_lineseparator_lf;
- public static String LaunchObjectDialog_lineseparator_crlf;
- public static String LaunchObjectDialog_lineseparator_cr;
-
- public static String LaunchProcessesCommandHandler_error_title;
-
- public static String AbstractChannelCommandHandler_statusDialog_title;
-
- public static String AdvancedPropertiesSection_Name;
- public static String AdvancedPropertiesSection_Value;
-
- public static String BasicContextSection_File;
- public static String BasicContextSection_Group;
- public static String BasicContextSection_Root;
- public static String BasicContextSection_State;
- public static String BasicContextSection_Title;
- public static String BasicContextSection_User;
- public static String BasicContextSection_WorkDir;
- public static String BasicInformationSection_Name;
- public static String BasicInformationSection_State;
- public static String BasicInformationSection_Title;
- public static String BasicInformationSection_Type;
- public static String BasicInformationSection_User;
-
- public static String ConfigIntervalDynamicContribution_Custom;
-
- public static String ContextIDSection_ContextIDs;
- public static String ContextIDSection_GroupID;
- public static String ContextIDSection_ID;
- public static String ContextIDSection_ParentID;
- public static String ContextIDSection_PID;
- public static String ContextIDSection_PPID;
- public static String ContextIDSection_TracerPID;
- public static String ContextIDSection_TTY_GRPID;
- public static String ContextIDSection_UserGRPID;
- public static String ContextIDSection_UserID;
-
- public static String ContextPage_File;
-
- public static String ContextPage_Group;
-
- public static String ContextPage_GroupID;
-
- public static String ContextPage_ID;
-
- public static String ContextPage_Pages;
-
- public static String ContextPage_ParentID;
-
- public static String ContextPage_PID;
-
- public static String ContextPage_PPID;
-
- public static String ContextPage_Resident;
-
- public static String ContextPage_Root;
-
- public static String ContextPage_State;
-
- public static String ContextPage_TracerPID;
-
- public static String ContextPage_TTYGRPID;
-
- public static String ContextPage_UserGRPID;
-
- public static String ContextPage_UserID;
-
- public static String ContextPage_Virtual;
-
- public static String ContextPage_WorkHome;
-
- public static String EditSpeedGradeDialog_DialogMessage;
- public static String EditSpeedGradeDialog_DialogTitle;
- public static String EditSpeedGradeDialog_GradeSameValue;
- public static String EditSpeedGradeDialog_NameLabel;
- public static String EditSpeedGradeDialog_ValueLabel;
-
- public static String IDSection_InternalID;
- public static String IDSection_InternalPPID;
- public static String IDSection_ParentID;
- public static String IDSection_ProcessID;
- public static String IDSection_Title;
-
- public static String IntervalConfigDialog_BiggerThanZero;
- public static String IntervalConfigDialog_ChoiceOneLabel;
- public static String IntervalConfigDialog_ChoiceTwoLabel;
- public static String IntervalConfigDialog_DialogTitle;
- public static String IntervalConfigDialog_InvalidNumber;
- public static String IntervalConfigDialog_NonEmpty;
- public static String IntervalConfigDialog_SECOND_ABBR;
- public static String IntervalConfigDialog_SECONDS;
- public static String IntervalConfigDialog_SelectSpeed;
- public static String IntervalConfigDialog_SPEED;
- public static String IntervalConfigDialog_ZeroWarning;
-
- public static String MemorySection_PSize;
- public static String MemorySection_RSS;
- public static String MemorySection_Title;
- public static String MemorySection_VSize;
-
- public static String NewSpeedGradeDialog_DialogMessage;
- public static String NewSpeedGradeDialog_DialogTitle;
- public static String NewSpeedGradeDialog_EnterName;
- public static String NewSpeedGradeDialog_GradeExists;
- public static String NewSpeedGradeDialog_GradeSameValue;
- public static String NewSpeedGradeDialog_NameLabel;
- public static String NewSpeedGradeDialog_ValueLabel;
-
- public static String GeneralInformationPage_InternalPID;
-
- public static String GeneralInformationPage_InternalPPID;
-
- public static String GeneralInformationPage_Name;
-
- public static String GeneralInformationPage_ParentPID;
-
- public static String GeneralInformationPage_ProcessID;
-
- public static String GeneralInformationPage_State;
-
- public static String GeneralInformationPage_Type;
-
- public static String GeneralInformationPage_User;
-
-
- public static String TerminateHandler_TerminationError;
- public static String ProcessLabelProvider_RootNodeLabel;
-}
+/*******************************************************************************
+ * Copyright (c) 2011 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.processes.ui.nls;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Target Explorer TCF processes extensions UI 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.processes.ui.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 ProcessExplorerTreeControl_section_title;
+
+ public static String ProcessesTreeControl_column_name_label;
+ public static String ProcessesTreeControl_column_pid_label;
+ public static String ProcessesTreeControl_column_ppid_label;
+ public static String ProcessesTreeControl_column_state_label;
+ public static String ProcessesTreeControl_column_user_label;
+
+ public static String ProcessLabelProvider_NullNameNodeLabel;
+
+ public static String ProcessPreferencePage_BiggerThanZero;
+ public static String ProcessPreferencePage_DefineMoreThanOne;
+
+ public static String ProcessPreferencePage_EditButtonLabel;
+ public static String ProcessPreferencePage_InvalidNumber;
+ public static String ProcessPreferencePage_MaxMRUCount;
+ public static String ProcessPreferencePage_MRUCountLabel;
+ public static String ProcessPreferencePage_NameLabel;
+ public static String ProcessPreferencePage_NewButtonLabel;
+ public static String ProcessPreferencePage_PageDescription;
+ public static String ProcessPreferencePage_RemoveButtonLabel;
+ public static String ProcessPreferencePage_ValueLabel;
+
+ public static String AbstractChannelCommandHandler_statusDialog_title;
+
+ public static String AdvancedPropertiesSection_Name;
+ public static String AdvancedPropertiesSection_Value;
+
+ public static String BasicContextSection_File;
+ public static String BasicContextSection_Group;
+ public static String BasicContextSection_Root;
+ public static String BasicContextSection_State;
+ public static String BasicContextSection_Title;
+ public static String BasicContextSection_User;
+ public static String BasicContextSection_WorkDir;
+ public static String BasicInformationSection_Name;
+ public static String BasicInformationSection_State;
+ public static String BasicInformationSection_Title;
+ public static String BasicInformationSection_Type;
+ public static String BasicInformationSection_User;
+
+ public static String ConfigIntervalDynamicContribution_Custom;
+
+ public static String ContextIDSection_ContextIDs;
+ public static String ContextIDSection_GroupID;
+ public static String ContextIDSection_ID;
+ public static String ContextIDSection_ParentID;
+ public static String ContextIDSection_PID;
+ public static String ContextIDSection_PPID;
+ public static String ContextIDSection_TracerPID;
+ public static String ContextIDSection_TTY_GRPID;
+ public static String ContextIDSection_UserGRPID;
+ public static String ContextIDSection_UserID;
+
+ public static String ContextPage_File;
+
+ public static String ContextPage_Group;
+
+ public static String ContextPage_GroupID;
+
+ public static String ContextPage_ID;
+
+ public static String ContextPage_Pages;
+
+ public static String ContextPage_ParentID;
+
+ public static String ContextPage_PID;
+
+ public static String ContextPage_PPID;
+
+ public static String ContextPage_Resident;
+
+ public static String ContextPage_Root;
+
+ public static String ContextPage_State;
+
+ public static String ContextPage_TracerPID;
+
+ public static String ContextPage_TTYGRPID;
+
+ public static String ContextPage_UserGRPID;
+
+ public static String ContextPage_UserID;
+
+ public static String ContextPage_Virtual;
+
+ public static String ContextPage_WorkHome;
+
+ public static String EditSpeedGradeDialog_DialogMessage;
+ public static String EditSpeedGradeDialog_DialogTitle;
+ public static String EditSpeedGradeDialog_GradeSameValue;
+ public static String EditSpeedGradeDialog_NameLabel;
+ public static String EditSpeedGradeDialog_ValueLabel;
+
+ public static String IDSection_InternalID;
+ public static String IDSection_InternalPPID;
+ public static String IDSection_ParentID;
+ public static String IDSection_ProcessID;
+ public static String IDSection_Title;
+
+ public static String IntervalConfigDialog_BiggerThanZero;
+ public static String IntervalConfigDialog_ChoiceOneLabel;
+ public static String IntervalConfigDialog_ChoiceTwoLabel;
+ public static String IntervalConfigDialog_DialogTitle;
+ public static String IntervalConfigDialog_InvalidNumber;
+ public static String IntervalConfigDialog_NonEmpty;
+ public static String IntervalConfigDialog_SECOND_ABBR;
+ public static String IntervalConfigDialog_SECONDS;
+ public static String IntervalConfigDialog_SelectSpeed;
+ public static String IntervalConfigDialog_SPEED;
+ public static String IntervalConfigDialog_ZeroWarning;
+
+ public static String MemorySection_PSize;
+ public static String MemorySection_RSS;
+ public static String MemorySection_Title;
+ public static String MemorySection_VSize;
+
+ public static String NewSpeedGradeDialog_DialogMessage;
+ public static String NewSpeedGradeDialog_DialogTitle;
+ public static String NewSpeedGradeDialog_EnterName;
+ public static String NewSpeedGradeDialog_GradeExists;
+ public static String NewSpeedGradeDialog_GradeSameValue;
+ public static String NewSpeedGradeDialog_NameLabel;
+ public static String NewSpeedGradeDialog_ValueLabel;
+
+ public static String GeneralInformationPage_InternalPID;
+
+ public static String GeneralInformationPage_InternalPPID;
+
+ public static String GeneralInformationPage_Name;
+
+ public static String GeneralInformationPage_ParentPID;
+
+ public static String GeneralInformationPage_ProcessID;
+
+ public static String GeneralInformationPage_State;
+
+ public static String GeneralInformationPage_Type;
+
+ public static String GeneralInformationPage_User;
+
+
+ public static String TerminateHandler_TerminationError;
+ public static String ProcessLabelProvider_RootNodeLabel;
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.properties
index a5fee1a..7694ec3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/src/org/eclipse/tcf/te/tcf/processes/ui/nls/Messages.properties
@@ -1,132 +1,118 @@
-# org.eclipse.tcf.te.tcf.processes.ui
-# Externalized Strings.
-#
-
-ProcessExplorerTreeControl_section_title=Exploring Processes
-
-ProcessesTreeControl_column_name_label=Name
-ProcessesTreeControl_column_pid_label=PID
-ProcessesTreeControl_column_ppid_label=PPID
-ProcessesTreeControl_column_state_label=State
-ProcessesTreeControl_column_user_label=User
-ProcessLabelProvider_NullNameNodeLabel=System
-ProcessPreferencePage_BiggerThanZero=The number must be bigger than zero\!
-ProcessPreferencePage_DefineMoreThanOne=Please define at least one grade of speed\!
-ProcessPreferencePage_EditButtonLabel=&Edit...
-ProcessPreferencePage_InvalidNumber=Invalid number. Please enter a number\!
-ProcessPreferencePage_MaxMRUCount=Please specify the maximum MRU intervals\!
-ProcessPreferencePage_MRUCountLabel=Specify the maximum MRU intervals:
-ProcessPreferencePage_NameLabel=Name
-ProcessPreferencePage_NewButtonLabel=&New...
-ProcessPreferencePage_PageDescription=Configure how the process list should be refreshed.
-ProcessPreferencePage_RemoveButtonLabel=&Remove
-ProcessPreferencePage_ValueLabel=Value (seconds)
-
-ProcessSelectionDialog_title=Select Process to Attach
-
-LaunchObjectDialog_title=Launch Process
-LaunchObjectDialog_image_label=Process Image:
-LaunchObjectDialog_arguments_label=Process Arguments:
-LaunchObjectDialog_group_label=Process Line Separator Settings
-LaunchObjectDialog_lineseparator_label=Please specify the line separator used by the launched process.
-LaunchObjectDialog_lineseparator_default=Default
-LaunchObjectDialog_lineseparator_lf=LF
-LaunchObjectDialog_lineseparator_crlf=CRLF
-LaunchObjectDialog_lineseparator_cr=CR
-
-AbstractChannelCommandHandler_statusDialog_title=Error
-AdvancedPropertiesSection_Name=Name
-AdvancedPropertiesSection_Value=Value
-
-BasicContextSection_File=File:
-BasicContextSection_Group=Group:
-BasicContextSection_Root=Root:
-BasicContextSection_State=State:
-BasicContextSection_Title=Basic Context Information
-BasicContextSection_User=User:
-BasicContextSection_WorkDir=Work Home:
-BasicInformationSection_Name=Name:
-BasicInformationSection_State=State:
-BasicInformationSection_Title=Basic Information
-BasicInformationSection_Type=Type:
-BasicInformationSection_User=User:
-
-ConfigIntervalDynamicContribution_Custom=Custom ...
-
-ContextIDSection_ContextIDs=Context IDs
-ContextIDSection_GroupID=Group ID:
-ContextIDSection_ID=ID:
-ContextIDSection_ParentID=Parent ID:
-ContextIDSection_PID=PID:
-ContextIDSection_PPID=PPID:
-ContextIDSection_TracerPID=Tracer PID:
-ContextIDSection_TTY_GRPID=TTY GRPID:
-ContextIDSection_UserGRPID=User GRPID:
-ContextIDSection_UserID=User ID:
-ContextPage_File=File:
-ContextPage_Group=Group:
-ContextPage_GroupID=Group ID:
-ContextPage_ID=ID:
-ContextPage_Pages=Pages:
-ContextPage_ParentID=Parent ID:
-ContextPage_PID=PID:
-ContextPage_PPID=PPID:
-ContextPage_Resident=Resident:
-ContextPage_Root=Root:
-ContextPage_State=State:
-ContextPage_TracerPID=Tracer PID:
-ContextPage_TTYGRPID=TTY Group ID:
-ContextPage_UserGRPID=User Group ID:
-ContextPage_UserID=User ID:
-ContextPage_Virtual=Virtual:
-ContextPage_WorkHome=Work Home:
-
-EditSpeedGradeDialog_DialogMessage=Edit the data of the selected grade below:
-EditSpeedGradeDialog_DialogTitle=Edit Grade
-EditSpeedGradeDialog_GradeSameValue=Grade ''{0}'' has the same value.
-EditSpeedGradeDialog_NameLabel=Name:
-EditSpeedGradeDialog_ValueLabel=Value:
-
-IDSection_InternalID=Internal PID:
-IDSection_InternalPPID=InternalPPID:
-IDSection_ParentID=Parent ID:
-IDSection_ProcessID=Process ID:
-IDSection_Title=Process IDs
-
-IntervalConfigDialog_BiggerThanZero=The number must be greater than or equal to zero\!
-IntervalConfigDialog_ChoiceOneLabel=Refresh the process list every
-IntervalConfigDialog_ChoiceTwoLabel=Refresh the process list at a
-IntervalConfigDialog_DialogTitle=Configure Refreshing
-IntervalConfigDialog_InvalidNumber=Invalid number format\!
-IntervalConfigDialog_NonEmpty=Please enter a number\!
-IntervalConfigDialog_SECOND_ABBR=s
-IntervalConfigDialog_SECONDS=\ seconds.
-IntervalConfigDialog_SelectSpeed=Please select a speed.
-IntervalConfigDialog_SPEED=\ speed.
-IntervalConfigDialog_ZeroWarning=Setting to zero will turn off the auto refresh.
-
-LaunchProcessesCommandHandler_error_title=Process Launch Failed
-
-MemorySection_PSize=Pages:
-MemorySection_RSS=Resident:
-MemorySection_Title=Memory Usage
-MemorySection_VSize=Virtual:
-
-NewSpeedGradeDialog_DialogMessage=Edit the data of the new grade below:
-NewSpeedGradeDialog_DialogTitle=New Grade
-NewSpeedGradeDialog_EnterName=Enter the name of the grade\!
-NewSpeedGradeDialog_GradeExists=Grade ''{0}'' already exists\!
-NewSpeedGradeDialog_GradeSameValue=Grade ''{0}'' has the same value.
-NewSpeedGradeDialog_NameLabel=Name:
-NewSpeedGradeDialog_ValueLabel=Value:
-
-GeneralInformationPage_InternalPID=Internal PID:
-GeneralInformationPage_InternalPPID=Internal PPID:
-GeneralInformationPage_Name=Name:
-GeneralInformationPage_ParentPID=Parent PID:
-GeneralInformationPage_ProcessID=Process ID:
-GeneralInformationPage_State=State:
-GeneralInformationPage_Type=Type:
-GeneralInformationPage_User=User:
-TerminateHandler_TerminationError=Termination Error
-ProcessLabelProvider_RootNodeLabel=Processes
+# org.eclipse.tcf.te.tcf.processes.ui
+# Externalized Strings.
+#
+
+ProcessExplorerTreeControl_section_title=Exploring Processes
+
+ProcessesTreeControl_column_name_label=Name
+ProcessesTreeControl_column_pid_label=PID
+ProcessesTreeControl_column_ppid_label=PPID
+ProcessesTreeControl_column_state_label=State
+ProcessesTreeControl_column_user_label=User
+ProcessLabelProvider_NullNameNodeLabel=System
+ProcessPreferencePage_BiggerThanZero=The number must be bigger than zero\!
+ProcessPreferencePage_DefineMoreThanOne=Please define at least one grade of speed\!
+ProcessPreferencePage_EditButtonLabel=&Edit...
+ProcessPreferencePage_InvalidNumber=Invalid number. Please enter a number\!
+ProcessPreferencePage_MaxMRUCount=Please specify the maximum MRU intervals\!
+ProcessPreferencePage_MRUCountLabel=Specify the maximum MRU intervals:
+ProcessPreferencePage_NameLabel=Name
+ProcessPreferencePage_NewButtonLabel=&New...
+ProcessPreferencePage_PageDescription=Configure how the process list should be refreshed.
+ProcessPreferencePage_RemoveButtonLabel=&Remove
+ProcessPreferencePage_ValueLabel=Value (seconds)
+
+AbstractChannelCommandHandler_statusDialog_title=Error
+AdvancedPropertiesSection_Name=Name
+AdvancedPropertiesSection_Value=Value
+
+BasicContextSection_File=File:
+BasicContextSection_Group=Group:
+BasicContextSection_Root=Root:
+BasicContextSection_State=State:
+BasicContextSection_Title=Basic Context Information
+BasicContextSection_User=User:
+BasicContextSection_WorkDir=Work Home:
+BasicInformationSection_Name=Name:
+BasicInformationSection_State=State:
+BasicInformationSection_Title=Basic Information
+BasicInformationSection_Type=Type:
+BasicInformationSection_User=User:
+
+ConfigIntervalDynamicContribution_Custom=Custom ...
+
+ContextIDSection_ContextIDs=Context IDs
+ContextIDSection_GroupID=Group ID:
+ContextIDSection_ID=ID:
+ContextIDSection_ParentID=Parent ID:
+ContextIDSection_PID=PID:
+ContextIDSection_PPID=PPID:
+ContextIDSection_TracerPID=Tracer PID:
+ContextIDSection_TTY_GRPID=TTY GRPID:
+ContextIDSection_UserGRPID=User GRPID:
+ContextIDSection_UserID=User ID:
+ContextPage_File=File:
+ContextPage_Group=Group:
+ContextPage_GroupID=Group ID:
+ContextPage_ID=ID:
+ContextPage_Pages=Pages:
+ContextPage_ParentID=Parent ID:
+ContextPage_PID=PID:
+ContextPage_PPID=PPID:
+ContextPage_Resident=Resident:
+ContextPage_Root=Root:
+ContextPage_State=State:
+ContextPage_TracerPID=Tracer PID:
+ContextPage_TTYGRPID=TTY Group ID:
+ContextPage_UserGRPID=User Group ID:
+ContextPage_UserID=User ID:
+ContextPage_Virtual=Virtual:
+ContextPage_WorkHome=Work Home:
+
+EditSpeedGradeDialog_DialogMessage=Edit the data of the selected grade below:
+EditSpeedGradeDialog_DialogTitle=Edit Grade
+EditSpeedGradeDialog_GradeSameValue=Grade ''{0}'' has the same value.
+EditSpeedGradeDialog_NameLabel=Name:
+EditSpeedGradeDialog_ValueLabel=Value:
+
+IDSection_InternalID=Internal PID:
+IDSection_InternalPPID=InternalPPID:
+IDSection_ParentID=Parent ID:
+IDSection_ProcessID=Process ID:
+IDSection_Title=Process IDs
+
+IntervalConfigDialog_BiggerThanZero=The number must be greater than or equal to zero\!
+IntervalConfigDialog_ChoiceOneLabel=Refresh the process list every
+IntervalConfigDialog_ChoiceTwoLabel=Refresh the process list at a
+IntervalConfigDialog_DialogTitle=Configure Refreshing
+IntervalConfigDialog_InvalidNumber=Invalid number format\!
+IntervalConfigDialog_NonEmpty=Please enter a number\!
+IntervalConfigDialog_SECOND_ABBR=s
+IntervalConfigDialog_SECONDS=\ seconds.
+IntervalConfigDialog_SelectSpeed=Please select a speed.
+IntervalConfigDialog_SPEED=\ speed.
+IntervalConfigDialog_ZeroWarning=Setting to zero will turn off the auto refresh.
+
+MemorySection_PSize=Pages:
+MemorySection_RSS=Resident:
+MemorySection_Title=Memory Usage
+MemorySection_VSize=Virtual:
+
+NewSpeedGradeDialog_DialogMessage=Edit the data of the new grade below:
+NewSpeedGradeDialog_DialogTitle=New Grade
+NewSpeedGradeDialog_EnterName=Enter the name of the grade\!
+NewSpeedGradeDialog_GradeExists=Grade ''{0}'' already exists\!
+NewSpeedGradeDialog_GradeSameValue=Grade ''{0}'' has the same value.
+NewSpeedGradeDialog_NameLabel=Name:
+NewSpeedGradeDialog_ValueLabel=Value:
+
+GeneralInformationPage_InternalPID=Internal PID:
+GeneralInformationPage_InternalPPID=Internal PPID:
+GeneralInformationPage_Name=Name:
+GeneralInformationPage_ParentPID=Parent PID:
+GeneralInformationPage_ProcessID=Process ID:
+GeneralInformationPage_State=State:
+GeneralInformationPage_Type=Type:
+GeneralInformationPage_User=User:
+TerminateHandler_TerminationError=Termination Error
+ProcessLabelProvider_RootNodeLabel=Processes