refactor launch constants to debug core

16 files changed, 55 insertions, 198 deletions

diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index dd94e474b32..8006369b22c 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,24 @@
+2003-02-07 David Inglis

+	

+	Refactor LaunchConstants into debug.core and make setting source locator happen before

+	debug target it created.

+	

+	* src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java

+	* src/org/eclipse/cdt/launch/ICDTLaunchConfigurationConstants.java

+	* src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java

+	* src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java

+	* src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java

+	* src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java

+	* src/org/eclipse/cdt/launch/internal/ui/CoreFileCLaunchConfigurationTabGroup.java

+	* src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java

+	* src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java

+	* src/org/eclipse/cdt/launch/ui/CArgumentsTab.java

+	* src/org/eclipse/cdt/launch/ui/CDebuggerTab.java

+	* src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java

+	* src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java

+	* src/org/eclipse/cdt/launch/ui/CMainTab.java

+	* src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java

+

 2003-02-06 Alain Magloire

 

 	* src/.../launch/internal/ui/WorkingDirectoryBlock.java (geLaunchConfiguration):

diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
index c6e1e1ae91e..e039c9e6dfa 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
@@ -17,6 +17,7 @@ import java.util.Map.Entry;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.debug.core.*;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
@@ -287,18 +288,28 @@ abstract public class AbstractCLaunchDelegate implements ILaunchConfigurationDel
 	 * @param configuration configuration being launched
 	 * @exception CoreException if unable to set the source locator
 	 */
-	protected void setDefaultSourceLocator(ILaunch launch, ILaunchConfiguration configuration) throws CoreException {
+	protected void setSourceLocator(ILaunch launch, ILaunchConfiguration configuration) throws CoreException {
 		//  set default source locator if none specified
 		if (launch.getSourceLocator() == null) {
+			IPersistableSourceLocator sourceLocator;
 			String id = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, (String) null);
 			if (id == null) {
 				ICProject cProject = getCProject(configuration);
-				if (cProject != null) {
-					IPersistableSourceLocator sourceLocator = new DefaultSourceLocator();
+				if (cProject == null) {
+					abort("Project does not exist", null, ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT);
+				}
+				sourceLocator = new DefaultSourceLocator();
+				sourceLocator.initializeDefaults(configuration);
+			} else {
+				sourceLocator = DebugPlugin.getDefault().getLaunchManager().newSourceLocator(id);
+				String memento = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, (String)null);
+				if (memento == null) {
 					sourceLocator.initializeDefaults(configuration);
-					launch.setSourceLocator(sourceLocator);
+				} else {
+					sourceLocator.initializeFromMemento(memento);
 				}
 			}
+			launch.setSourceLocator(sourceLocator);
 		}
 	}
 
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ICDTLaunchConfigurationConstants.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ICDTLaunchConfigurationConstants.java
deleted file mode 100644
index 2773c8ec4c2..00000000000
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ICDTLaunchConfigurationConstants.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.cdt.launch;
-
-/*
- * (c) Copyright QNX Software System 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-
-public interface ICDTLaunchConfigurationConstants {
-	/**
-	 * This is the launch type id.
-	 */
-	public static final String ID_LAUNCH_C_APP = "org.eclipse.cdt.launch.localCLaunch";
-	
-	/**
-	 * Launch configuration attribute key. The value is a name of
-	 * a C/C++ project associated with a C/C++ launch configuration.
-	 */
-	public static final String ATTR_PROJECT_NAME = LaunchUIPlugin.getUniqueIdentifier() + ".PROJECT_ATTR"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * application a C/C++ launch configuration.
-	 */
-	public static final String ATTR_PROGRAM_NAME = LaunchUIPlugin.getUniqueIdentifier() + ".PROGRAM_NAME"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * application arguments for a C/C++ launch configuration, as they should appear
-	 * on the command line.
-	 */
-	public static final String ATTR_PROGRAM_ARGUMENTS = LaunchUIPlugin.getUniqueIdentifier() + ".PROGRAM_ARGUMENTS"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a string specifying a
-	 * path to the working directory to use when launching a the application.
-	 * When unspecified, the working directory is inherited from the current process.
-	 * When specified as an absolute path, the path represents a path in the local
-	 * file system. When specified as a full path, the path represents a workspace
-	 * relative path.
-	 */
-	public static final String ATTR_WORKING_DIRECTORY = LaunchUIPlugin.getUniqueIdentifier() + ".WORKING_DIRECTORY"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying 
-	 * whether the current enviroment should be inherited when the application
-	 * is launched. 
-	 */
-	public static final String ATTR_PROGRAM_ENVIROMENT_INHERIT = LaunchUIPlugin.getUniqueIdentifier() + ".ENVIRONMENT_INHERIT"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a Map specifying the
-	 * environment to use when launching a C/C++ application. 
-	 */
-	public static final String ATTR_PROGRAM_ENVIROMENT_MAP = LaunchUIPlugin.getUniqueIdentifier() + ".ENVIRONMENT_MAP"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is the platform string of the launch configuration
-	 */
-	public static final String ATTR_PLATFORM = LaunchUIPlugin.getUniqueIdentifier() + ".PLATFFORM"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is the debugger id
-	 * used when launching a C/C++ application for debug.
-	 */
-	public static final String ATTR_DEBUGGER_ID = LaunchUIPlugin.getUniqueIdentifier() + ".DEBUGGER_ID"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is the platform string of the launch configuration
-	 */
-	public static final String ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP = LaunchUIPlugin.getUniqueIdentifier() + ".DEBUGGER_SPECIFIC_ATTRS_MAP"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying whether to stop at main().
-	 */
-	public static final String ATTR_DEBUGGER_STOP_AT_MAIN = LaunchUIPlugin.getUniqueIdentifier() + ".DEBUGGER_STOP_AT_MAIN"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is an int specifying the process id to attach to
-	 * if the ATTR_DEBUGGER_START_MODE is DEBUGGER_MODE_ATTACH.  A non existant value or -1 for this
-	 * entry indicates that the user should be asked to supply this value.  This value is primarily
-	 * designed to be used by programatic users of the debug interface.
-	 */
-	public static final String ATTR_ATTACH_PROCESS_ID = LaunchUIPlugin.getUniqueIdentifier() + ".ATTACH_PROCESS_ID"; //$NON-NLS-1$
-
-
-	/**
-	 * Launch configuration attribute key. The value is the startup mode for the debugger.
-	 */
-	public static final String ATTR_DEBUGGER_START_MODE = LaunchUIPlugin.getUniqueIdentifier() + ".DEBUGGER_START_MODE"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute value. The key is ATTR_DEBUGGER_START_MODE.
-	 * Startup debugger running the program.
-	 */
-	public static String DEBUGGER_MODE_RUN = "run";
-
-	/**
-	 * Launch configuration attribute value. The key is ATTR_DEBUGGER_START_MODE.
-	 * Startup debugger and attach to running process.
-	 */
-	public static String DEBUGGER_MODE_ATTACH = "attach";
-
-	/**
-	 * Launch configuration attribute value. The key is ATTR_DEBUGGER_START_MODE.
-	 * Startup debugger to view a core file.
-	 */
-	public static String DEBUGGER_MODE_CORE = "core";
-
-	/**
-	 * Status code indicating that the Eclipse runtime does not support
-	 * launching a program with a working directory. This feature is only
-	 * available if Eclipse is run on a 1.3 runtime or higher.
-	 * <p>
-	 * A status handler may be registered for this error condition,
-	 * and should return a Boolean indicating whether the program
-	 * should be relaunched with the default working directory.
-	 * </p>
-	 */
-	public static final int ERR_WORKING_DIRECTORY_NOT_SUPPORTED = 100;
-
-	/**
-	 * Status code indicating the specified working directory
-	 * does not exist.
-	 */
-	public static final int ERR_WORKING_DIRECTORY_DOES_NOT_EXIST = 101;	
-
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a project when a project is required.
-	 */
-	public static final int ERR_UNSPECIFIED_PROJECT = 102;	
-
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a vaild project.
-	 */
-	public static final int ERR_NOT_A_C_PROJECT = 103;
-
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a vaild program.
-	 */
-	public static final int ERR_PROGRAM_NOT_EXIST = 104;
-
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a program name.
-	 */
-	
-	public static final int ERR_UNSPECIFIED_PROGRAM = 105;
-
-	/**
-	 * Status code indicating that the CDT debugger is missing
-	 * <p>
-	 * A status handler may be registered for this error condition,
-	 * and should return a String indicating which debugger to use.
-	 * </p>
-	 */
-	public static final int ERR_DEBUGGER_NOT_INSTALLED = 106;
-
-	/**
-	 * Status code indicating a the user did not specify a process id
-	 */
-	public static final int ERR_NO_PROCESSID = 107;
-
-	/**
-	 * Status code indicating a the user did not specify a path to a corefile
-	 */
-	public static final int ERR_NO_COREFILE = 108;
-	
-	/**
-	 * Status code indicating an unexpected internal error.
-	 */
-	public static final int ERR_INTERNAL_ERROR = 150;			
-}
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java
index e79155e8404..080b5425487 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java
@@ -9,10 +9,10 @@ import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
index d1430f43414..48c5eae2af4 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
@@ -2,11 +2,11 @@ package org.eclipse.cdt.launch.internal;
 
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.CDebugModel;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -66,6 +66,9 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate {
 			debuggerProcess = DebugPlugin.newProcess(launch, debugger, "Debug Console");
 			launch.removeProcess(debuggerProcess);
 		}
+		// set the source locator
+		setSourceLocator(launch, config);
+
 		CDebugModel.newCoreFileDebugTarget(
 			launch,
 			dsession.getCurrentTarget(),
@@ -73,8 +76,6 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate {
 			debuggerProcess,
 			exe);
 		
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, config);
 		monitor.done();
 	}
 
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
index b9bc1de6675..1c6b68b09e7 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
@@ -16,13 +16,13 @@ import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.IProcessInfo;
 import org.eclipse.cdt.core.IProcessList;
 import org.eclipse.cdt.debug.core.CDebugModel;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.cdt.utils.spawner.ProcessFactory;
 import org.eclipse.core.resources.IFile;
@@ -68,6 +68,9 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 		command.addAll(Arrays.asList(arguments));
 		String[] commandArray = (String[]) command.toArray(new String[command.size()]);
 
+		// set the default source locator if required
+		setSourceLocator(launch, config);
+
 		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
 			IProcess debuggerProcess = null;
 			Process debugger;
@@ -137,8 +140,6 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 			Process process = exec(commandArray, getEnvironmentProperty(config), wd);
 			DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0]));
 		}
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, config);
 		
 		monitor.done();
 		
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
index 10b032dece8..ff29272dcff 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
@@ -6,9 +6,9 @@ package org.eclipse.cdt.launch.internal.ui;
 
 import java.util.Map;
 
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileCLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileCLaunchConfigurationTabGroup.java
index 48b18737614..3f047ed6ab5 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileCLaunchConfigurationTabGroup.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/CoreFileCLaunchConfigurationTabGroup.java
@@ -1,6 +1,6 @@
 package org.eclipse.cdt.launch.internal.ui;
 
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.ui.CMainTab;
 import org.eclipse.cdt.launch.ui.CorefileDebuggerTab;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java
index 02b4514fe65..5867bae887c 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/WorkingDirectoryBlock.java
@@ -2,8 +2,8 @@ package org.eclipse.cdt.launch.internal.ui;
 import java.io.File;
 
 import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
index 2122c05e463..1446adf5633 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/sourcelookup/DefaultSourceLocator.java
@@ -7,10 +7,10 @@ package org.eclipse.cdt.launch.sourcelookup;
 
 import java.text.MessageFormat;
 
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator;
 import org.eclipse.cdt.debug.core.sourcelookup.ISourceMode;
 import org.eclipse.cdt.debug.ui.sourcelookup.CUISourceLocator;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java
index bfaf1cccbf3..e51727cf290 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CArgumentsTab.java
@@ -5,7 +5,7 @@ package org.eclipse.cdt.launch.ui;
  * All Rights Reserved.
  */
 
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchImages;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.cdt.launch.internal.ui.WorkingDirectoryBlock;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
index b7b968eb38c..90508d7e3b1 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
@@ -7,8 +7,8 @@ package org.eclipse.cdt.launch.ui;
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab;
 import org.eclipse.cdt.launch.internal.ui.LaunchImages;
 import org.eclipse.core.boot.BootLoader;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
index 14f1a45666d..3aaf1ead85d 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
 
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchImages;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java
index f72dcc79b9e..34f18c0d249 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java
@@ -6,7 +6,7 @@ import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.core.boot.BootLoader;
 import org.eclipse.core.resources.IProject;
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 4551dddda9e..b47a6915adc 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
@@ -15,7 +15,7 @@ import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.IBinaryContainer;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchImages;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
 import org.eclipse.core.boot.BootLoader;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
index ca5c0f1ada2..7bc0f25a82f 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CorefileDebuggerTab.java
@@ -9,8 +9,8 @@ import org.eclipse.cdt.core.ICDescriptor;
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
+import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
-import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;