From 6fc6c3c67169d6f5bb6ab1a8336cb06a9320cad0 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Tue, 8 Mar 2016 20:53:31 -0500
Subject: [PATCH] Bug 484900: Remove CDI launch delegate for post-mortem and
 attach

Change-Id: I47e28d17eb2bc8b63762f799f93e8a2705d7e815
---
 .../launch/remote/tabs/RemoteCMainTab.java    |   1 +
 .../debug/gdbjtag/ui/GDBJtagCDICMainTab.java  |   1 +
 .../org.eclipse.cdt.launch/plugin.properties  |   6 -
 launch/org.eclipse.cdt.launch/plugin.xml      | 137 +-----------------
 .../eclipse/cdt/launch/ui/CMainAttachTab.java |   2 +-
 .../eclipse/cdt/launch/ui/CMainCoreTab.java   |   1 +
 .../org/eclipse/cdt/launch/ui/CMainTab.java   |   1 +
 7 files changed, 6 insertions(+), 143 deletions(-)

diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
index 8b1822fa16a..a16f7a25ca6 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
@@ -66,6 +66,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 
+@Deprecated  // see https://git.eclipse.org/r/#/c/68010/
 public class RemoteCMainTab extends CMainTab {
 
 	/* Labels and Error Messages */
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagCDICMainTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagCDICMainTab.java
index eb526443b54..c77585e7185 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagCDICMainTab.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagCDICMainTab.java
@@ -15,6 +15,7 @@ import org.eclipse.cdt.launch.ui.CMainTab;
 /**
  * @since 7.0
  */
+@SuppressWarnings("deprecation")
 public class GDBJtagCDICMainTab extends CMainTab {
 
 	public GDBJtagCDICMainTab() {
diff --git a/launch/org.eclipse.cdt.launch/plugin.properties b/launch/org.eclipse.cdt.launch/plugin.properties
index 886fd3e5cce..f555bb8f45f 100644
--- a/launch/org.eclipse.cdt.launch/plugin.properties
+++ b/launch/org.eclipse.cdt.launch/plugin.properties
@@ -12,12 +12,6 @@
 pluginName=C/C++ Development Tools Launching Support
 providerName=Eclipse CDT
 
-LocalCDTLaunch.name=Legacy Create Process
-LocalCDTLaunch.description=Start new application optionally under control of the legacy debugger.
-LocalAttachCDTLaunch.name=Legacy Attach to Process
-LocalAttachCDTLaunch.description=Attach legacy debugger to a running program.
-CoreFileCDTLaunch.name=Legacy Postmortem Debugger
-CoreFileCDTLaunch.description=Load an application dump into the legacy debugger.
 LaunchGroup.name=Launch Group
 LaunchGroup.description=Launch several other configurations sequentially
 
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 4cc54cdc212..4dd513b1d2b 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -15,26 +15,6 @@
             sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
             sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
       </launchDelegate>
-      <launchDelegate
-            id="org.eclipse.cdt.cdi.launch.localCAttachLaunch"
-            type="org.eclipse.cdt.launch.attachLaunchType"
-            delegate="org.eclipse.cdt.launch.internal.LocalCDILaunchDelegate"
-            modes="debug"
-            name="%LocalAttachCDTLaunch.name"
-            delegateDescription="%LocalAttachCDTLaunch.description"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchDelegate>
-      <launchDelegate
-            id="org.eclipse.cdt.cdi.launch.coreFileCLaunch"
-            type="org.eclipse.cdt.launch.postmortemLaunchType"
-            delegate="org.eclipse.cdt.launch.internal.LocalCDILaunchDelegate"
-            modes="debug"
-            name="%CoreFileCDTLaunch.name"
-            delegateDescription="%CoreFileCDTLaunch.description"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchDelegate>
       <launchDelegate
             delegate="org.eclipse.cdt.launch.internal.MultiLaunchConfigurationDelegate"
             delegateDescription="%LaunchGroup.description"
@@ -48,122 +28,7 @@
    </extension>
    
    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabs">
-      <!-- Application launch tabs-->
-      <tab
-            id="org.eclipse.cdt.cdi.launch.applicationLaunch.mainTab"
-            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
-            name="%MainLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CMainTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCLaunch"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.applicationLaunch.argumentsTab"
-            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
-            name="%ArgumentsLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CArgumentsTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCLaunch"/>
-        <placement after="org.eclipse.cdt.cdi.launch.mainTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.applicationLaunch.environmentTab"
-            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
-            name="%EnvironmentLaunchTab.name"
-            class="org.eclipse.debug.ui.EnvironmentTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCLaunch"/>
-        <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.applicationLaunch.sourceLookupTab"
-            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
-            name="%SourceLookupLaunchTab.name"
-            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCLaunch"/>
-        <placement after="org.eclipse.cdt.cdi.launch.debuggerTab"/>
-      </tab>
-      <tab
-            class="org.eclipse.debug.ui.RefreshTab"
-            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
-            id="org.eclipse.cdt.launch.applicationLaunch.refreshTab"
-            name="%RefreshLaunchTab.name">
-         <associatedDelegate
-               delegate="org.eclipse.cdt.cdi.launch.localCLaunch">
-         </associatedDelegate>
-         <placement
-               after="org.eclipse.debug.ui.sourceLookupTab">
-         </placement>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.applicationLaunch.commonTab"
-            group="org.eclipse.cdt.launch.applicationLaunchTabGroup"
-            name="%CommonLaunchTab.name"
-            class="org.eclipse.debug.ui.CommonTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCLaunch"/>
-        <placement after="org.eclipse.debug.ui.refreshTab"/>
-      </tab>
-
-      <!-- Attach launch tabs-->
-      <tab
-            id="org.eclipse.cdt.cdi.launch.attachLaunch.mainAttachTab"
-            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
-            name="%MainLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CMainAttachTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCAttachLaunch"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.attachLaunch.sourceLookupTab"
-            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
-            name="%SourceLookupLaunchTab.name"
-            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCAttachLaunch"/>
-        <placement after="org.eclipse.cdt.cdi.launch.debuggerTab"/>
-      </tab>
-      <tab
-            class="org.eclipse.debug.ui.RefreshTab"
-            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
-            id="org.eclipse.cdt.cdi.launch.attachLaunch.refreshTab"
-            name="%RefreshLaunchTab.name">
-         <associatedDelegate
-               delegate="org.eclipse.cdt.cdi.launch.localCAttachLaunch">
-         </associatedDelegate>
-         <placement
-               after="org.eclipse.debug.ui.sourceLookupTab">
-         </placement>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.attachLaunch.commonTab"
-            group="org.eclipse.cdt.launch.attachLaunchTabGroup"
-            name="%CommonLaunchTab.name"
-            class="org.eclipse.debug.ui.CommonTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.localCAttachLaunch"/>
-        <placement after="org.eclipse.debug.ui.refreshTab"/>
-      </tab>
-      
-      <!-- Post mortem launch tabs-->
-      <tab
-            id="org.eclipse.cdt.cdi.launch.postmortemLaunch.mainTab"
-            group="org.eclipse.cdt.launch.postmortemLaunchTabGroup"
-            name="%MainLaunchTab.name"
-            class="org.eclipse.cdt.launch.ui.CMainCoreTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.coreFileCLaunch"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.postmortemLaunch.sourceLookupTab"
-            group="org.eclipse.cdt.launch.postmortemLaunchTabGroup"
-            name="%SourceLookupLaunchTab.name"
-            class="org.eclipse.debug.ui.sourcelookup.SourceLookupTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.coreFileCLaunch"/>
-        <placement after="org.eclipse.cdt.cdi.launch.coreTab"/>
-      </tab>
-      <tab
-            id="org.eclipse.cdt.cdi.launch.postmortemLaunch.commonTab"
-            group="org.eclipse.cdt.launch.postmortemLaunchTabGroup"
-            name="%CommonLaunchTab.name"
-            class="org.eclipse.debug.ui.CommonTab">
-        <associatedDelegate delegate="org.eclipse.cdt.cdi.launch.coreFileCLaunch"/>
-        <placement after="org.eclipse.debug.ui.sourceLookupTab"/>
-      </tab>
-      
+         point="org.eclipse.debug.ui.launchConfigurationTabs">      
       <!-- Run launch tabs-->
       <tab
             id="org.eclipse.cdt.cdi.launch.runApplicationLaunch.mainTab"
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java
index af2c963e1e6..06ed6dfd0cd 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainAttachTab.java
@@ -12,7 +12,7 @@ package org.eclipse.cdt.launch.ui;
 
 import org.eclipse.debug.core.ILaunchConfiguration;
 
-
+@Deprecated
 public class CMainAttachTab extends CMainTab {
 
 	public CMainAttachTab() {
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainCoreTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainCoreTab.java
index f97cd7b1739..856febac2ad 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainCoreTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainCoreTab.java
@@ -14,6 +14,7 @@ package org.eclipse.cdt.launch.ui;
 /**
  * @since 6.0
  */
+@Deprecated
 public class CMainCoreTab extends CMainTab {
     public CMainCoreTab() {
         super(CMainTab.SPECIFY_CORE_FILE);
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
index 8dfcea17d9b..4dd817f8f9b 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
@@ -64,6 +64,7 @@ import org.eclipse.ui.dialogs.TwoPaneElementSelector;
  * </p>
  * @since 2.0
  */
+@Deprecated  // see https://git.eclipse.org/r/#/c/68010/
 public class CMainTab extends CAbstractMainTab {
 
     /**