Set icons for actions in actions, not views

26 files changed, 186 insertions, 71 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointsView.java
index b1c64a9dd..a84d043f4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointsView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointsView.java
@@ -84,26 +84,15 @@ public class BreakpointsView extends AbstractDebugView implements IDoubleClickLi
 	 */

 	protected void initializeActions() {

 		fRemoveBreakpointAction= new RemoveBreakpointAction(fViewer);

-		fRemoveBreakpointAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE));

-		fRemoveBreakpointAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE));

-		fRemoveBreakpointAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE));

 		

 		fRemoveAllBreakpointsAction= new RemoveAllBreakpointsAction();

-		fRemoveAllBreakpointsAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL));

-		fRemoveAllBreakpointsAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL));

-		fRemoveAllBreakpointsAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL));

 		boolean enable= DebugPlugin.getDefault().getBreakpointManager().getBreakpoints().length == 0 ? false : true;

 		fRemoveAllBreakpointsAction.setEnabled(enable);

 		

 		fShowQualifiedNamesAction = new ShowQualifiedAction(fViewer);

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

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

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

 		fShowQualifiedNamesAction.setChecked(true);

 		

 		fOpenMarkerAction= new OpenBreakpointMarkerAction(fViewer);

-		ISharedImages images= DebugUIPlugin.getDefault().getWorkbench().getSharedImages();

-		fOpenMarkerAction.setImageDescriptor(images.getImageDescriptor(ISharedImages.IMG_OPEN_MARKER));

 

 		fEnableDisableBreakpointAction= new EnableDisableBreakpointAction(fViewer);

 		DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(fEnableDisableBreakpointAction);

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ClearOutputAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ClearOutputAction.java
index 109999f21..dcbb366c3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ClearOutputAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ClearOutputAction.java
@@ -5,7 +5,9 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import org.eclipse.jface.action.Action;
import org.eclipse.ui.help.WorkbenchHelp;

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

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

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

 

 /**

  * Clears the output of the selected launches

@@ -19,6 +21,9 @@ public class ClearOutputAction extends Action {
 		super(DebugUIUtils.getResourceString(PREFIX + TEXT));

 		fConsoleViewer= viewer;

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CLEAR));		

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_CLEAR));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_CLEAR));

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.CLEAR_CONSOLE_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ConsoleView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ConsoleView.java
index bf2369804..e3ad2ebe2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ConsoleView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ConsoleView.java
@@ -93,9 +93,6 @@ public class ConsoleView extends ViewPart implements IDocumentListener {
 	 */

 	private void initializeActions() {

 		fClearOutputAction= new ClearOutputAction(fConsoleViewer);

-		fClearOutputAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CLEAR));		

-		fClearOutputAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_CLEAR));

-		fClearOutputAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_CLEAR));

 		

 		ResourceBundle bundle= DebugUIUtils.getResourceBundle();

 		// In order for the clipboard actions to accessible via their shortcuts

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ControlActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ControlActionDelegate.java
index ef5ddc26e..dfb8c8884 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ControlActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ControlActionDelegate.java
@@ -29,6 +29,7 @@ public abstract class ControlActionDelegate implements IWorkbenchWindowActionDel
 	 * action specific initialization.

 	 */

 	public void initializeForOwner(ControlAction controlAction) {

+		setActionImages(controlAction);

 		LaunchesViewer provider= (LaunchesViewer)controlAction.getSelectionProvider();

 		IContentProvider contentProvider= provider.getContentProvider();

 		fMode= ILaunchManager.DEBUG_MODE;

@@ -160,4 +161,9 @@ public abstract class ControlActionDelegate implements IWorkbenchWindowActionDel
 	 */

 	protected abstract String getHelpContextId();

 	

+	/**

+	 * Set the enabled, disabled & hover icons for this action delegate

+	 */

+	protected abstract void setActionImages(IAction action);

+	

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CopyToClipboardActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CopyToClipboardActionDelegate.java
index 25c58c792..bcf50ddb9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CopyToClipboardActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/CopyToClipboardActionDelegate.java
@@ -6,8 +6,10 @@ package org.eclipse.debug.internal.ui;
  */

  

 import java.util.*;

+

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IDebugElement;

+import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.*;

 import org.eclipse.swt.custom.BusyIndicator;

 import org.eclipse.swt.dnd.*;

@@ -155,4 +157,10 @@ public class CopyToClipboardActionDelegate extends ControlActionDelegate {
 		return walkHierarchy(parent, elements);

 		

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+	}

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugView.java
index 5a6abe6d1..7d6ff34c0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugView.java
@@ -105,45 +105,27 @@ public class DebugView extends LaunchesView {
 

 		fResumeAction= new ControlAction(viewer, new ResumeActionDelegate());

 		viewer.addSelectionChangedListener(fResumeAction);

-		fResumeAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_RESUME));

-		fResumeAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESUME));

-		fResumeAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME));

 		fResumeAction.setEnabled(false);

 

 		fSuspendAction= new ControlAction(viewer, new SuspendActionDelegate());

 		viewer.addSelectionChangedListener(fSuspendAction);

-		fSuspendAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_SUSPEND));

-		fSuspendAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SUSPEND));

-		fSuspendAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND));

 		fSuspendAction.setEnabled(false);

 

 		fStepIntoAction= new ControlAction(viewer, new StepIntoActionDelegate());

 		viewer.addSelectionChangedListener(fStepIntoAction);

-		fStepIntoAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_STEPINTO));

-		fStepIntoAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEPINTO));

-		fStepIntoAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEPINTO));

 		fStepIntoAction.setEnabled(false);

 

 		fStepOverAction= new ControlAction(viewer, new StepOverActionDelegate());

 		viewer.addSelectionChangedListener(fStepOverAction);

-		fStepOverAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_STEPOVER));

-		fStepOverAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEPOVER));

-		fStepOverAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEPOVER));

 		fStepOverAction.setEnabled(false);

 

 		fStepReturnAction= new ControlAction(viewer, new StepReturnActionDelegate());

 		viewer.addSelectionChangedListener(fStepReturnAction);

-		fStepReturnAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_STEPRETURN));

-		fStepReturnAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEPRETURN));

-		fStepReturnAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEPRETURN));

 		fStepReturnAction.setEnabled(false);

 

 		fCopyToClipboardAction= new ControlAction(viewer, new CopyToClipboardActionDelegate());

 

 		fShowQualifiedAction= new ShowQualifiedAction(viewer);

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

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

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

 		fShowQualifiedAction.setChecked(false);

 	}

 

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DisconnectActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DisconnectActionDelegate.java
index ee926e8a9..4d81f90c3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DisconnectActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DisconnectActionDelegate.java
@@ -7,6 +7,8 @@ package org.eclipse.debug.internal.ui;
 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IDisconnect;

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

+import org.eclipse.jface.action.IAction;

 

 public class DisconnectActionDelegate extends ControlActionDelegate {

 	

@@ -37,4 +39,13 @@ public class DisconnectActionDelegate extends ControlActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.DISCONNECT_ACTION;

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DISCONNECT));

+	}	

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InspectorView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InspectorView.java
index d6ae53b3a..964479f7d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InspectorView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InspectorView.java
@@ -55,28 +55,16 @@ public class InspectorView extends AbstractDebugView {
 	 */

 	protected void initializeActions() {

 		fShowTypesAction= new ShowTypesAction(fViewer);

-		fShowTypesAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TYPE_NAMES));

-		fShowTypesAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES));

-		fShowTypesAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TYPE_NAMES));

 		fShowTypesAction.setChecked(false);

 		

 		fShowQualifiedAction= new ShowQualifiedAction(fViewer);

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

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

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

 		fShowQualifiedAction.setChecked(false);

 				

 		fAddToInspectorAction = new InspectorViewAddToInspectorAction(fViewer);

 

 		fRemoveFromInspectorAction= new RemoveFromInspectorAction(fViewer);

-		fRemoveFromInspectorAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE));

-		fRemoveFromInspectorAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE));

-		fRemoveFromInspectorAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE));

 

 		fRemoveAllFromInspectorAction= new RemoveAllFromInspectorAction(fViewer);

-		fRemoveAllFromInspectorAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL));

-		fRemoveAllFromInspectorAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL));

-		fRemoveAllFromInspectorAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL));

 		

 		fChangeVariableAction= new ChangeVariableValueAction(fViewer);

 		fChangeVariableAction.setEnabled(false);

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchesView.java
index 91b976d4b..ca553dcdd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LaunchesView.java
@@ -40,21 +40,12 @@ public class LaunchesView extends AbstractDebugView implements ISelectionChanged
 	protected void initializeActions(LaunchesViewer viewer) {

 

 		fTerminateAction= new ControlAction(viewer, new TerminateActionDelegate());

-		fTerminateAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TERMINATE));

-		fTerminateAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE));

-		fTerminateAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE));

 		fTerminateAction.setEnabled(false);

 

 		fDisconnectAction= new ControlAction(viewer, new DisconnectActionDelegate());

-		fDisconnectAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT));

-		fDisconnectAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT));

-		fDisconnectAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DISCONNECT));

 		fDisconnectAction.setEnabled(false);

 

 		fRemoveTerminatedAction= new RemoveTerminatedAction(this instanceof DebugView);

-		fRemoveTerminatedAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_TERMINATED));

-		fRemoveTerminatedAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_TERMINATED));

-		fRemoveTerminatedAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_TERMINATED));

 		fRemoveTerminatedAction.setEnabled(false);

 

 		fRelaunchAction= new ControlAction(viewer, new RelaunchActionDelegate());

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/OpenBreakpointMarkerAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/OpenBreakpointMarkerAction.java
index efc8a9da8..c5c0b957f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/OpenBreakpointMarkerAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/OpenBreakpointMarkerAction.java
@@ -5,7 +5,13 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import java.util.Iterator;

import org.eclipse.core.resources.IMarker;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.*;
import org.eclipse.ui.help.WorkbenchHelp;

+import java.util.Iterator;

+

+import org.eclipse.core.resources.IMarker;

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

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

+import org.eclipse.ui.*;

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

 

 public class OpenBreakpointMarkerAction extends OpenMarkerAction {

 

@@ -15,6 +21,8 @@ public class OpenBreakpointMarkerAction extends OpenMarkerAction {
 	public OpenBreakpointMarkerAction(ISelectionProvider selectionProvider) {

 		super(selectionProvider, DebugUIUtils.getResourceString(PREFIX + TEXT));

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		ISharedImages images= DebugUIPlugin.getDefault().getWorkbench().getSharedImages();

+		setImageDescriptor(images.getImageDescriptor(ISharedImages.IMG_OPEN_MARKER));

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.OPEN_BREAKPOINT_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchActionDelegate.java
index 23e101287..8bb5a1f32 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchActionDelegate.java
@@ -11,6 +11,7 @@ import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILauncher;

 import org.eclipse.debug.core.model.IDebugElement;

 import org.eclipse.debug.core.model.IProcess;

+import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.dialogs.MessageDialog;

 

 public class RelaunchActionDelegate extends ControlActionDelegate {

@@ -77,4 +78,10 @@ public class RelaunchActionDelegate extends ControlActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.RELAUNCH_ACTION;

 	}

+	

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {

+	}		

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllBreakpointsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllBreakpointsAction.java
index ac32eef29..b5eaebaae 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllBreakpointsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllBreakpointsAction.java
@@ -5,7 +5,12 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

  

-import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.debug.core.*;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.help.WorkbenchHelp;

+import org.eclipse.core.resources.*;

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

+import org.eclipse.debug.core.*;

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

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

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

 

 /**

  * Removes all breakpoints from the source (markers) and remove all

@@ -20,6 +25,9 @@ public class RemoveAllBreakpointsAction extends Action implements IBreakpointLis
 	public RemoveAllBreakpointsAction() {

 		super(DebugUIUtils.getResourceString(PREFIX + TEXT));

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL));

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL));

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.REMOVE_ALL_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllFromInspectorAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllFromInspectorAction.java
index 2f9d7e246..21ce03c34 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllFromInspectorAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveAllFromInspectorAction.java
@@ -5,7 +5,10 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.help.WorkbenchHelp;

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

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

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

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

 

 public class RemoveAllFromInspectorAction extends InspectorAction {

 	

@@ -14,6 +17,9 @@ public class RemoveAllFromInspectorAction extends InspectorAction {
 	public RemoveAllFromInspectorAction(ISelectionProvider provider) {

 		super(provider, DebugUIUtils.getResourceString(PREFIX + TEXT));

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL));

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL));

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.REMOVE_ALL_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveBreakpointAction.java
index 4d6324c59..409cc8c73 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveBreakpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveBreakpointAction.java
@@ -5,7 +5,16 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import java.util.Iterator;

import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.debug.core.*;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.actions.SelectionProviderAction;
import org.eclipse.ui.help.WorkbenchHelp;

+import java.util.Iterator;

+

+import org.eclipse.core.resources.*;

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

+import org.eclipse.debug.core.*;

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

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

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

+import org.eclipse.ui.actions.SelectionProviderAction;

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

 

 public class RemoveBreakpointAction extends SelectionProviderAction {

 

@@ -17,6 +26,9 @@ public class RemoveBreakpointAction extends SelectionProviderAction {
 		super(provider, DebugUIUtils.getResourceString(PREFIX + TEXT));

 		setEnabled(!getStructuredSelection().isEmpty());

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE));

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE));

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.REMOVE_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveFromInspectorAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveFromInspectorAction.java
index 2df17768b..068e53b11 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveFromInspectorAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveFromInspectorAction.java
@@ -5,7 +5,12 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import java.util.Iterator;

import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.help.WorkbenchHelp;

+import java.util.Iterator;

+

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

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

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

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

 

 public class RemoveFromInspectorAction extends InspectorAction {

 

@@ -14,6 +19,9 @@ public class RemoveFromInspectorAction extends InspectorAction {
 	public RemoveFromInspectorAction(ISelectionProvider provider) {

 		super(provider, DebugUIUtils.getResourceString(PREFIX + TEXT));

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE));

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE));

 		setEnabled(!getStructuredSelection().isEmpty());

 		WorkbenchHelp.setHelp(

 			this,

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveTerminatedAction.java
index 26e5895dd..1999954f9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveTerminatedAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RemoveTerminatedAction.java
@@ -5,7 +5,11 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import org.eclipse.debug.core.*;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.help.WorkbenchHelp;

+import org.eclipse.debug.core.*;

+import org.eclipse.debug.core.model.IProcess;

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

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

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

  

 /**

  * Removes all terminated/detached launches from the UI. 

@@ -19,6 +23,9 @@ public class RemoveTerminatedAction extends Action {
 	public RemoveTerminatedAction(boolean removeDebug) {

 		super(DebugUIUtils.getResourceString(PREFIX + TEXT));

 		setToolTipText(DebugUIUtils.getResourceString(PREFIX + TOOL_TIP_TEXT));

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_TERMINATED));

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_TERMINATED));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_TERMINATED));

 		fRemoveDebug= removeDebug;

 		setEnabled(false);

 		WorkbenchHelp.setHelp(

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResumeActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResumeActionDelegate.java
index a5acc4977..57323c7e9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResumeActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResumeActionDelegate.java
@@ -8,6 +8,8 @@ package org.eclipse.debug.internal.ui;
 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IDebugElement;

 import org.eclipse.debug.core.model.ISuspendResume;

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

+import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.IStructuredSelection;

 

 public class ResumeActionDelegate extends ControlActionDelegate {

@@ -55,4 +57,13 @@ public class ResumeActionDelegate extends ControlActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.RESUME_ACTION;

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {	

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_RESUME));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESUME));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME));

+	}	

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowQualifiedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowQualifiedAction.java
index e1ab39ab7..052cf4130 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowQualifiedAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowQualifiedAction.java
@@ -5,7 +5,13 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import org.eclipse.debug.ui.IDebugModelPresentation;
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;

+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

@@ -23,6 +29,9 @@ public class ShowQualifiedAction extends Action {
 		super(DebugUIUtils.getResourceString(SHOW));

 		fViewer= viewer;

 		setToolTipText(DebugUIUtils.getResourceString(SHOW));

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

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

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

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.SHOW_QUALIFIED_NAMES_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowTypesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowTypesAction.java
index 0cfec366f..fe5fbdcf6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowTypesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ShowTypesAction.java
@@ -5,7 +5,13 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import org.eclipse.debug.ui.IDebugModelPresentation;
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;

+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 a viewer to

@@ -25,6 +31,9 @@ public class ShowTypesAction extends Action {
 		super(DebugUIUtils.getResourceString(SHOW));

 		fViewer= viewer;

 		setToolTipText(SHOW);

+		setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TYPE_NAMES));

+		setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES));

+		setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TYPE_NAMES));

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.SHOW_TYPES_ACTION });

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepIntoActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepIntoActionDelegate.java
index 74b78bf3d..08fbfebc6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepIntoActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepIntoActionDelegate.java
@@ -7,6 +7,8 @@ package org.eclipse.debug.internal.ui;
 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IStep;

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

+import org.eclipse.jface.action.IAction;

 

 public class StepIntoActionDelegate extends StepActionDelegate {

 	

@@ -37,4 +39,12 @@ public class StepIntoActionDelegate extends StepActionDelegate {
 		return IDebugHelpContextIds.STEP_INTO_ACTION;

 	}

 

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_STEPINTO));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEPINTO));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEPINTO));

+	}

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepOverActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepOverActionDelegate.java
index cb3383d2e..d6bd4cb33 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepOverActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepOverActionDelegate.java
@@ -7,6 +7,8 @@ package org.eclipse.debug.internal.ui;
 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IStep;

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

+import org.eclipse.jface.action.IAction;

 

 public class StepOverActionDelegate extends StepActionDelegate {

 	

@@ -36,4 +38,13 @@ public class StepOverActionDelegate extends StepActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.STEP_OVER_ACTION;

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_STEPOVER));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEPOVER));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEPOVER));

+	}

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepReturnActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepReturnActionDelegate.java
index 5ae15edcf..1f665cd13 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepReturnActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/StepReturnActionDelegate.java
@@ -7,6 +7,8 @@ package org.eclipse.debug.internal.ui;
 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.IStep;

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

+import org.eclipse.jface.action.IAction;

 

 public class StepReturnActionDelegate extends StepActionDelegate {

 	

@@ -36,4 +38,13 @@ public class StepReturnActionDelegate extends StepActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.STEP_RETURN_ACTION;

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_STEPRETURN));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEPRETURN));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEPRETURN));

+	}

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SuspendActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SuspendActionDelegate.java
index 7180b0c46..24402182d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SuspendActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SuspendActionDelegate.java
@@ -7,6 +7,8 @@ package org.eclipse.debug.internal.ui;
 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.ISuspendResume;

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

+import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.IStructuredSelection;

 

 public class SuspendActionDelegate extends ControlActionDelegate {

@@ -50,4 +52,13 @@ public class SuspendActionDelegate extends ControlActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.SUSPEND_ACTION;

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_SUSPEND));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SUSPEND));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND));

+	}

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateActionDelegate.java
index 1bafe6d1c..5fc78a069 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateActionDelegate.java
@@ -7,6 +7,8 @@ package org.eclipse.debug.internal.ui;
 

 import org.eclipse.debug.core.DebugException;

 import org.eclipse.debug.core.model.ITerminate;

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

+import org.eclipse.jface.action.IAction;

 

 public class TerminateActionDelegate extends ControlActionDelegate {

 	

@@ -38,4 +40,13 @@ public class TerminateActionDelegate extends ControlActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.TERMINATE_ACTION;

 	}

+	

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {		

+		action.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TERMINATE));

+		action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE));

+		action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE));

+	}	

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAndRemoveActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAndRemoveActionDelegate.java
index c6bbe680b..4af52787d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAndRemoveActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAndRemoveActionDelegate.java
@@ -6,9 +6,8 @@ package org.eclipse.debug.internal.ui;
  */

 

 import org.eclipse.debug.core.*;

-import org.eclipse.debug.core.model.IDebugElement;

-import org.eclipse.debug.core.model.IProcess;

-import org.eclipse.debug.core.model.ITerminate;

+import org.eclipse.debug.core.model.*;

+import org.eclipse.jface.action.IAction;

 

 public class TerminateAndRemoveActionDelegate extends ControlActionDelegate {

 	

@@ -60,4 +59,10 @@ public class TerminateAndRemoveActionDelegate extends ControlActionDelegate {
 	protected String getHelpContextId() {

 		return IDebugHelpContextIds.TERMINATE_AND_REMOVE_ACTION;

 	}

+

+	/**

+	 * @see ControlActionDelegate

+	 */

+	protected void setActionImages(IAction action) {	

+	}	

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesView.java
index 3201742f0..a5952ff87 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/VariablesView.java
@@ -115,15 +115,9 @@ public class VariablesView extends AbstractDebugView implements ISelectionListen
 	 */

 	protected void initializeActions() {

 		fShowTypesAction= new ShowTypesAction(fViewer);

-		fShowTypesAction.setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TYPE_NAMES));

-		fShowTypesAction.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES));

-		fShowTypesAction.setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TYPE_NAMES));

 		fShowTypesAction.setChecked(false);

 		

 		fShowQualifiedAction= new ShowQualifiedAction(fViewer);

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

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

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

 		fShowQualifiedAction.setChecked(false);

 		

 		fAddToInspectorAction= new AddToInspectorAction(fViewer);