Target Explorer: ADD launch tab icons, launch node description provider, remote app

launch only available for targets with process service

7 files changed, 290 insertions, 260 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF
index f87c3bb71..521411ed8 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.tcf.te.ui;bundle-version="1.0.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",

  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.core;bundle-version="1.0.0",

+ org.eclipse.ui.ide;bundle-version="3.8.0"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-ActivationPolicy: lazy

 Bundle-Localization: plugin

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/viewer/LaunchTreeLabelProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/viewer/LaunchTreeLabelProvider.java
index a6750b0d7..004cfde8f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/viewer/LaunchTreeLabelProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/internal/viewer/LaunchTreeLabelProvider.java
@@ -1,101 +1,109 @@
-/*******************************************************************************
- * 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.viewer;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.tcf.te.launch.ui.activator.UIPlugin;
-import org.eclipse.tcf.te.launch.ui.internal.ImageConsts;
-import org.eclipse.tcf.te.launch.ui.model.LaunchNode;
-import org.eclipse.tcf.te.ui.jface.images.AbstractImageDescriptor;
-import org.eclipse.ui.navigator.IDescriptionProvider;
-
-/**
- * The label provider for the tree column "launchConfigurations".
- */
-public class LaunchTreeLabelProvider extends LabelProvider implements ILabelDecorator, IDescriptionProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-	 */
-	@Override
-	public String getText(Object element) {
-		if (element instanceof LaunchNode) {
-			return ((LaunchNode)element).getName();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-	 */
-	@Override
-	public Image getImage(Object element) {
-		if (element instanceof LaunchNode) {
-			Image image = null;
-			LaunchNode node = (LaunchNode)element;
-			if (node.isType(LaunchNode.TYPE_ROOT)) {
-				image = UIPlugin.getImage(ImageConsts.OBJ_Launches_Root);
-			}
-			else if (node.isType(LaunchNode.TYPE_LAUNCH_CONFIG_TYPE)) {
-				image = DebugUITools.getImage(node.getLaunchConfigurationType().getIdentifier());
-			}
-			else if (node.isType(LaunchNode.TYPE_LAUNCH_CONFIG)) {
-				try {
-					image = DebugUITools.getImage(node.getLaunchConfiguration().getType().getIdentifier());
-				}
-				catch (Exception e) {
-				}
-			}
-			if (image != null) {
-				return decorateImage(image, element);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
-	 */
-	@Override
-	public Image decorateImage(final Image image, final Object element) {
-		Image decoratedImage = null;
-
-		if (image != null && element instanceof LaunchNode) {
-			AbstractImageDescriptor descriptor = new LaunchNodeImageDescriptor(UIPlugin.getDefault().getImageRegistry(),
-							image,
-							(LaunchNode)element);
-			decoratedImage = UIPlugin.getSharedImage(descriptor);
-		}
-
-		return decoratedImage;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
-	 */
-	@Override
-	public String decorateText(final String text, final Object element) {
-		return text;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object)
-	 */
-	@Override
-	public String getDescription(Object element) {
-		if (element instanceof LaunchNode) {
-			return getText(element);
-		}
-		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.viewer;

+

+import org.eclipse.debug.ui.DebugUITools;

+import org.eclipse.jface.viewers.ILabelDecorator;

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.swt.graphics.Image;

+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.ui.activator.UIPlugin;

+import org.eclipse.tcf.te.launch.ui.internal.ImageConsts;

+import org.eclipse.tcf.te.launch.ui.model.LaunchNode;

+import org.eclipse.tcf.te.ui.jface.images.AbstractImageDescriptor;

+import org.eclipse.ui.navigator.IDescriptionProvider;

+

+/**

+ * The label provider for the tree column "launchConfigurations".

+ */

+public class LaunchTreeLabelProvider extends LabelProvider implements ILabelDecorator, IDescriptionProvider {

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)

+	 */

+	@Override

+	public String getText(Object element) {

+		if (element instanceof LaunchNode) {

+			return ((LaunchNode)element).getName();

+		}

+		return null;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)

+	 */

+	@Override

+	public Image getImage(Object element) {

+		if (element instanceof LaunchNode) {

+			Image image = null;

+			LaunchNode node = (LaunchNode)element;

+			if (node.isType(LaunchNode.TYPE_ROOT)) {

+				image = UIPlugin.getImage(ImageConsts.OBJ_Launches_Root);

+			}

+			else if (node.isType(LaunchNode.TYPE_LAUNCH_CONFIG_TYPE)) {

+				image = DebugUITools.getImage(node.getLaunchConfigurationType().getIdentifier());

+			}

+			else if (node.isType(LaunchNode.TYPE_LAUNCH_CONFIG)) {

+				try {

+					image = DebugUITools.getImage(node.getLaunchConfiguration().getType().getIdentifier());

+				}

+				catch (Exception e) {

+				}

+			}

+			if (image != null) {

+				return decorateImage(image, element);

+			}

+		}

+		return null;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)

+	 */

+	@Override

+	public Image decorateImage(final Image image, final Object element) {

+		Image decoratedImage = null;

+

+		if (image != null && element instanceof LaunchNode) {

+			AbstractImageDescriptor descriptor = new LaunchNodeImageDescriptor(UIPlugin.getDefault().getImageRegistry(),

+							image,

+							(LaunchNode)element);

+			decoratedImage = UIPlugin.getSharedImage(descriptor);

+		}

+

+		return decoratedImage;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)

+	 */

+	@Override

+	public String decorateText(final String text, final Object element) {

+		return text;

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object)

+	 */

+	@Override

+	public String getDescription(Object element) {

+		if (element instanceof LaunchNode) {

+			if (((LaunchNode)element).getLaunchConfiguration() != null) {

+				ILaunchManagerDelegate delegate = LaunchManager.getInstance().getLaunchManagerDelegate(((LaunchNode)element).getLaunchConfigurationType(), ""); //$NON-NLS-1$

+				if (delegate != null) {

+					return delegate.getDescription(((LaunchNode)element).getLaunchConfiguration());

+				}

+			}

+			return getText(element);

+		}

+		return null;

+	}

+}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/refprojects/RefProjetcsTab.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/refprojects/RefProjetcsTab.java
index e82549e09..a71c5efc9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/refprojects/RefProjetcsTab.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/refprojects/RefProjetcsTab.java
@@ -11,13 +11,16 @@ package org.eclipse.tcf.te.launch.ui.tabs.refprojects;
 

 import org.eclipse.core.runtime.Assert;

 import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.tcf.te.launch.ui.nls.Messages;

 import org.eclipse.tcf.te.launch.ui.tabs.AbstractFormsLaunchConfigurationTab;

 import org.eclipse.tcf.te.ui.forms.CustomFormToolkit;

+import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.forms.widgets.TableWrapData;

 import org.eclipse.ui.forms.widgets.TableWrapLayout;

+import org.eclipse.ui.ide.IDE;

 

 /**

  * Referenced projetcs launch configuration tab implementation.

@@ -64,4 +67,12 @@ public class RefProjetcsTab extends AbstractFormsLaunchConfigurationTab {
 	public String getName() {

 		return Messages.ReferencedProjectsTab_name;

 	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()

+	 */

+	@Override

+	public Image getImage() {

+		return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);

+	}

 }

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
index b7a3cbea8..08cde6442 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
@@ -18,8 +18,7 @@
             id="org.eclipse.tcf.te.tcf.launch.core.services.debug">

          <serviceType

                bundleId="org.eclipse.tcf.te.runtime.services"

-               class="org.eclipse.tcf.te.runtime.services.interfaces.IDebugService">

-         </serviceType>

+               class="org.eclipse.tcf.te.runtime.services.interfaces.IDebugService"/>

          <enablement>

             <or>

                <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>

@@ -35,8 +34,7 @@
             delegate="org.eclipse.tcf.te.launch.core.delegates.LaunchConfigurationDelegate"

             id="org.eclipse.tcf.te.tcf.launch.type.remote.app"

             modes="run,debug"

-            name="%LaunchType.Remote.App.name">

-      </launchConfigurationType>

+            name="%LaunchType.Remote.App.name"/>

    </extension>

    

 <!-- Launch Configuration Type Binding contributions -->

@@ -45,23 +43,21 @@
             launchConfigTypeId="org.eclipse.tcf.te.tcf.launch.type.remote.app">

          <launchManagerDelegate

                id="org.eclipse.tcf.te.tcf.launch.type.remote.app.launchManagerDelegate"

-               modes="run,debug">

-         </launchManagerDelegate>

+               modes="run,debug"/>

          <stepGroup

                id="org.eclipse.tcf.te.tcf.launch.type.remote.app.stepGroup"

-               modes="run,debug">

-         </stepGroup>

+               modes="run,debug"/>

          <enablement>

             <with variable="context">

-                <or>

-                   <adapt type="org.eclipse.core.resources.IResource">

-                      	 <test 

-                     	       property="org.eclipse.core.resources.projectNature"

-                     	       value="org.eclipse.cdt.core.cnature">

-                     	 </test>

-                   </adapt>

-                   <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>

-                </or>

+               <or>

+                  <adapt type="org.eclipse.core.resources.IResource">

+                     <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>

+                  </adapt>

+                  <and>

+                     <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>

+                     <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="Processes"/>

+                  </and>

+               </or>

             </with>

          </enablement>

       </launchConfigTypeBinding>

@@ -71,8 +67,7 @@
    <extension point="org.eclipse.tcf.te.launch.core.launchManagerDelegates">

       <delegate

             class="org.eclipse.tcf.te.tcf.launch.core.lm.delegates.RemoteAppLaunchManagerDelegate"

-            id="org.eclipse.tcf.te.tcf.launch.type.remote.app.launchManagerDelegate">

-      </delegate>

+            id="org.eclipse.tcf.te.tcf.launch.type.remote.app.launchManagerDelegate"/>

    </extension>

    

 <!-- Launch Step Group contributions -->

@@ -112,39 +107,30 @@
       <step

             id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep"

             class="org.eclipse.tcf.te.tcf.launch.core.steps.OpenChannelStep"

-            label="%LaunchStep.OpenChannel.name">

-      </step>

+            label="%LaunchStep.OpenChannel.name"/>

       <step

             id="org.eclipse.tcf.te.tcf.launch.core.fileTransferStep"

             class="org.eclipse.tcf.te.tcf.launch.core.steps.FileTransferStep"

             label="%LaunchStep.FileTransfer.name">

-         <requires

-               id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep">

-         </requires>

+         <requires id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep"/>

       </step>

       <step

             id="org.eclipse.tcf.te.tcf.launch.core.launchProcessStep"

             class="org.eclipse.tcf.te.tcf.launch.core.steps.LaunchProcessStep"

             label="%LaunchStep.LaunchProcess.name">

-         <requires

-               id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep">

-         </requires>

+         <requires id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep"/>

       </step>

       <step

             id="org.eclipse.tcf.te.tcf.launch.core.attachDebuggerStep"

             class="org.eclipse.tcf.te.tcf.launch.core.steps.AttachDebuggerStep"

             label="%LaunchStep.AttachDebugger.name">

-         <requires

-               id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep">

-         </requires>

+         <requires id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep"/>

       </step>

       <step

             id="org.eclipse.tcf.te.tcf.launch.core.closeChannelStep"

             class="org.eclipse.tcf.te.tcf.launch.core.steps.CloseChannelStep"

             label="%LaunchStep.CloseChannel.name">

-         <requires

-               id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep">

-         </requires>

+         <requires id="org.eclipse.tcf.te.tcf.launch.core.openChannelStep"/>

       </step>

    </extension>

 

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTab.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTab.java
index c7cb8083a..9e04a5189 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTab.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationMainTab.java
@@ -1,50 +1,61 @@
-/*******************************************************************************
- * 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.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tcf.te.launch.ui.tabs.launchcontext.AbstractContextSelectorTab;
-import org.eclipse.tcf.te.tcf.launch.ui.remote.app.launchcontext.ContextSelectorSection;
-import org.eclipse.tcf.te.ui.forms.CustomFormToolkit;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * Remote application main launch tab implementation.
- */
-public class LaunchConfigurationMainTab extends AbstractContextSelectorTab {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.launch.ui.tabs.launchcontext.AbstractContextSelectorTab#doCreateContextSelectorSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected ContextSelectorSection doCreateContextSelectorSection(IManagedForm form, Composite panel) {
-		return new ContextSelectorSection(form, panel);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.launch.ui.tabs.launchcontext.AbstractContextSelectorTab#doCreateAdditionalFormContent(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite, org.eclipse.tcf.te.ui.forms.CustomFormToolkit)
-	 */
-	@Override
-	protected void doCreateAdditionalFormContent(IManagedForm form, Composite parent, CustomFormToolkit toolkit) {
-		// Setup the main panel (using the table wrap layout)
-		Composite panel = toolkit.getFormToolkit().createComposite(parent);
-		GridLayout	layout = new GridLayout(1, false);
-		panel.setLayout(layout);
-		panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		panel.setBackground(parent.getBackground());
-
-		LaunchConfigurationMainTabSection section = new LaunchConfigurationMainTabSection(form, panel);
-		section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
-		form.addPart(section);
-	}
-}
+/*******************************************************************************

+ * 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.debug.ui.DebugUITools;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.tcf.te.launch.ui.tabs.launchcontext.AbstractContextSelectorTab;

+import org.eclipse.tcf.te.tcf.launch.core.interfaces.ILaunchTypes;

+import org.eclipse.tcf.te.tcf.launch.ui.remote.app.launchcontext.ContextSelectorSection;

+import org.eclipse.tcf.te.ui.forms.CustomFormToolkit;

+import org.eclipse.ui.forms.IManagedForm;

+

+/**

+ * Remote application main launch tab implementation.

+ */

+public class LaunchConfigurationMainTab extends AbstractContextSelectorTab {

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tcf.te.launch.ui.tabs.launchcontext.AbstractContextSelectorTab#doCreateContextSelectorSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected ContextSelectorSection doCreateContextSelectorSection(IManagedForm form, Composite panel) {

+		return new ContextSelectorSection(form, panel);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tcf.te.launch.ui.tabs.launchcontext.AbstractContextSelectorTab#doCreateAdditionalFormContent(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite, org.eclipse.tcf.te.ui.forms.CustomFormToolkit)

+	 */

+	@Override

+	protected void doCreateAdditionalFormContent(IManagedForm form, Composite parent, CustomFormToolkit toolkit) {

+		// Setup the main panel (using the table wrap layout)

+		Composite panel = toolkit.getFormToolkit().createComposite(parent);

+		GridLayout	layout = new GridLayout(1, false);

+		panel.setLayout(layout);

+		panel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+		panel.setBackground(parent.getBackground());

+

+		LaunchConfigurationMainTabSection section = new LaunchConfigurationMainTabSection(form, panel);

+		section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));

+		form.addPart(section);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()

+	 */

+	@Override

+	public Image getImage() {

+		return DebugUITools.getImage(ILaunchTypes.REMOTE_APPLICATION);

+	}

+}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java
index 3a494fa50..5becd2d66 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/LaunchConfigurationTabGroup.java
@@ -1,46 +1,48 @@
-/*******************************************************************************
- * 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 java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.tcf.te.launch.ui.tabs.refprojects.RefProjetcsTab;
-import org.eclipse.tcf.te.tcf.launch.ui.remote.app.filetransfer.FileTransferTab;
-
-/**
- * Remote application launch configuration tab group implementation.
- */
-public class LaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchContextConfigurationTabGroup#createContextSelectorTab(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.util.List, java.lang.String)
-	 */
-	@Override
-	public void createContextSelectorTab(ILaunchConfigurationDialog dialog, List<ILaunchConfigurationTab> tabs, String mode) {
-		Assert.isNotNull(tabs);
-
-		ILaunchConfigurationTab tab = new LaunchConfigurationMainTab();
-		tabs.add(tab);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchContextConfigurationTabGroup#createAdditionalTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.util.List, java.lang.String)
-	 */
-	@Override
-	public void createAdditionalTabs(ILaunchConfigurationDialog dialog, List<ILaunchConfigurationTab> tabs, String mode) {
-
-		tabs.add(new FileTransferTab());
-		tabs.add(new RefProjetcsTab());
-	}
-}
+/*******************************************************************************

+ * 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 java.util.List;

+

+import org.eclipse.core.runtime.Assert;

+import org.eclipse.debug.ui.CommonTab;

+import org.eclipse.debug.ui.ILaunchConfigurationDialog;

+import org.eclipse.debug.ui.ILaunchConfigurationTab;

+import org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchConfigurationTabGroup;

+import org.eclipse.tcf.te.launch.ui.tabs.refprojects.RefProjetcsTab;

+import org.eclipse.tcf.te.tcf.launch.ui.remote.app.filetransfer.FileTransferTab;

+

+/**

+ * Remote application launch configuration tab group implementation.

+ */

+public class LaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchContextConfigurationTabGroup#createContextSelectorTab(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.util.List, java.lang.String)

+	 */

+	@Override

+	public void createContextSelectorTab(ILaunchConfigurationDialog dialog, List<ILaunchConfigurationTab> tabs, String mode) {

+		Assert.isNotNull(tabs);

+

+		ILaunchConfigurationTab tab = new LaunchConfigurationMainTab();

+		tabs.add(tab);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tcf.te.launch.ui.tabs.AbstractLaunchContextConfigurationTabGroup#createAdditionalTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.util.List, java.lang.String)

+	 */

+	@Override

+	public void createAdditionalTabs(ILaunchConfigurationDialog dialog, List<ILaunchConfigurationTab> tabs, String mode) {

+

+		tabs.add(new FileTransferTab());

+		tabs.add(new RefProjetcsTab());

+		tabs.add(new CommonTab());

+	}

+}

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/filetransfer/FileTransferTab.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/filetransfer/FileTransferTab.java
index d5a4e3528..029a8eea8 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/filetransfer/FileTransferTab.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/remote/app/filetransfer/FileTransferTab.java
@@ -1,29 +1,40 @@
-/*******************************************************************************
- * 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.filetransfer;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferSection;
-import org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferTab;
-import org.eclipse.ui.forms.IManagedForm;
-
-/**
- * File transfer launch configuration tab implementation.
- */
-public class FileTransferTab extends AbstractFileTransferTab {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferTab#createFileTransferSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected AbstractFileTransferSection createFileTransferSection(IManagedForm form, Composite panel) {
-		return new FileTransferSection(getManagedForm(), panel);
-	}
-}
+/*******************************************************************************

+ * 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.filetransfer;

+

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferSection;

+import org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferTab;

+import org.eclipse.ui.ISharedImages;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.forms.IManagedForm;

+

+/**

+ * File transfer launch configuration tab implementation.

+ */

+public class FileTransferTab extends AbstractFileTransferTab {

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferTab#createFileTransferSection(org.eclipse.ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected AbstractFileTransferSection createFileTransferSection(IManagedForm form, Composite panel) {

+		return new FileTransferSection(getManagedForm(), panel);

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()

+	 */

+	@Override

+	public Image getImage() {

+		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_COPY);

+	}

+}