Bug 6088

11 files changed, 7 insertions, 138 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
index 907c79da1..21f161c57 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java
@@ -82,7 +82,6 @@ public class DebugPluginImages {
 		declareRegistryImage(IDebugUIConstants.IMG_LCL_STEPRETURN, LOCALTOOL + "stepreturn_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_CLEAR, LOCALTOOL + "clear_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE_TERMINATED, LOCALTOOL + "rem_all_co.gif"); //$NON-NLS-1$

-		declareRegistryImage(IDebugUIConstants.IMG_LCL_QUALIFIED_NAMES, LOCALTOOL + "qnames_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_TYPE_NAMES, LOCALTOOL + "tnames_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE, LOCALTOOL + "rem_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE_ALL, LOCALTOOL + "rem_all_co.gif"); //$NON-NLS-1$

@@ -102,7 +101,6 @@ public class DebugPluginImages {
 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEPRETURN, DLCL + "stepreturn_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_CLEAR, DLCL + "clear_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE_TERMINATED, DLCL + "rem_all_co.gif"); //$NON-NLS-1$

-		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_QUALIFIED_NAMES, DLCL + "qnames_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES, DLCL + "tnames_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE, DLCL + "rem_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL, DLCL + "rem_all_co.gif"); //$NON-NLS-1$

@@ -122,7 +120,6 @@ public class DebugPluginImages {
 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEPRETURN, ELCL + "stepreturn_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_CLEAR, ELCL + "clear_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE_TERMINATED, ELCL + "rem_all_co.gif"); //$NON-NLS-1$

-		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_QUALIFIED_NAMES, ELCL + "qnames_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TYPE_NAMES, ELCL + "tnames_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE, ELCL + "rem_co.gif"); //$NON-NLS-1$

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL, ELCL + "rem_all_co.gif"); //$NON-NLS-1$

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
index 0ded1d881..12f42a17d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
@@ -424,13 +424,7 @@ public class DelegatingModelPresentation implements IDebugModelPresentation {
 		show= show == null ? new Boolean(false) : show;

 		return show.booleanValue();

 	}

-	

-	protected boolean showQualifiedNames() {

-		Boolean show= (Boolean) fAttributes.get(DISPLAY_QUALIFIED_NAMES);

-		show= show == null ? new Boolean(false) : show;

-		return show.booleanValue();

-	}

-	

+		

 	protected HashMap getAttributes() {

 		return fAttributes;

 	}

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 411051040..9df16a93d 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
@@ -29,7 +29,6 @@ public interface IInternalDebugUIConstants {
 	public static final String IMG_DLCL_STEPRETURN= "IMG_DLCL_STEPRETURN"; //$NON-NLS-1$

 	public static final String IMG_DLCL_CLEAR= "IMG_DLCL_CLEAR"; //$NON-NLS-1$

 	public static final String IMG_DLCL_REMOVE_TERMINATED= "IMG_DLCL_REMOVE_TERMINATED"; //$NON-NLS-1$

-	public static final String IMG_DLCL_QUALIFIED_NAMES= "IMG_DLCL_QUALIFIED_NAMES"; //$NON-NLS-1$

 	public static final String IMG_DLCL_TYPE_NAMES= "IMG_DLCL_TYPE_NAMES"; //$NON-NLS-1$

 	public static final String IMG_DLCL_REMOVE= "IMG_DLCL_REMOVE"; //$NON-NLS-1$

 	public static final String IMG_DLCL_REMOVE_ALL= "IMG_DLCL_REMOVE_ALL"; //$NON-NLS-1$

@@ -49,7 +48,6 @@ public interface IInternalDebugUIConstants {
 	public static final String IMG_ELCL_STEPRETURN= "IMG_ELCL_STEPRETURN"; //$NON-NLS-1$

 	public static final String IMG_ELCL_CLEAR= "IMG_ELCL_CLEAR"; //$NON-NLS-1$

 	public static final String IMG_ELCL_REMOVE_TERMINATED= "IMG_ELCL_REMOVE_TERMINATED"; //$NON-NLS-1$

-	public static final String IMG_ELCL_QUALIFIED_NAMES= "IMG_ELCL_QUALIFIED_NAMES"; //$NON-NLS-1$

 	public static final String IMG_ELCL_TYPE_NAMES= "IMG_ELCL_TYPE_NAMES"; //$NON-NLS-1$

 	public static final String IMG_ELCL_REMOVE= "IMG_ELCL_REMOVE"; //$NON-NLS-1$

 	public static final String IMG_ELCL_REMOVE_ALL= "IMG_ELCL_REMOVE_ALL"; //$NON-NLS-1$

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
index 3373576b8..b048e41dc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties
@@ -108,8 +108,6 @@ TerminateAndRemoveActionDelegate.Exceptions_occurred_attempting_to_terminate_and
 TerminateAndRemoveActionDelegate.Ter&minate_and_Remove_4=Ter&minate and Remove

 TerminateAndRemoveActionDelegate.Terminate_and_Remove;_3=Terminate and Remove;

 TerminateAndRemoveActionDelegate.Terminate_and_remove_failed_1=Terminate and remove failed

-ShowQualifiedAction.Hide_&Qualified_Names_3=Hide &Qualified Names

-ShowQualifiedAction.Show_&Qualified_Names_1=Show &Qualified Names

 ShowTypesAction.Hide_&Type_Names_3=Hide &Type Names

 ShowTypesAction.Show_&Type_Names_1=Show &Type Names

 ShowVariableDetailPaneAction.Hide_detail_pane_3=Hide Detail Pane

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowQualifiedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowQualifiedAction.java
deleted file mode 100644
index 3d3b153aa..000000000
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ShowQualifiedAction.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.debug.internal.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-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.IDebugModelPresentation;

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.ui.help.WorkbenchHelp;

-

-/**

- * An action that toggles the state of its viewer to

- * show/hide qualified names.

- */

-public class ShowQualifiedAction extends Action {

-

-	private StructuredViewer fViewer;

-

-	public ShowQualifiedAction(StructuredViewer viewer) {

-		super(ActionMessages.getString("ShowQualifiedAction.Show_&Qualified_Names_1")); //$NON-NLS-1$

-		setViewer(viewer);

-		setToolTipText(ActionMessages.getString("ShowQualifiedAction.Show_&Qualified_Names_1")); //$NON-NLS-1$

-		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_QUALIFIED_NAMES));

-		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_QUALIFIED_NAMES));

-		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_QUALIFIED_NAMES));

-		setId(DebugUIPlugin.getDefault().getDescriptor().getUniqueIdentifier() + ".ShowQualifedAction"); //$NON-NLS-1$

-		WorkbenchHelp.setHelp(

-			this,

-			new Object[] { IDebugHelpContextIds.SHOW_QUALIFIED_NAMES_ACTION });

-	}

-

-	/**

-	 * @see Action#run()

-	 */

-	public void run() {

-		valueChanged(isChecked());

-	}

-

-	private void valueChanged(boolean on) {

-		if (getViewer().getControl().isDisposed()) {

-			return;

-		}		

-		ILabelProvider labelProvider= (ILabelProvider)getViewer().getLabelProvider();

-		if (labelProvider instanceof IDebugModelPresentation) {

-			IDebugModelPresentation debugLabelProvider= (IDebugModelPresentation)labelProvider;

-			debugLabelProvider.setAttribute(IDebugModelPresentation.DISPLAY_QUALIFIED_NAMES, (on ? Boolean.TRUE : Boolean.FALSE));

-			BusyIndicator.showWhile(getViewer().getControl().getDisplay(), new Runnable() {

-				public void run() {

-					getViewer().refresh();					

-				}

-			});

-		}

-		setToolTipText(on ? ActionMessages.getString("ShowQualifiedAction.Hide_&Qualified_Names_3") : ActionMessages.getString("ShowQualifiedAction.Show_&Qualified_Names_1")); //$NON-NLS-2$ //$NON-NLS-1$

-

-	}

-

-	/**

-	 * @see Action#setChecked(boolean)

-	 */

-	public void setChecked(boolean value) {

-		super.setChecked(value);

-		valueChanged(value);

-	}

-	

-	protected StructuredViewer getViewer() {

-		return fViewer;

-	}

-

-	protected void setViewer(StructuredViewer viewer) {

-		fViewer = viewer;

-	}

-}

-

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java
index c72750031..20fc11c99 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/BreakpointsView.java
@@ -21,7 +21,6 @@ import org.eclipse.debug.internal.ui.actions.OpenBreakpointMarkerAction;
 import org.eclipse.debug.internal.ui.actions.RemoveAllBreakpointsAction;

 import org.eclipse.debug.internal.ui.actions.RemoveBreakpointAction;

 import org.eclipse.debug.internal.ui.actions.ShowBreakpointsForModelAction;

-import org.eclipse.debug.internal.ui.actions.ShowQualifiedAction;

 import org.eclipse.debug.ui.AbstractDebugView;

 import org.eclipse.debug.ui.IDebugModelPresentation;

 import org.eclipse.debug.ui.IDebugUIConstants;

@@ -193,10 +192,6 @@ public class BreakpointsView extends AbstractDebugView {
 		action.setEnabled(DebugPlugin.getDefault().getBreakpointManager().getBreakpoints().length == 0 ? false : true);

 		setAction("RemoveAll", action); //$NON-NLS-1$

 		

-		action = new ShowQualifiedAction(getStructuredViewer());

-		action.setChecked(true);

-		setAction("ShowQualifiedNames", action); //$NON-NLS-1$

-		

 		action = new OpenBreakpointMarkerAction(getViewer());

 		setAction("GotoMarker", action); //$NON-NLS-1$

 		setAction(DOUBLE_CLICK_ACTION, action);

@@ -223,7 +218,6 @@ public class BreakpointsView extends AbstractDebugView {
 		menu.add(getAction("RemoveAll")); //$NON-NLS-1$

 		menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP));

 		menu.add(new Separator(IDebugUIConstants.RENDER_GROUP));

-		menu.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

 		menu.add(getAction("ShowBreakpointsForModel")); //$NON-NLS-1$

 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

 	}

@@ -262,7 +256,7 @@ public class BreakpointsView extends AbstractDebugView {
 		tbm.add(getAction(REMOVE_ACTION));

 		tbm.add(getAction("RemoveAll")); //$NON-NLS-1$

 		tbm.add(getAction("GotoMarker")); //$NON-NLS-1$

-		tbm.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

+		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 	}

 

 	/**

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java
index 41a6836fe..1c826d891 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ExpressionView.java
@@ -87,8 +87,8 @@ public class ExpressionView extends VariablesView {
 	 */

 	protected void configureToolBar(IToolBarManager tbm) {

 		tbm.add(new Separator(this.getClass().getName()));

+		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 		tbm.add(getAction("ShowTypeNames")); //$NON-NLS-1$

-		tbm.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

 		tbm.add(new Separator(IDebugUIConstants.EMPTY_EXPRESSION_GROUP));		

 		tbm.add(new Separator(IDebugUIConstants.EXPRESSION_GROUP));

 		tbm.add(getAction(REMOVE_ACTION));

@@ -114,7 +114,6 @@ public class ExpressionView extends VariablesView {
 		menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP));

 		menu.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 		menu.add(getAction("ShowTypeNames")); //$NON-NLS-1$

-		menu.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

 	}	

 }

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java
index 95c5cd6e3..a256fce5c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/LaunchView.java
@@ -26,7 +26,6 @@ import org.eclipse.debug.internal.ui.actions.ControlAction;
 import org.eclipse.debug.internal.ui.actions.CopyToClipboardActionDelegate;

 import org.eclipse.debug.internal.ui.actions.RelaunchActionDelegate;

 import org.eclipse.debug.internal.ui.actions.RemoveTerminatedAction;

-import org.eclipse.debug.internal.ui.actions.ShowQualifiedAction;

 import org.eclipse.debug.internal.ui.actions.TerminateAllAction;

 import org.eclipse.debug.internal.ui.actions.TerminateAndRemoveActionDelegate;

 import org.eclipse.debug.ui.IDebugModelPresentation;

@@ -115,11 +114,7 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 		setAction("TerminateAll", new TerminateAllAction()); //$NON-NLS-1$

 		setAction("Properties", new PropertyDialogAction(getSite().getWorkbenchWindow().getShell(), getSite().getSelectionProvider())); //$NON-NLS-1$

 		

-		setAction("CopyToClipboard", new ControlAction(viewer, new CopyToClipboardActionDelegate()));

- //$NON-NLS-1$

-		IAction qAction = new ShowQualifiedAction(viewer);

-		qAction.setChecked(false);

-		setAction("ShowQualifiedNames", qAction);	 //$NON-NLS-1$

+		setAction("CopyToClipboard", new ControlAction(viewer, new CopyToClipboardActionDelegate()));//$NON-NLS-1$

 				

 		// submit an async exec to update the selection once the

 		// view has been created - i.e. auto-expand and select the

@@ -212,7 +207,6 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 		tbm.add(getAction("RemoveAll"));

 		tbm.add(new Separator(IDebugUIConstants.STEP_GROUP));

 		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));

-		tbm.add(getAction("ShowQualifiedNames"));

 	}	

 

 	/**

@@ -527,7 +521,6 @@ public class LaunchView extends AbstractDebugEventHandlerView implements ISelect
 		menu.add(getAction("Relaunch")); //$NON-NLS-1$

 		menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP));

 		menu.add(new Separator(IDebugUIConstants.RENDER_GROUP));

-		menu.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

 		menu.add(new Separator(IDebugUIConstants.PROPERTY_GROUP));

 		PropertyDialogAction action = (PropertyDialogAction)getAction("Properties"); //$NON-NLS-1$

 		action.setEnabled(action.isApplicableForSelection());

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
index b6d7d017a..bfe7e9a4b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/VariablesView.java
@@ -27,7 +27,6 @@ import org.eclipse.debug.internal.ui.LazyModelPresentation;
 import org.eclipse.debug.internal.ui.actions.ChangeVariableValueAction;

 import org.eclipse.debug.internal.ui.actions.ControlAction;

 import org.eclipse.debug.internal.ui.actions.CopyVariablesToClipboardActionDelegate;

-import org.eclipse.debug.internal.ui.actions.ShowQualifiedAction;

 import org.eclipse.debug.internal.ui.actions.ShowTypesAction;

 import org.eclipse.debug.internal.ui.actions.ShowVariableDetailPaneAction;

 import org.eclipse.debug.internal.ui.actions.TextViewerAction;

@@ -380,11 +379,7 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 		IAction action = new ShowTypesAction(getStructuredViewer());

 		action.setChecked(false);

 		setAction("ShowTypeNames",action); //$NON-NLS-1$

-		

-		action = new ShowQualifiedAction(getStructuredViewer());

-		action.setChecked(false);

-		setAction("ShowQualifiedNames", action); //$NON-NLS-1$

-		

+				

 		action = new ChangeVariableValueAction(getViewer());

 		action.setEnabled(false);

 		setAction("ChangeVariableValue", action); //$NON-NLS-1$

@@ -424,8 +419,8 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 	 */

 	protected void configureToolBar(IToolBarManager tbm) {

 		tbm.add(new Separator(this.getClass().getName()));

+		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 		tbm.add(getAction("ShowTypeNames")); //$NON-NLS-1$

-		tbm.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

 		tbm.add(new Separator("TOGGLE_VIEW")); //$NON-NLS-1$

 		tbm.add(getAction("ShowDetailPane")); //$NON-NLS-1$

 	}

@@ -445,7 +440,6 @@ public class VariablesView extends AbstractDebugEventHandlerView implements ISel
 		menu.add(new Separator(IDebugUIConstants.EMPTY_RENDER_GROUP));

 		menu.add(new Separator(IDebugUIConstants.RENDER_GROUP));

 		menu.add(getAction("ShowTypeNames")); //$NON-NLS-1$

-		menu.add(getAction("ShowQualifiedNames")); //$NON-NLS-1$

 		

 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

 	}

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java
index 744c48847..3a817dff1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugModelPresentation.java
@@ -56,12 +56,8 @@ import org.eclipse.ui.IEditorInput;
  * <p>

  * To allow for an extensible configuration, this interface defines

  * a <code>setAttribute</code> method. The debug UI plug-in defines

- * two presentation attributes:

+ * one presentation attribute:

  * <ul>

- *  <li><code>DISPLAY_QUALIFIED_NAMES</code> - This is a boolean attribute 

- *     indicating whether elements should be rendered with fully qualified names.

- *     For example, a Java debug model presentation would include package names

- *     when this attribute is true.</li>

  *  <li><code>DISPLAY_VARIABLE_TYPE_NAMES</code> - This is a boolean attribute 

  *     indicating whether variable elements should be rendered with the declared

  *     type of a variable. For example, a Java debug model presentation would render

@@ -92,15 +88,6 @@ import org.eclipse.ui.IEditorInput;
  */

 

 public interface IDebugModelPresentation extends ILabelProvider {

-	/**

-	 * Qualified names presentation property (value <code>"org.eclipse.debug.ui.displayQualifiedNames"</code>).

-	 * When <code>DISPLAY_QUALIFIED_NAMES</code> is set to <code>True</code>,

-	 * this label provider should use fully qualified type names when rendering elements.

-	 * When set to <code>False</code>,this label provider should use simple names

-	 * when rendering elements.

-	 * @see #setAttribute(String, Object)

-	 */

-	public final static String DISPLAY_QUALIFIED_NAMES= IDebugUIConstants.PLUGIN_ID + ".displayQualifiedNames"; //$NON-NLS-1$

 	/** 

 	 * Variable type names presentation property (value <code>"org.eclipse.debug.ui.displayVariableTypeNames"</code>).

 	 * When <code>DISPLAY_VARIABLE_TYPE_NAMES</code> is set to <code>True</code>,

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
index e5622de41..0c34ce3ca 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/IDebugUIConstants.java
@@ -242,9 +242,6 @@ public interface IDebugUIConstants {
 	/** Remove all terminated action image identifier. */

 	public static final String IMG_LCL_REMOVE_TERMINATED= "IMG_LCL_REMOVE_TERMINATED"; //$NON-NLS-1$

 	

-	/** Display qualififed names action image identifier. */

-	public static final String IMG_LCL_QUALIFIED_NAMES= "IMG_LCL_QUALIFIED_NAMES"; //$NON-NLS-1$

-	

 	/** Display variable type names action image identifier. */

 	public static final String IMG_LCL_TYPE_NAMES= "IMG_LCL_TYPE_NAMES"; //$NON-NLS-1$