Bug 198545 Debug Core should use EMPTY_STRING constant

78 files changed, 205 insertions, 177 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
index 89dc3e83b..fbff613f1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
@@ -51,7 +51,9 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele
 	protected StructuredViewer createViewer(Composite parent){
 		//by default return a table viewer
 		fListViewer = new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		fListViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.heightHint = 150;
+		fListViewer.getTable().setLayoutData(gd);
 		return fListViewer;
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
index f0f1ebb5c..b48b2f1da 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
@@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui;
 
 import java.util.List;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -168,11 +169,11 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog {
 		Composite comp = (Composite) super.createDialogArea(parent);
 		addCustomHeaderControls(comp);
 		String label = getMessage();
-		if(label != null && !IInternalDebugUIConstants.EMPTY_STRING.equals(label)) {
+		if(label != null && !IInternalDebugCoreConstants.EMPTY_STRING.equals(label)) {
 			SWTFactory.createWrapLabel(comp, label, 1);
 		}
 		label = getViewerLabel();
-		if(label != null && !IInternalDebugUIConstants.EMPTY_STRING.equals(label)) {
+		if(label != null && !IInternalDebugCoreConstants.EMPTY_STRING.equals(label)) {
 			SWTFactory.createLabel(comp, label, 1);
 		}
 		fViewer = createViewer(comp);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
index 0ef5c9350..b9c3aff1a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
@@ -16,6 +16,7 @@ import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IDisconnect;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.ITerminate;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 
 /**
  * This class is used to check properties of a debug model.  Two properties can be checked.
@@ -44,7 +45,7 @@ public class DebugModelPropertyTester extends PropertyTester {
 			}
 			if(target != null) {
 				// check that the expected value argument is valid
-				if (expectedValue == null || expectedValue.equals(IInternalDebugUIConstants.EMPTY_STRING)){
+				if (expectedValue == null || expectedValue.equals(IInternalDebugCoreConstants.EMPTY_STRING)){
 					return false;
 				}
 				//!target.isTerminated() && !target.isDisconnected() 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index 66176bd47..d2479e3c5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -47,6 +47,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchListener;
 import org.eclipse.debug.core.IStatusHandler;
 import org.eclipse.debug.core.Launch;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager;
 import org.eclipse.debug.internal.ui.launchConfigurations.ClosedProjectFilter;
 import org.eclipse.debug.internal.ui.launchConfigurations.DeletedProjectFilter;
@@ -819,7 +820,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener {
 	public static ILaunch buildAndLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
 		boolean buildBeforeLaunch = getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_BUILD_BEFORE_LAUNCH);
 		
-		monitor.beginTask(IInternalDebugUIConstants.EMPTY_STRING, 1);
+		monitor.beginTask(IInternalDebugCoreConstants.EMPTY_STRING, 1);
 		try
 		{
 			return configuration.launch(
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
index c5666fc89..501d66e0c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DefaultLabelProvider.java
@@ -39,6 +39,7 @@ import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.debug.core.model.IWatchExpression;
 import org.eclipse.debug.core.model.IWatchpoint;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.launchConfigurations.LaunchShortcutExtension;
 import org.eclipse.debug.internal.ui.views.variables.IndexedVariablePartition;
 import org.eclipse.debug.ui.IDebugUIConstants;
@@ -372,7 +373,7 @@ public class DefaultLabelProvider implements ILabelProvider {
 		} catch (CoreException e) {
 			DebugUIPlugin.log(e);
 		}
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 	
 	protected String getMarkerImageKey(IMarker marker) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java
index faf69cec5..4ceeab034 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java
@@ -139,12 +139,6 @@ public interface IInternalDebugUIConstants {
     public static final String PREF_LAUNCH_PERSPECTIVES = IDebugUIConstants.PLUGIN_ID + ".PREF_LAUNCH_PERSPECTIVES"; //$NON-NLS-1$
     
     /**
-     * Represents the empty string
-     * @since 3.3
-     */
-    public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-    
-    /**
      * Preference for enabling/disabling launch configuration filtering based on project accessibility status
      * 
      * @since 3.2
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
index c2b339905..51c6753b4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
@@ -17,6 +17,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.ui.StringVariableSelectionDialog;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -140,7 +141,7 @@ public class MultipleInputDialog extends Dialog {
 		if (!allowEmpty) {
 			validators.add(new Validator() {
 				public boolean validate() {
-					return !text.getText().equals(IInternalDebugUIConstants.EMPTY_STRING);
+					return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING);
 				}
 			});
 			text.addModifyListener(new ModifyListener() {
@@ -181,7 +182,7 @@ public class MultipleInputDialog extends Dialog {
 		if (!allowEmpty) {
 			validators.add(new Validator() {
 				public boolean validate() {
-					return !text.getText().equals(IInternalDebugUIConstants.EMPTY_STRING);
+					return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING);
 				}
 			});
 
@@ -198,7 +199,7 @@ public class MultipleInputDialog extends Dialog {
 				DirectoryDialog dialog = new DirectoryDialog(getShell());
 				dialog.setMessage(DebugUIMessages.MultipleInputDialog_7);  
 				String currentWorkingDir = text.getText();
-				if (!currentWorkingDir.trim().equals(IInternalDebugUIConstants.EMPTY_STRING)) {
+				if (!currentWorkingDir.trim().equals(IInternalDebugCoreConstants.EMPTY_STRING)) {
 					File path = new File(currentWorkingDir);
 					if (path.exists()) {
 						dialog.setFilterPath(currentWorkingDir);
@@ -245,7 +246,7 @@ public class MultipleInputDialog extends Dialog {
 		if (!allowEmpty) {
 			validators.add(new Validator() {
 				public boolean validate() {
-					return !text.getText().equals(IInternalDebugUIConstants.EMPTY_STRING);
+					return !text.getText().equals(IInternalDebugCoreConstants.EMPTY_STRING);
 				}
 			});
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
index 050acd6c4..e0e4b7b02 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
@@ -83,7 +83,7 @@ public class ResourceExtender extends PropertyTester {
             } else if (PROJECT_NATURE.equals(method)) {
                 try {
                     IProject proj = resource.getProject();
-                    return proj.isAccessible() && proj.hasNature((String) expectedValue);
+                    return proj != null && proj.isAccessible() && proj.hasNature((String) expectedValue);
                 } catch (CoreException e) {
                     return false;
                 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
index 1e2cf800b..84d2e9ebd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractDebugActionDelegate.java
@@ -15,8 +15,8 @@ import java.util.Iterator;
 
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -176,7 +176,7 @@ public abstract class AbstractDebugActionDelegate implements IViewActionDelegate
 	 * Default is to return the empty String.
 	 */
 	protected String getStatusMessage(){
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java
index 7f99e2af7..e77dca8c8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AbstractSelectionActionDelegate.java
@@ -14,7 +14,7 @@ package org.eclipse.debug.internal.ui.actions;
 import java.util.Iterator;
 
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -107,7 +107,7 @@ public abstract class AbstractSelectionActionDelegate implements IViewActionDele
 	 * @return the status message
 	 */
 	protected String getStatusMessage() {
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
 	/*
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
index 0de215158..df87bd40d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/AddToFavoritesAction.java
@@ -21,9 +21,9 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.debug.ui.ILaunchGroup;
@@ -45,7 +45,7 @@ public class AddToFavoritesAction extends SelectionListenerAction {
 	 * Constructs a new action.
 	 */
 	public AddToFavoritesAction() {
-		super(IInternalDebugUIConstants.EMPTY_STRING);
+		super(IInternalDebugCoreConstants.EMPTY_STRING);
 		setEnabled(false);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.EDIT_LAUNCH_CONFIGURATION_ACTION);
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java
index 544f67981..0dbd235bc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/DebugLastAction.java
@@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.actions;
 
 
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager;
 import org.eclipse.debug.ui.IDebugUIConstants;
 
@@ -57,7 +57,7 @@ public class DebugLastAction extends RelaunchLastAction {
 	 * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getTooltipText()
 	 */
 	protected String getTooltipText() {
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java
index e9891e647..8edf58c1a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/EditLaunchConfigurationAction.java
@@ -19,10 +19,10 @@ import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.ILaunchGroup;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -44,7 +44,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction {
 	 * Constructs a new action.
 	 */
 	public EditLaunchConfigurationAction() {
-		super(IInternalDebugUIConstants.EMPTY_STRING);
+		super(IInternalDebugCoreConstants.EMPTY_STRING);
 		setEnabled(false);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.EDIT_LAUNCH_CONFIGURATION_ACTION);
 	}
@@ -78,7 +78,7 @@ public class EditLaunchConfigurationAction extends SelectionListenerAction {
 						// while a launch is waiting for a build. These copied configurations
 						// have an attribute that points to the config that the user is really
 						// launching.
-						String underlyingHandle = configuration.getAttribute(DebugUIPlugin.ATTR_LAUNCHING_CONFIG_HANDLE, IInternalDebugUIConstants.EMPTY_STRING);
+						String underlyingHandle = configuration.getAttribute(DebugUIPlugin.ATTR_LAUNCHING_CONFIG_HANDLE, IInternalDebugCoreConstants.EMPTY_STRING);
 						if (underlyingHandle.length() > 0) {
 							ILaunchConfiguration underlyingConfig = DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(underlyingHandle);
 							if (underlyingConfig != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java
index 09f563a35..66f14d815 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ProfileLastAction.java
@@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.actions;
 
 
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager;
 import org.eclipse.debug.ui.IDebugUIConstants;
 
@@ -58,7 +58,7 @@ public class ProfileLastAction extends RelaunchLastAction {
 	 * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getTooltipText()
 	 */
 	protected String getTooltipText() {
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java
index b4877c383..17fa319a1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunLastAction.java
@@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.actions;
 
 
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.contextlaunching.LaunchingResourceManager;
 import org.eclipse.debug.ui.IDebugUIConstants;
 
@@ -57,7 +57,7 @@ public class RunLastAction extends RelaunchLastAction {
 	 * @see org.eclipse.debug.internal.ui.actions.RelaunchLastAction#getTooltipText()
 	 */
 	protected String getTooltipText() {
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java
index 2763c29cd..243c140bb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/AdvancedGroupBreakpointsByAction.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.actions.breakpointGroups;
 
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
@@ -26,7 +26,7 @@ public class AdvancedGroupBreakpointsByAction extends Action {
 	private BreakpointsView fView;
 	
 	public AdvancedGroupBreakpointsByAction(BreakpointsView view) {
-        super(IInternalDebugUIConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
+        super(IInternalDebugCoreConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
 		fView= view;
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java
index 491e0d486..c53ab9ab8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpointGroups/GroupBreakpointsAction.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.actions.breakpointGroups;
 
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.views.breakpoints.BreakpointsView;
 import org.eclipse.debug.internal.ui.views.breakpoints.IBreakpointOrganizer;
 import org.eclipse.jface.action.Action;
@@ -34,7 +34,7 @@ public class GroupBreakpointsAction extends Action {
      * @param view the breakpoints view
      */
     public GroupBreakpointsAction(IBreakpointOrganizer organizer, BreakpointsView view) {
-        super(IInternalDebugUIConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
+        super(IInternalDebugCoreConstants.EMPTY_STRING, IAction.AS_RADIO_BUTTON);
         fOrganzier= organizer;
         fView= view;
     }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java
index b11b4e3b3..a458d9e06 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/expressions/AddWatchExpressionAction.java
@@ -13,8 +13,8 @@ package org.eclipse.debug.internal.ui.actions.expressions;
 
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IWatchExpression;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.window.Window;
@@ -38,7 +38,7 @@ public class AddWatchExpressionAction extends WatchExpressionAction implements I
 	 */
 	public void run(IAction action) {
 		// create a watch expression
-		IWatchExpression watchExpression= DebugPlugin.getDefault().getExpressionManager().newWatchExpression(IInternalDebugUIConstants.EMPTY_STRING);
+		IWatchExpression watchExpression= DebugPlugin.getDefault().getExpressionManager().newWatchExpression(IInternalDebugCoreConstants.EMPTY_STRING);
 		// open the watch expression dialog
 		if (new WatchExpressionDialog(DebugUIPlugin.getShell(), watchExpression, false).open() == Window.OK) {
 			// if OK is selected, add the expression to the expression view and try to evaluate the expression.
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java
index 52dd53676..c1a5fab94 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java
@@ -16,6 +16,7 @@ import java.util.Iterator;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IValueModification;
 import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
@@ -100,8 +101,8 @@ public class ChangeVariableValueAction extends SelectionProviderAction {
      * @param shell a shell for prompting the user
      */
     protected void doDefaultEdit(Shell shell) {
-	    String name= IInternalDebugUIConstants.EMPTY_STRING;
-		String value= IInternalDebugUIConstants.EMPTY_STRING;
+	    String name= IInternalDebugCoreConstants.EMPTY_STRING;
+		String value= IInternalDebugCoreConstants.EMPTY_STRING;
 		try {
 			name= fVariable.getName();
 			value= fVariable.getValue().getValueString();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java
index 67a87fb3c..a5aeb7119 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueInputDialog.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.actions.variables;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -53,7 +53,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog {
 	/**
 	 * The input value; the empty string by default.
 	 */
-	private String value= IInternalDebugUIConstants.EMPTY_STRING;
+	private String value= IInternalDebugCoreConstants.EMPTY_STRING;
 	
 	/**
 	 * The input validator, or <code>null</code> if none.
@@ -94,7 +94,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog {
 		this.title = dialogTitle;
 		message = dialogMessage;
 		if (initialValue == null)
-			value = IInternalDebugUIConstants.EMPTY_STRING;
+			value = IInternalDebugCoreConstants.EMPTY_STRING;
 		else
 			value = initialValue;
 		this.validator = validator;
@@ -169,7 +169,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog {
 						if (okButton.isEnabled()) {
 							return;
 						}
-						errorMessageLabel.setText(IInternalDebugUIConstants.EMPTY_STRING); 
+						errorMessageLabel.setText(IInternalDebugCoreConstants.EMPTY_STRING); 
 						errorMessageLabel.getParent().update();
 						okButton.setEnabled(true);
 					}
@@ -243,7 +243,7 @@ public class ChangeVariableValueInputDialog extends TrayDialog {
 		}
 		
 		// Bug 16256: important not to treat empty string (blank error) the same as null (no error)
-		errorMessageLabel.setText(errorMessage == null ? IInternalDebugUIConstants.EMPTY_STRING : errorMessage);
+		errorMessageLabel.setText(errorMessage == null ? IInternalDebugCoreConstants.EMPTY_STRING : errorMessage);
 		okButton.setEnabled(errorMessage == null);
 		
 		errorMessageLabel.getParent().update();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java
index d730d5141..ccbf5d064 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.actions.variables;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -35,7 +36,7 @@ public class ToggleDetailPaneAction extends Action {
 	private String fOrientation;
 
 	public ToggleDetailPaneAction(VariablesView view, String orientation, String hiddenLabel) {
-		super(IInternalDebugUIConstants.EMPTY_STRING, AS_RADIO_BUTTON);
+		super(IInternalDebugCoreConstants.EMPTY_STRING, AS_RADIO_BUTTON);
 		setVariablesView(view);
 		setOrientation(orientation);
 				
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java
index e5125988a..0bcee1b3d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/details/DetailPaneMaxLengthDialog.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.actions.variables.details;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.views.variables.VariablesViewMessages;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -165,7 +165,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog {
     public void setErrorMessage(String errorMessage) {
     	fErrorMessage = errorMessage;
     	if (fErrorTextWidget != null && !fErrorTextWidget.isDisposed()) {
-    		fErrorTextWidget.setText(errorMessage == null ? IInternalDebugUIConstants.EMPTY_STRING : errorMessage);
+    		fErrorTextWidget.setText(errorMessage == null ? IInternalDebugCoreConstants.EMPTY_STRING : errorMessage);
     		fErrorTextWidget.getParent().update();
     		// Access the ok button by id, in case clients have overridden button creation.
     		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=113643
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java
index e6945eb3f..5d07d2d1a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/elements/adapters/MemorySegmentLabelAdapter.java
@@ -15,6 +15,7 @@ import java.math.BigInteger;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.model.MemoryByte;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -64,7 +65,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter {
 						labels[i+1] = getColumnText(element, i+1, tableRendering, (TableRenderingContentDescriptor)tableRendering.getAdapter(TableRenderingContentDescriptor.class));
 					}
 					
-					labels[labels.length - 1 ] = IInternalDebugUIConstants.EMPTY_STRING;
+					labels[labels.length - 1 ] = IInternalDebugCoreConstants.EMPTY_STRING;
 					return labels;
 				}
 			}
@@ -111,7 +112,7 @@ public class MemorySegmentLabelAdapter extends AsynchronousLabelAdapter {
 			{
 				MemorySegment segment = (MemorySegment)element;
 				if (segment.getBytes().length != tableRendering.getBytesPerLine())
-					return IInternalDebugUIConstants.EMPTY_STRING;
+					return IInternalDebugCoreConstants.EMPTY_STRING;
 			}
 			
 			ILabelProvider labelProvider = (ILabelProvider)tableRendering.getAdapter(ILabelProvider.class);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
index 881900295..a7021a27a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardExportBreakpointsPage.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
@@ -236,7 +237,7 @@ public class WizardExportBreakpointsPage extends WizardPage implements Listener
 	 * @return if the prerequesites of the wizard are met to allow the wizard to complete.
 	 */
 	private boolean detectPageComplete() {
-		boolean emptyFile = fDestinationNameField.getText().trim().equals(IInternalDebugUIConstants.EMPTY_STRING);
+		boolean emptyFile = fDestinationNameField.getText().trim().equals(IInternalDebugCoreConstants.EMPTY_STRING);
 		if (emptyFile) {
 			setMessage(ImportExportMessages.WizardExportBreakpointsPage_0, IMessageProvider.NONE);
 			return false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
index 6fece6f32..242327126 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/WizardImportBreakpointsPage.java
@@ -16,6 +16,7 @@ import java.lang.reflect.InvocationTargetException;
 import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
@@ -124,7 +125,7 @@ public class WizardImportBreakpointsPage extends WizardPage implements Listener
 	 */
 	private boolean detectPageComplete() {
 		String fileName = fFileNameField.getText().trim();
-		if (fileName.equals(IInternalDebugUIConstants.EMPTY_STRING)) {
+		if (fileName.equals(IInternalDebugCoreConstants.EMPTY_STRING)) {
 			setMessage(ImportExportMessages.WizardImportBreakpointsPage_6);
 			return false;
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java
index 47f311788..9cf9be898 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationPropertiesDialog.java
@@ -20,9 +20,9 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationListener;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
@@ -162,7 +162,7 @@ public class LaunchConfigurationPropertiesDialog extends LaunchConfigurationsDia
 	
 		// Set the things that TitleAreaDialog takes care of 
 		setTitle(getTitleAreaTitle());
-		setMessage(IInternalDebugUIConstants.EMPTY_STRING);
+		setMessage(IInternalDebugCoreConstants.EMPTY_STRING);
 		setModeLabelState();
 	
 		// Build the launch configuration edit area and put it into the composite.
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
index d60ace53a..67cee23ba 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupExtension.java
@@ -22,7 +22,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.debug.internal.core.IConfigurationElementConstants;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
 
 
@@ -208,7 +208,7 @@ public class LaunchConfigurationTabGroupExtension {
 			description = fConfig.getAttribute(IConfigurationElementConstants.DESCRIPTION);
 			
 		}
-		return (description == null ? IInternalDebugUIConstants.EMPTY_STRING : description);
+		return (description == null ? IInternalDebugCoreConstants.EMPTY_STRING : description);
 	}
 	
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
index 98e29d9ee..205a92d9a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
@@ -27,6 +27,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchDelegate;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchConfigurationWorkingCopy;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -448,7 +449,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 	public void setName(String name) {
 		if (getWorkingCopy() != null) {
 			if (name == null) {
-				fNameWidget.setText(IInternalDebugUIConstants.EMPTY_STRING);
+				fNameWidget.setText(IInternalDebugCoreConstants.EMPTY_STRING);
 			}
 			else {
 				fNameWidget.setText(name.trim());
@@ -689,7 +690,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		ILaunchConfigurationDialog lcd = getLaunchConfigurationDialog();
 		if(lcd instanceof LaunchConfigurationsDialog) {
 			if(((LaunchConfigurationsDialog)lcd).isTreeSelectionEmpty()) {
-				fDescription = IInternalDebugUIConstants.EMPTY_STRING;
+				fDescription = IInternalDebugCoreConstants.EMPTY_STRING;
 			}
 		}
 	}
@@ -818,7 +819,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		fTabType = configType;
 		ILaunchConfigurationTab[] tabs = getTabs();
 		CTabItem tab = null;
-		String name = IInternalDebugUIConstants.EMPTY_STRING;
+		String name = IInternalDebugCoreConstants.EMPTY_STRING;
 		Control control = null;
 		for (int i = 0; i < tabs.length; i++) {
 			tab = new CTabItem(fTabFolder, SWT.BORDER);
@@ -860,7 +861,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 			description = LaunchConfigurationPresentationManager.getDefault().getDescription(configType, mode);
 		}	
 		if (description == null) {
-			description = IInternalDebugUIConstants.EMPTY_STRING;
+			description = IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 		return description;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
index e5b7a1418..5b3d3126d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationView.java
@@ -17,9 +17,9 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationListener;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.ui.AbstractDebugView;
 import org.eclipse.debug.ui.IDebugUIConstants;
@@ -384,7 +384,7 @@ public class LaunchConfigurationView extends AbstractDebugView implements ILaunc
 		if (getViewer() instanceof StructuredViewer) {
 			((StructuredViewer)getViewer()).addDoubleClickListener(this);
 		}
-		fFilteredNotice = SWTFactory.createLabel(parent, IInternalDebugUIConstants.EMPTY_STRING, 1);
+		fFilteredNotice = SWTFactory.createLabel(parent, IInternalDebugCoreConstants.EMPTY_STRING, 1);
 		fFilteredNotice.setBackground(parent.getBackground());
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index 6cb652928..30ff0e28b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -28,6 +28,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.IStatusHandler;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchManager;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
@@ -631,7 +632,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	 */
 	public String generateName(String name) {
 		if (name == null) {
-			name = IInternalDebugUIConstants.EMPTY_STRING;
+			name = IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 		return getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name);
 	}
@@ -648,7 +649,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	 */
 	public String generateName(String name, Set reservednames) {
 		if(name == null) {
-			name = IInternalDebugUIConstants.EMPTY_STRING;
+			name = IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 		return ((LaunchManager)getLaunchManager()).generateUniqueLaunchConfigurationNameFrom(name, reservednames);
 	}
@@ -1138,14 +1139,14 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 			TreeItem[] items = fLaunchConfigurationView.getTreeViewer().getTree().getItems();
 			String value = settings.get(DIALOG_EXPANDED_NODES);
 			if(value == null) {
-				value = IInternalDebugUIConstants.EMPTY_STRING;
+				value = IInternalDebugCoreConstants.EMPTY_STRING;
 			}
 			ArrayList list = new ArrayList();
 			String[] persisted = value.split(DELIMITER); 
 			for(int i = 0; i < persisted.length; i++) {
 				list.add(persisted[i]);
 			}
-			String type = IInternalDebugUIConstants.EMPTY_STRING;
+			String type = IInternalDebugCoreConstants.EMPTY_STRING;
 			//if the item is not in the list and is expanded add it, otherwise if it
 			//is not expanded do a remove...either way for the else we query the list
 			for(int i = 0; i < items.length; i++) {
@@ -1157,7 +1158,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 					list.remove(type);
 				}
 			}
-			value = IInternalDebugUIConstants.EMPTY_STRING;
+			value = IInternalDebugCoreConstants.EMPTY_STRING;
 			//build the preference string
 			for(Iterator iter = list.iterator(); iter.hasNext();) {
 				value += iter.next() + DELIMITER;
@@ -1518,7 +1519,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
 	 */
 	public void propertyChange(final PropertyChangeEvent event) {
-		WorkbenchJob job = new WorkbenchJob(IInternalDebugUIConstants.EMPTY_STRING) {
+		WorkbenchJob job = new WorkbenchJob(IInternalDebugCoreConstants.EMPTY_STRING) {
 			public IStatus runInUIThread(IProgressMonitor monitor) {
 				TreeViewer viewer = fLaunchConfigurationView.getTreeViewer();
 				boolean newvalue = Boolean.valueOf(event.getNewValue().toString()).booleanValue();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java
index 39526f3db..0a4b61e00 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutSelectionDialog.java
@@ -115,7 +115,7 @@ public class LaunchShortcutSelectionDialog extends AbstractDebugListSelectionDia
 		Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.LaunchShortcutSelectionDialog_2, 1, 1, GridData.FILL_BOTH);
 		GridData gd = (GridData) group.getLayoutData();
 		gd.heightHint = 100;
-		fDescriptionText = SWTFactory.createText(group, SWT.WRAP | SWT.READ_ONLY, 1, GridData.FILL_BOTH);
+		fDescriptionText = SWTFactory.createText(group, SWT.WRAP | SWT.READ_ONLY, 1, GridData.FILL_HORIZONTAL);
 		fDescriptionText.setBackground(group.getBackground());
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
index 979d2800a..43982e876 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/PerspectiveManager.java
@@ -34,6 +34,7 @@ import org.eclipse.debug.core.ILaunchDelegate;
 import org.eclipse.debug.core.ILaunchListener;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.internal.core.IConfigurationElementConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchManager;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -589,7 +590,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
 		if (DebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IDebugUIConstants.PREF_ACTIVATE_WORKBENCH)) {
 			shell.forceActive();
 		}
-		String message = IInternalDebugUIConstants.EMPTY_STRING;
+		String message = IInternalDebugCoreConstants.EMPTY_STRING;
 		if(IInternalDebugUIConstants.PREF_SWITCH_PERSPECTIVE_ON_SUSPEND.equals(preferenceKey)) {
 			if (getPerspectiveDescription(perspectiveId) != null) {
 				message = LaunchConfigurationsMessages.PerspectiveManager_suspend_description;
@@ -966,7 +967,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
 								lctype = lm.getLaunchConfigurationType(type);
 								ldelegate = lm.getLaunchDelegate(delegate);
 								modes = parseModes(mode);
-								if(lctype != null && !modes.isEmpty() && !IInternalDebugUIConstants.EMPTY_STRING.equals(perspective)) {
+								if(lctype != null && !modes.isEmpty() && !IInternalDebugCoreConstants.EMPTY_STRING.equals(perspective)) {
 									setLaunchPerspective(lctype, modes, ldelegate, perspective);
 								}
 							}
@@ -1000,7 +1001,7 @@ public class PerspectiveManager implements ILaunchListener, ISuspendTriggerListe
 	 * @return the 
 	 */
 	private String createModesetString(Set modes) {
-		String str = IInternalDebugUIConstants.EMPTY_STRING;
+		String str = IInternalDebugCoreConstants.EMPTY_STRING;
 		if(modes != null) {
 			for(Iterator iter = modes.iterator(); iter.hasNext();) {
 				str += iter.next();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java
index 9719b5ab3..f40d70926 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/SelectLaunchersDialog.java
@@ -16,10 +16,10 @@ import java.util.Set;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchDelegate;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.AbstractDebugCheckboxSelectionDialog;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -269,7 +269,7 @@ public class SelectLaunchersDialog extends AbstractDebugCheckboxSelectionDialog
 					fDescriptionText.setText(((ILaunchDelegate)ss.getFirstElement()).getDescription());
 				}
 				else {
-					fDescriptionText.setText(IInternalDebugUIConstants.EMPTY_STRING);
+					fDescriptionText.setText(IInternalDebugCoreConstants.EMPTY_STRING);
 				}
 			}
 		});
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java
index 753df0563..6fd27c8c9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTableRendering.java
@@ -30,6 +30,7 @@ import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.MemoryByte;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -296,7 +297,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende
 	private class SwitchPageJob extends UIJob {
 		private Object fLock = new Object();
 		private boolean fShowMessagePage = false;
-		private String fMessage = IInternalDebugUIConstants.EMPTY_STRING;
+		private String fMessage = IInternalDebugCoreConstants.EMPTY_STRING;
 
 		private SwitchPageJob() {
 			super("SwitchPageJob");//$NON-NLS-1$
@@ -1898,7 +1899,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende
 	}
 	
 	private String buildLabel(boolean showAddress) {
-		String label = IInternalDebugUIConstants.EMPTY_STRING;
+		String label = IInternalDebugCoreConstants.EMPTY_STRING;
 		if (getMemoryBlock() instanceof IMemoryBlockExtension)
 		{
 			label = ((IMemoryBlockExtension)getMemoryBlock()).getExpression();
@@ -2103,7 +2104,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende
 	public String getSelectedAsString() {
 
 		if (getSelectedAddress() == null)
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		
 		MemoryByte[] bytes = getSelectedAsBytes();
 		if (bytes.length > 0)
@@ -2111,7 +2112,7 @@ public abstract class AbstractAsyncTableRendering extends AbstractBaseTableRende
 			return getString(this.getRenderingId(), getSelectedAddress(), bytes);
 		}
 		else
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java
index 7bdfc4d15..bed96d88a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/memory/provisional/AbstractAsyncTextRendering.java
@@ -14,8 +14,8 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 
 import org.eclipse.debug.core.model.MemoryByte;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.IDebugUIConstants;
 
 /**
@@ -89,7 +89,7 @@ abstract public class AbstractAsyncTextRendering extends AbstractAsyncTableRende
 		try {
 			String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR);
 			if(fCodePage == null)
-				return IInternalDebugUIConstants.EMPTY_STRING;
+				return IInternalDebugCoreConstants.EMPTY_STRING;
 			
 			boolean[] invalid = new boolean[data.length];
 			boolean hasInvalid = false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java
index d2e60e1f1..cc04c51c8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/RegisterGroupLabelProvider.java
@@ -11,7 +11,7 @@
 package org.eclipse.debug.internal.ui.model.elements;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.elements.adapters.VariableColumnPresentation;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -39,7 +39,7 @@ public class RegisterGroupLabelProvider extends DebugElementLabelProvider {
 		if (columnId == null || VariableColumnPresentation.COLUMN_VARIABLE_NAME.equals(columnId)) {
 			return super.getLabel(elementPath, context, columnId);
 		} else {
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 	}
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java
index 82c97cc0e..50c7fe68b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchConfigurationsPreferencePage.java
@@ -18,6 +18,7 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchManager;
 import org.eclipse.debug.internal.ui.AbstractDebugCheckboxSelectionDialog;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
@@ -397,7 +398,7 @@ public class LaunchConfigurationsPreferencePage extends PreferencePage implement
 		DebugPlugin.getDefault().getPluginPreferences().setValue(
 				LaunchManager.PREF_DELETE_CONFIGS_ON_PROJECT_DELETE, fDeleteConfigs.getSelection());
 		//save table
-		String types = IInternalDebugUIConstants.EMPTY_STRING;
+		String types = IInternalDebugCoreConstants.EMPTY_STRING;
 		TableItem[] items = fTable.getItems();
 		ILaunchConfigurationType type;
 		for(int i = 0; i < items.length; i++) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java
index 9264c8990..e5dd71a9f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchPerspectivePreferencePage.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchDelegate;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchDelegate;
 import org.eclipse.debug.internal.core.LaunchManager;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
@@ -149,11 +150,11 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I
 		protected void createPanel(Composite parent, String heading) {
 			fMainComposite = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_BOTH);
 			SWTFactory.createWrapLabel(fMainComposite, heading, 2);
-			fMessage = SWTFactory.createWrapLabel(fMainComposite, IInternalDebugUIConstants.EMPTY_STRING, 2, 250);
+			fMessage = SWTFactory.createWrapLabel(fMainComposite, IInternalDebugCoreConstants.EMPTY_STRING, 2, 250);
 		}
 		
 		public void setMessage(String msg) {
-			fMessage.setText((msg == null ? IInternalDebugUIConstants.EMPTY_STRING : msg));
+			fMessage.setText((msg == null ? IInternalDebugCoreConstants.EMPTY_STRING : msg));
 		}
 		
 		public void refreshPanel(IStructuredSelection selection) {
@@ -354,7 +355,7 @@ public class LaunchPerspectivePreferencePage extends PreferencePage implements I
 			fPerspectivesPanel.setMessage(DebugPreferencesMessages.LaunchPerspectivePreferencePage_1);
 			return;
 		}
-		fPerspectivesPanel.setMessage(IInternalDebugUIConstants.EMPTY_STRING);
+		fPerspectivesPanel.setMessage(IInternalDebugCoreConstants.EMPTY_STRING);
 		List fmodes = null;
 		Combo combo = null;
 		Set smodes = null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java
index 4b05a776c..2ae269e39 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/LaunchersPreferencePage.java
@@ -20,11 +20,11 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchDelegate;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchManager;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.DefaultLabelProvider;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPresentationManager;
 import org.eclipse.jface.preference.PreferencePage;
@@ -220,7 +220,7 @@ public class LaunchersPreferencePage extends PreferencePage implements IWorkbenc
 					fDescription.setText(((ILaunchDelegate)ss.getFirstElement()).getDescription());
 				}
 				else {
-					fDescription.setText(IInternalDebugUIConstants.EMPTY_STRING);
+					fDescription.setText(IInternalDebugCoreConstants.EMPTY_STRING);
 				}
 			}
 		});
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java
index 224bc5625..bc353eaac 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/StringVariablePreferencePage.java
@@ -18,9 +18,9 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.variables.IStringVariableManager;
 import org.eclipse.core.variables.IValueVariable;
 import org.eclipse.core.variables.VariablesPlugin;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.MultipleInputDialog;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -663,17 +663,17 @@ public class StringVariablePreferencePage extends PreferencePage implements IWor
 					case 1:
 						String value= variable.getValue(); 
 						if (value == null) {
-							value= IInternalDebugUIConstants.EMPTY_STRING;
+							value= IInternalDebugCoreConstants.EMPTY_STRING;
 						}
 						return value;
 					case 2:
 						String description= variable.getDescription();
 						if (description == null) {
-							description= IInternalDebugUIConstants.EMPTY_STRING;
+							description= IInternalDebugCoreConstants.EMPTY_STRING;
 						}
 						return description;
 					case 3:
-						String contribution = IInternalDebugUIConstants.EMPTY_STRING;
+						String contribution = IInternalDebugCoreConstants.EMPTY_STRING;
 						if (variable.isContributed()) {
                             String pluginId = getVariableManager().getContributingPluginId(variable.getUnderlyingVariable());
                             if (pluginId != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java
index d40c47b4c..2d1f398e7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ViewManagementPreferencePage.java
@@ -12,6 +12,7 @@ package org.eclipse.debug.internal.ui.preferences;
 
 import java.util.Iterator;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
@@ -183,7 +184,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor
         getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_TRACK_VIEWS, trackViews);
 		if (fResetPressed || !trackViews) {
             // Reset if the user has pressed reset or chosen to no longer track views
-			getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS, IInternalDebugUIConstants.EMPTY_STRING); 
+			getPreferenceStore().setValue(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS, IInternalDebugCoreConstants.EMPTY_STRING); 
 		}
 		return super.performOk();
 	}
@@ -211,7 +212,7 @@ public class ViewManagementPreferencePage extends PreferencePage implements IWor
      * Always disable if "track views" is turned off.
 	 */
 	private void updateResetButton() {
-		boolean enableReset= !IInternalDebugUIConstants.EMPTY_STRING.equals(getPreferenceStore().getString(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS));
+		boolean enableReset= !IInternalDebugCoreConstants.EMPTY_STRING.equals(getPreferenceStore().getString(IInternalDebugUIConstants.PREF_USER_VIEW_BINDINGS));
         // Only enable the button if there are views to clear, the user hasn't pressed the reset
         // button, and the option to "track views" is turned on.
 		fResetViewsButton.setEnabled(enableReset && !fResetPressed && fTrackViewsButton.getSelection());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java
index e619ecc62..5d81128d8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java
@@ -18,7 +18,7 @@ import org.eclipse.debug.core.sourcelookup.containers.ArchiveSourceContainer;
 import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
 import org.eclipse.debug.core.sourcelookup.containers.ExternalArchiveSourceContainer;
 import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 
@@ -63,7 +63,7 @@ public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter {
 			IPath path = new Path(container.getName());
 			return SourceElementWorkbenchAdapter.getQualifiedName(path);
 		}		
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java
index 2e5f10617..3e890a44e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceElementWorkbenchAdapter.java
@@ -15,7 +15,7 @@ import java.io.File;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
 import org.eclipse.debug.core.sourcelookup.containers.ZipEntryStorage;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -59,7 +59,7 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter {
 			buffer.append(storage.getArchive().getName());
 			return buffer.toString();
 		}
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
@@ -85,6 +85,6 @@ public class SourceElementWorkbenchAdapter implements IWorkbenchAdapter {
 			}
 			return buffer.toString();
 		}
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java
index a8bbafa5e..1b6ed903a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/ArchiveSourceContainerBrowser.java
@@ -21,8 +21,8 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.sourcelookup.ISourceContainer;
 import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
 import org.eclipse.debug.core.sourcelookup.containers.ArchiveSourceContainer;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages;
 import org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -44,14 +44,14 @@ public class ArchiveSourceContainerBrowser extends AbstractSourceContainerBrowse
 	private ISelectionStatusValidator validator= new ISelectionStatusValidator() {
 		public IStatus validate(Object[] selection) {
 			if (selection.length == 0) {
-				return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null);
+				return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugCoreConstants.EMPTY_STRING, null);
 			}
 			for (int i= 0; i < selection.length; i++) {
 				if (!(selection[i] instanceof IFile)) {
-					return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null);
+					return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugCoreConstants.EMPTY_STRING, null);
 				}					
 			}
-			return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null);
+			return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugCoreConstants.EMPTY_STRING, null);
 		}			
 	};
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java
index c95e83c9c..942cb37e1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/DirectorySourceContainerDialog.java
@@ -13,6 +13,7 @@ package org.eclipse.debug.internal.ui.sourcelookup.browsers;
 
 import java.io.File;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
@@ -64,7 +65,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog {
 	 * @param shell shell
 	 */
 	public DirectorySourceContainerDialog(Shell shell) {
-		this(shell, IInternalDebugUIConstants.EMPTY_STRING, DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING));
+		this(shell, IInternalDebugCoreConstants.EMPTY_STRING, DebugUIPlugin.getDefault().getDialogSettings().getBoolean(LAST_SUBDIR_SETTING));
 		fNewContainer = true;
 	}
 
@@ -209,7 +210,7 @@ public class DirectorySourceContainerDialog extends TitleAreaDialog {
 			last = DebugUIPlugin.getDefault().getDialogSettings().get(LAST_PATH_SETTING);
 		}
 		if (last == null) {
-			last = IInternalDebugUIConstants.EMPTY_STRING; 
+			last = IInternalDebugCoreConstants.EMPTY_STRING; 
 		}
 		DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SINGLE);
 		dialog.setText(SourceLookupUIMessages.DirectorySourceContainerDialog_0); 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java
index b095cc4a3..a3e3864ea 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/browsers/FolderSourceContainerDialog.java
@@ -15,9 +15,9 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -92,7 +92,7 @@ public class FolderSourceContainerDialog extends ElementTreeSelectionDialog {
 						return new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), -1, SourceLookupUIMessages.sourceSearch_folderSelectionError, null); // 
 					} 				
 				}
-				return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugUIConstants.EMPTY_STRING, null);
+				return new Status(IStatus.OK, DebugUIPlugin.getUniqueIdentifier(), 0, IInternalDebugCoreConstants.EMPTY_STRING, null);
 			}			
 		};
 		setValidator(validator);	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java
index 45d444523..c6fadb673 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/LabelUpdate.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.viewers.model;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.commands.Request;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -167,7 +167,7 @@ class LabelUpdate extends Request implements ILabelUpdate {
 			
 			for (int i=0; i<fNumColumns; i++){
 				// text might be null if the launch has been terminated
-				fItem.setText(i,(fLabels[i] == null ? IInternalDebugUIConstants.EMPTY_STRING : fLabels[i]));
+				fItem.setText(i,(fLabels[i] == null ? IInternalDebugCoreConstants.EMPTY_STRING : fLabels[i]));
 			}
 			fItem.setData(PREV_LABEL_KEY, fLabels);
 			
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java
index 0462112ec..7c6125371 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/TreeCursor.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.viewers.model;
 
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
@@ -417,7 +417,7 @@ void paint(Event event) {
 		x += imageSize.width;
 	}
 	String text = row.getText(columnIndex);
-	if (text != IInternalDebugUIConstants.EMPTY_STRING) {
+	if (text != IInternalDebugCoreConstants.EMPTY_STRING) {
 		Rectangle bounds = row.getBounds(columnIndex);
 		Point extent = gc.stringExtent(text);
 		// Temporary code - need a better way to determine table trim
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java
index 1e1e2445a..6c9f2af7e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/VirtualCopyToClipboardActionDelegate.java
@@ -17,8 +17,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.actions.AbstractDebugActionDelegate;
 import org.eclipse.debug.internal.ui.actions.ActionMessages;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate;
@@ -88,7 +88,7 @@ public class VirtualCopyToClipboardActionDelegate extends AbstractDebugActionDel
 		if(count > 0) {
 			for (int i = 0; i < count; i++) {
 				String text = labels[i];
-				if(text != null && !text.trim().equals(IInternalDebugUIConstants.EMPTY_STRING)) {
+				if(text != null && !text.trim().equals(IInternalDebugCoreConstants.EMPTY_STRING)) {
 					buffer.append(text+TAB);
 				}
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
index 471e4b601..e9ac191a1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
@@ -34,6 +34,7 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.contexts.DebugModelContextBindingManager;
@@ -1024,7 +1025,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
                 DebugContextViewBindings binding = (DebugContextViewBindings) bindings.next();
                 binding.saveBindings(document, root, done);
             }
-            String prefValue = IInternalDebugUIConstants.EMPTY_STRING;
+            String prefValue = IInternalDebugCoreConstants.EMPTY_STRING;
             if (root.hasChildNodes()) {
             	prefValue = DebugPlugin.serializeDocument(document);
             }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
index ca0c3f641..2c009db99 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
@@ -11,7 +11,7 @@
 package org.eclipse.debug.internal.ui.views.breakpoints;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.RGB;
@@ -60,7 +60,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
             }
             return container.getOrganizer().getLabel();
         }
-        return IInternalDebugUIConstants.EMPTY_STRING;
+        return IInternalDebugCoreConstants.EMPTY_STRING;
     }
 
     /* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
index 95a5f8468..1eeadca32 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
@@ -27,6 +27,7 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IBreakpointManager;
 import org.eclipse.debug.core.IBreakpointsListener;
 import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.importexport.breakpoints.IImportExportConstants;
@@ -308,7 +309,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 	 *            default working set or <code>null</code>
 	 */
 	public static void setDefaultWorkingSet(IWorkingSet set) {
-		String name = IInternalDebugUIConstants.EMPTY_STRING;
+		String name = IInternalDebugCoreConstants.EMPTY_STRING;
 		if (set != null) {
 			// only consider breakpoint working sets
 			if (IInternalDebugUIConstants.ID_BREAKPOINT_WORKINGSET.equals(set.getId())) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java
index 03ea24066..aa8f8a789 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetPage.java
@@ -16,9 +16,9 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.internal.ui.importexport.breakpoints.EmbeddedBreakpointsViewer;
 import org.eclipse.debug.internal.ui.views.DebugUIViewsMessages;
@@ -186,7 +186,7 @@ public class BreakpointWorkingSetPage extends WizardPage implements IWorkingSetP
 
 		if (newText.equals(newText.trim()) == false)
 			errorMessage = DebugUIViewsMessages.BreakpointWorkingSetPage_4; 
-		if (newText.equals(IInternalDebugUIConstants.EMPTY_STRING)) {
+		if (newText.equals(IInternalDebugCoreConstants.EMPTY_STRING)) {
 			if (fFirstCheck) {
 				setPageComplete(false);
 				fFirstCheck= false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
index dc8aec16f..96f5741ef 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
@@ -15,8 +15,8 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.ILineBreakpoint;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.jface.viewers.IBasicPropertyConstants;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.StructuredViewer;
@@ -64,8 +64,8 @@ public class BreakpointsComparator extends ViewerComparator {
 			if (result != 0) {
 				return result;
 			}
-			String type1= IInternalDebugUIConstants.EMPTY_STRING;
-			String type2= IInternalDebugUIConstants.EMPTY_STRING;
+			String type1= IInternalDebugCoreConstants.EMPTY_STRING;
+			String type2= IInternalDebugCoreConstants.EMPTY_STRING;
 			IMarker marker1= b1.getMarker();
 			if (!marker1.exists()) {
 				return 0;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
index d707450f2..01ca968d6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
@@ -45,10 +45,10 @@ import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IStreamMonitor;
 import org.eclipse.debug.core.model.IStreamsProxy;
 import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugUIConstants;
@@ -116,7 +116,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe
      * @param encoding the desired encoding for this console
      */
     public ProcessConsole(IProcess process, IConsoleColorProvider colorProvider, String encoding) {
-        super(IInternalDebugUIConstants.EMPTY_STRING, IDebugUIConstants.ID_PROCESS_CONSOLE_TYPE, null, encoding, true);
+        super(IInternalDebugCoreConstants.EMPTY_STRING, IDebugUIConstants.ID_PROCESS_CONSOLE_TYPE, null, encoding, true);
         fProcess = process;
 
         ILaunchConfiguration configuration = process.getLaunch().getLaunchConfiguration();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
index 01357ae11..a73902a7f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
@@ -32,6 +32,7 @@ import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
 import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
 import org.eclipse.debug.core.model.ITerminate;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
@@ -153,7 +154,7 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 			
 			if (input.length() == 0)
 			{
-				expressions.add(IInternalDebugUIConstants.EMPTY_STRING);
+				expressions.add(IInternalDebugCoreConstants.EMPTY_STRING);
 			}
 			else
 			{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
index 865bf3b5b..3eef011ab 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
@@ -23,9 +23,9 @@ import org.eclipse.debug.core.IMemoryBlockListener;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.debug.ui.memory.IMemoryRendering;
@@ -463,7 +463,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		String[] labels = new String[memoryBlocks.length];
 		for (int i=0; i<memoryBlocks.length; i++)
 		{	
-			String text = IInternalDebugUIConstants.EMPTY_STRING;
+			String text = IInternalDebugCoreConstants.EMPTY_STRING;
 			if (memoryBlocks[i] instanceof IMemoryBlockExtension)
 			{
 				try {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
index a1045ae40..ae3d3beaa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
@@ -24,8 +24,8 @@ import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -150,7 +150,7 @@ public class MemoryViewUtil {
 
 			public IStatus runInUIThread(IProgressMonitor monitor) {
 //				 open error for the exception
-				String detail = IInternalDebugUIConstants.EMPTY_STRING;
+				String detail = IInternalDebugCoreConstants.EMPTY_STRING;
 				if (e != null)
 					detail = e.getMessage();
 				
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
index 3fdc9ea13..474a6ea74 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
@@ -14,8 +14,8 @@ package org.eclipse.debug.internal.ui.views.memory;
 
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
 import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -138,7 +138,7 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen
 			String lengthText = lengthInput.getText();
 			String input = expressionInput.getText();
 			
-			if (input == null || input.equals(IInternalDebugUIConstants.EMPTY_STRING) || lengthText == null || lengthText.equals(IInternalDebugUIConstants.EMPTY_STRING))
+			if (input == null || input.equals(IInternalDebugCoreConstants.EMPTY_STRING) || lengthText == null || lengthText.equals(IInternalDebugCoreConstants.EMPTY_STRING))
 			{
 				getButton(IDialogConstants.OK_ID).setEnabled(false);	
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
index 8b9d2b6fe..e19bf5aeb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
@@ -25,8 +25,8 @@ import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.contexts.DebugContextEvent;
 import org.eclipse.debug.ui.contexts.IDebugContextListener;
@@ -180,8 +180,8 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 		}
 		
 		private void getLabels(final IMemoryBlock memBlk) {
-			StringBuffer text = new StringBuffer(IInternalDebugUIConstants.EMPTY_STRING);
-			String label = new String(IInternalDebugUIConstants.EMPTY_STRING);
+			StringBuffer text = new StringBuffer(IInternalDebugCoreConstants.EMPTY_STRING);
+			String label = new String(IInternalDebugCoreConstants.EMPTY_STRING);
 			if (memBlk instanceof IMemoryBlockExtension) {
 				String expression = ((IMemoryBlockExtension)memBlk).getExpression();
 				if (expression == null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java
index 59040ea9e..5c7f26f37 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.views.memory;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
@@ -25,7 +26,7 @@ class ViewPaneOrientationAction extends Action
 
 		ViewPaneOrientationAction(MemoryView view, int orientation)
 		{
-			super(IInternalDebugUIConstants.EMPTY_STRING, AS_RADIO_BUTTON);
+			super(IInternalDebugCoreConstants.EMPTY_STRING, AS_RADIO_BUTTON);
 			fView = view;
 			fOrientation = orientation;
 			
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java
index 8956d0dd3..a8c040c29 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java
@@ -23,9 +23,9 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IDebugEventSetListener;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlock;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.core.LaunchManager;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.memory.IMemoryRendering;
 import org.eclipse.debug.ui.memory.IMemoryRenderingContainer;
@@ -244,7 +244,7 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener{
 	private void storeRenderings()
 	{
 		Preferences prefs = DebugUIPlugin.getDefault().getPluginPreferences();
-		String renderingsStr= IInternalDebugUIConstants.EMPTY_STRING;
+		String renderingsStr= IInternalDebugCoreConstants.EMPTY_STRING;
 		try {
 			renderingsStr= getRenderingsAsXML();
 		} catch (IOException e) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
index 7c1b8cba5..b3954f722 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
@@ -16,6 +16,7 @@ import java.math.BigInteger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -886,7 +887,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer {
 					TableItem item = getTable().getItem(idx);
 					return item.getText(columnIndex);
 				}
-				return IInternalDebugUIConstants.EMPTY_STRING;
+				return IInternalDebugCoreConstants.EMPTY_STRING;
 			}
 
 			public void addListener(ILabelProviderListener listener) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
index 57d20298f..43ad789a6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
@@ -15,6 +15,7 @@ package org.eclipse.debug.internal.ui.views.memory.renderings;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -175,7 +176,7 @@ public class CopyTableRenderingToClipboardAction extends Action
 			TableItem[] tableItems = table.getItems();
 			String tableAsString = new String();
 			tableAsString = concatenateTableAsString(tableItems);
-			if (!tableAsString.equals(IInternalDebugUIConstants.EMPTY_STRING)) {
+			if (!tableAsString.equals(IInternalDebugCoreConstants.EMPTY_STRING)) {
 				TextTransfer plainTextTransfer = TextTransfer.getInstance();
 				clip.setContents(new Object[] {tableAsString}, new Transfer[] {plainTextTransfer});
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
index 6198bfb6a..ccf8baefc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
@@ -13,8 +13,8 @@ package org.eclipse.debug.internal.ui.views.memory.renderings;
 
 import java.util.Vector;
 
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TrayDialog;
@@ -123,7 +123,7 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener{
 
 		String input = expressionInput.getText();
 	
-		if (input == null || input.equals(IInternalDebugUIConstants.EMPTY_STRING))
+		if (input == null || input.equals(IInternalDebugCoreConstants.EMPTY_STRING))
 		{
 			getButton(IDialogConstants.OK_ID).setEnabled(false);	
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
index 8ef675d21..68b16ba0d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
@@ -15,7 +15,7 @@ import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IIndexedValue;
 import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 
 /**
  * A parition (subrange) of values of an indexed value 
@@ -69,7 +69,7 @@ public class IndexedValuePartition implements IIndexedValue {
 	 * @see org.eclipse.debug.core.model.IValue#getValueString()
 	 */
 	public String getValueString() {
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java
index 8984c1d5f..037ded8a7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java
@@ -20,7 +20,7 @@ import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IIndexedValue;
 import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.ui.IDebugUIConstants;
 
 /**
@@ -93,7 +93,7 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl
 			IVariable variable = (IVariable) fOriginalVariable;
 			return variable.getReferenceTypeName();
 		}
-		return IInternalDebugUIConstants.EMPTY_STRING;
+		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java
index 86dd6a37e..fb1b50618 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/StatusLineContributionItem.java
@@ -17,7 +17,7 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
 
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.IContributionManager;
 import org.eclipse.jface.action.StatusLineLayoutData;
@@ -34,7 +34,7 @@ public class StatusLineContributionItem extends ContributionItem {
 	 * initialized.
 	 */
 	private Composite statusLine = null;
-	private String text= IInternalDebugUIConstants.EMPTY_STRING;
+	private String text= IInternalDebugCoreConstants.EMPTY_STRING;
 	private int widthHint = -1;
 
 	public StatusLineContributionItem(String id) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
index 28753b96f..18690c3b2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
@@ -26,6 +26,7 @@ import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IExpression;
 import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
@@ -195,7 +196,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
 				}
 				// When selecting a index partition, clear the pane
 				if (val instanceof IndexedValuePartition) {
-					detailComputed(null, IInternalDebugUIConstants.EMPTY_STRING);
+					detailComputed(null, IInternalDebugCoreConstants.EMPTY_STRING);
 					val = null;
 				}
 				if (element instanceof String) {
@@ -220,7 +221,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
 			// or use the message, if the variable was a java.lang.String
 			if (!fComputed){
 				if (message == null) {
-					detailComputed(null,IInternalDebugUIConstants.EMPTY_STRING);
+					detailComputed(null,IInternalDebugCoreConstants.EMPTY_STRING);
 				} else {
 					detailComputed(null, message);
 				}
@@ -439,7 +440,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
        
 		TextViewerAction textAction= new TextViewerAction(fSourceViewer, ISourceViewer.CONTENTASSIST_PROPOSALS);
 		textAction.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-		textAction.configureAction(DetailMessages.DefaultDetailPane_Co_ntent_Assist_3, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); 
+		textAction.configureAction(DetailMessages.DefaultDetailPane_Co_ntent_Assist_3, IInternalDebugCoreConstants.EMPTY_STRING,IInternalDebugCoreConstants.EMPTY_STRING); 
 		textAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_ELCL_CONTENT_ASSIST));
 		textAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CONTENT_ASSIST));
 		textAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_DLCL_CONTENT_ASSIST));
@@ -451,25 +452,25 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
         handlerService.activateHandler(textAction.getActionDefinitionId(), actionHandler);
 			
 		textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.SELECT_ALL);
-		textAction.configureAction(DetailMessages.DefaultDetailPane_Select__All_5, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); 
+		textAction.configureAction(DetailMessages.DefaultDetailPane_Select__All_5, IInternalDebugCoreConstants.EMPTY_STRING,IInternalDebugCoreConstants.EMPTY_STRING); 
 		textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.SELECT_ALL);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_SELECT_ALL_ACTION);
 		setAction(DETAIL_SELECT_ALL_ACTION, textAction);
 		
 		textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.COPY);
-		textAction.configureAction(DetailMessages.DefaultDetailPane__Copy_8, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); 
+		textAction.configureAction(DetailMessages.DefaultDetailPane__Copy_8, IInternalDebugCoreConstants.EMPTY_STRING,IInternalDebugCoreConstants.EMPTY_STRING); 
 		textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_COPY_ACTION);
 		setAction(DETAIL_COPY_ACTION, textAction);
 		
 		textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.CUT);
-		textAction.configureAction(DetailMessages.DefaultDetailPane_Cu_t_11, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); 
+		textAction.configureAction(DetailMessages.DefaultDetailPane_Cu_t_11, IInternalDebugCoreConstants.EMPTY_STRING,IInternalDebugCoreConstants.EMPTY_STRING); 
 		textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.CUT);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_CUT_ACTION);
 		setAction(DETAIL_CUT_ACTION, textAction);
 		
 		textAction= new TextViewerAction(fSourceViewer, ITextOperationTarget.PASTE);
-		textAction.configureAction(DetailMessages.DefaultDetailPane__Paste_14, IInternalDebugUIConstants.EMPTY_STRING,IInternalDebugUIConstants.EMPTY_STRING); 
+		textAction.configureAction(DetailMessages.DefaultDetailPane__Paste_14, IInternalDebugCoreConstants.EMPTY_STRING,IInternalDebugCoreConstants.EMPTY_STRING); 
 		textAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.PASTE);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(textAction, IDebugHelpContextIds.DETAIL_PANE_PASTE_ACTION);
 		setAction(ActionFactory.PASTE.getId(), textAction);
@@ -675,7 +676,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
 			fDetailJob.cancel();
 		}
 		fLastDisplayed = null;
-		fDetailDocument.set(IInternalDebugUIConstants.EMPTY_STRING);
+		fDetailDocument.set(IInternalDebugCoreConstants.EMPTY_STRING);
 		fSourceViewer.setEditable(false);
 	}
 
@@ -718,7 +719,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
 	protected String getCursorPosition() {
 		
 		if (fSourceViewer == null) {
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 		
 		StyledText styledText= fSourceViewer.getTextWidget();
@@ -726,7 +727,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
 		IDocument document= fSourceViewer.getDocument();
 	
 		if (document == null) {
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 	
 		try {
@@ -748,7 +749,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IAdaptable,
 			return MessageFormat.format(fPositionLabelPattern, fPositionLabelPatternArguments);
 			
 		} catch (BadLocationException x) {
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
index 0738767fd..fb8b0c74b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/CommonTab.java
@@ -30,6 +30,7 @@ import org.eclipse.core.variables.VariablesPlugin;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IDebugHelpContextIds;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -358,7 +359,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
     private void createEncodingComponent(Composite parent) {
 	    Group group = SWTFactory.createGroup(parent, LaunchConfigurationsMessages.CommonTab_1, 2, 1, GridData.FILL_BOTH);
 	
-	    fDefaultEncodingButton = createRadioButton(group, IInternalDebugUIConstants.EMPTY_STRING); 
+	    fDefaultEncodingButton = createRadioButton(group, IInternalDebugCoreConstants.EMPTY_STRING); 
 	    GridData gd = new GridData(SWT.BEGINNING, SWT.NORMAL, true, false);
 	    gd.horizontalSpan = 2;
 	    fDefaultEncodingButton.setLayoutData(gd);
@@ -436,7 +437,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
 	}
 	
 	private String getDefaultSharedConfigLocation(ILaunchConfiguration config) {
-		String path = IInternalDebugUIConstants.EMPTY_STRING;
+		String path = IInternalDebugCoreConstants.EMPTY_STRING;
 		try {
 			IResource[] res = config.getMappedResources();
 			if(res != null) {
@@ -501,7 +502,7 @@ public class CommonTab extends AbstractLaunchConfigurationTab {
 		setSharedEnabled(isShared);
 		fSharedLocationText.setText(getDefaultSharedConfigLocation(configuration));
 		if(isShared) {
-			String containerName = IInternalDebugUIConstants.EMPTY_STRING;
+			String containerName = IInternalDebugCoreConstants.EMPTY_STRING;
 			IFile file = configuration.getFile();
 			if (file != null) {
 				IContainer parent = file.getParent();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchShortcut.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchShortcut.java
index 978e10c26..64db0a27a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchShortcut.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/ILaunchShortcut.java
@@ -29,6 +29,8 @@ import org.eclipse.ui.IEditorPart;
  * <p>
  * A launch shortcut extension is defined in <code>plugin.xml</code>.
  * Following is an example definition of a launch shortcut extension.
+ * </p>
+ * <br>
  * <pre>
  * &lt;extension point="org.eclipse.debug.ui.launchShortcuts"&gt;
  *   &lt;launchShortcut
@@ -57,6 +59,8 @@ import org.eclipse.ui.IEditorPart;
  *   &lt;/launchShortcut&gt;
  * &lt;/extension&gt;
  * </pre>
+ * <br>
+ * <p>
  * The attributes are specified as follows:
  * <ul>
  * <li><code>id</code> specifies a unique identifier for this launch shortcut.</li>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java
index 7c70b91db..4239d7209 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/StringVariableSelectionDialog.java
@@ -13,8 +13,8 @@ package org.eclipse.debug.ui;
 import org.eclipse.core.variables.IDynamicVariable;
 import org.eclipse.core.variables.IStringVariable;
 import org.eclipse.core.variables.VariablesPlugin;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.SWTFactory;
 import org.eclipse.debug.internal.ui.preferences.StringVariablePreferencePage;
 import org.eclipse.debug.internal.ui.stringsubstitution.IArgumentSelector;
@@ -250,7 +250,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog {
 			 text = variable.getDescription();
 		}
 		if (text == null) {
-			text = IInternalDebugUIConstants.EMPTY_STRING;
+			text = IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 		fArgumentText.setEnabled(argEnabled);
 		fArgumentButton.setEnabled(buttonEnabled);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
index 31af359c5..9c2e84d68 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
@@ -15,8 +15,8 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.ILaunchHistoryChangedListener;
 import org.eclipse.debug.internal.ui.ILaunchLabelChangedListener;
 import org.eclipse.debug.internal.ui.actions.ActionMessages;
@@ -222,7 +222,7 @@ public abstract class AbstractLaunchHistoryAction implements IWorkbenchWindowPul
 		} else {
 			label = ActionMessages.AbstractLaunchHistoryAction_4; 
 		}
-		if(IInternalDebugUIConstants.EMPTY_STRING.equals(launchName)) {
+		if(IInternalDebugCoreConstants.EMPTY_STRING.equals(launchName)) {
 			return MessageFormat.format(ActionMessages.AbstractLaunchHistoryAction_5, new String[] {label});
 		}
 		else {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java
index b93dcbb46..6aeb6d21f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ImportBreakpointsOperation.java
@@ -31,6 +31,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.internal.core.BreakpointManager;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.internal.ui.importexport.breakpoints.IImportExportConstants;
 import org.eclipse.debug.internal.ui.importexport.breakpoints.ImportExportMessages;
@@ -153,7 +154,7 @@ public class ImportBreakpointsOperation implements IRunnableWithProgress {
 		marker.setAttribute(IImportExportConstants.IE_NODE_TYPE, child.getString(IImportExportConstants.IE_NODE_TYPE));
 		marker.setAttribute(IImportExportConstants.CHARSTART, child.getString(IImportExportConstants.CHARSTART));
 		childnodes = child.getChildren(IImportExportConstants.IE_NODE_ATTRIB);
-		String workingsets = IInternalDebugUIConstants.EMPTY_STRING;
+		String workingsets = IInternalDebugCoreConstants.EMPTY_STRING;
 		for (int j = 0; j < childnodes.length; j++) {
 			// get the attribute and try to convert it to either Integer, Boolean or leave it alone (String)
 			String name = childnodes[j].getString(IImportExportConstants.IE_NODE_NAME), 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
index 202797069..ef1eca8ea 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.views.memory.PropertyChangeNotifier;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.jface.action.IMenuListener;
@@ -245,16 +245,16 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 	public  String getLabel()
 	{
 		if (fMemoryBlock == null)
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		
-		StringBuffer label = new StringBuffer(IInternalDebugUIConstants.EMPTY_STRING);
+		StringBuffer label = new StringBuffer(IInternalDebugCoreConstants.EMPTY_STRING);
 		
 		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
 			String expression = ((IMemoryBlockExtension)fMemoryBlock).getExpression();
 			
 			if (expression == null)
-				expression = IInternalDebugUIConstants.EMPTY_STRING;
+				expression = IInternalDebugCoreConstants.EMPTY_STRING;
 			
 			label.append(expression);
 			
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java
index 814e388c9..fcaea68a4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java
@@ -20,6 +20,7 @@ import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.MemoryByte;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -1988,7 +1989,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 	}
 
 	private String buildLabel(boolean showAddress) {
-		String label = IInternalDebugUIConstants.EMPTY_STRING;
+		String label = IInternalDebugCoreConstants.EMPTY_STRING;
 		if (getMemoryBlock() instanceof IMemoryBlockExtension)
 		{
 			label = ((IMemoryBlockExtension)getMemoryBlock()).getExpression();
@@ -3190,7 +3191,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 	public String getSelectedAsString() {
 
 		if (isAddressOutOfRange(fSelectedAddress))
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		
 		int col = fTableCursor.getColumn();
 		TableItem rowItem = fTableCursor.getRow();
@@ -3204,7 +3205,7 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		// check precondition
 		if (col > getBytesPerLine()/getBytesPerColumn())
 		{
-			return IInternalDebugUIConstants.EMPTY_STRING;
+			return IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 				
 		TableItem tableItem = getTableViewer().getTable().getItem(row);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java
index 9841dc961..97c7fbb70 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java
@@ -14,8 +14,8 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 
 import org.eclipse.debug.core.model.MemoryByte;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
 import org.eclipse.debug.ui.IDebugUIConstants;
 
 /**
@@ -88,7 +88,7 @@ abstract public class AbstractTextRendering extends AbstractTableRendering {
 		try {
 			String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR);
 			if(fCodePage == null)
-				return IInternalDebugUIConstants.EMPTY_STRING;
+				return IInternalDebugCoreConstants.EMPTY_STRING;
 			
 			boolean[] invalid = new boolean[data.length];
 			boolean hasInvalid = false;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java
index ba1da82fe..1dc8eed64 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java
@@ -13,7 +13,7 @@ package org.eclipse.debug.ui.sourcelookup;
 import com.ibm.icu.text.MessageFormat;
 
 import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
+import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIMessages;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugModelPresentation;
@@ -54,7 +54,7 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I
 			pres.dispose();
 		}
 		if (fLabel == null) {
-			fLabel = IInternalDebugUIConstants.EMPTY_STRING;
+			fLabel = IInternalDebugCoreConstants.EMPTY_STRING;
 		}
 	}