Bugzilla Bug 1518

26 files changed, 88 insertions, 9 deletions

diff --git a/org.eclipse.debug.ui/icons/basic/clcl16/relaunch_co.gif b/org.eclipse.debug.ui/icons/basic/clcl16/relaunch_co.gif
new file mode 100644
index 000000000..e8baf8723
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/clcl16/relaunch_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/clcl16/terminate_all_co.gif b/org.eclipse.debug.ui/icons/basic/clcl16/terminate_all_co.gif
new file mode 100644
index 000000000..ffabece5a
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/clcl16/terminate_all_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/clcl16/terminate_rem_co.gif b/org.eclipse.debug.ui/icons/basic/clcl16/terminate_rem_co.gif
new file mode 100644
index 000000000..20166295d
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/clcl16/terminate_rem_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/dlcl16/relaunch_co.gif b/org.eclipse.debug.ui/icons/basic/dlcl16/relaunch_co.gif
new file mode 100644
index 000000000..84bc083d0
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/dlcl16/relaunch_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/dlcl16/terminate_all_co.gif b/org.eclipse.debug.ui/icons/basic/dlcl16/terminate_all_co.gif
new file mode 100644
index 000000000..9d5dbc2bd
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/dlcl16/terminate_all_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/dlcl16/terminate_rem_co.gif b/org.eclipse.debug.ui/icons/basic/dlcl16/terminate_rem_co.gif
new file mode 100644
index 000000000..d9e17742a
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/dlcl16/terminate_rem_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/elcl16/relaunch_co.gif b/org.eclipse.debug.ui/icons/basic/elcl16/relaunch_co.gif
new file mode 100644
index 000000000..c8447f082
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/elcl16/relaunch_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/elcl16/terminate_all_co.gif b/org.eclipse.debug.ui/icons/basic/elcl16/terminate_all_co.gif
new file mode 100644
index 000000000..142e66306
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/elcl16/terminate_all_co.gif
diff --git a/org.eclipse.debug.ui/icons/basic/elcl16/terminate_rem_co.gif b/org.eclipse.debug.ui/icons/basic/elcl16/terminate_rem_co.gif
new file mode 100644
index 000000000..8a77383f7
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/basic/elcl16/terminate_rem_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/clcl16/relaunch_co.gif b/org.eclipse.debug.ui/icons/full/clcl16/relaunch_co.gif
new file mode 100644
index 000000000..6b0c23d8f
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/clcl16/relaunch_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/clcl16/terminate_all_co.gif b/org.eclipse.debug.ui/icons/full/clcl16/terminate_all_co.gif
new file mode 100644
index 000000000..ec56a24fa
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/clcl16/terminate_all_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/clcl16/terminate_rem_co.gif b/org.eclipse.debug.ui/icons/full/clcl16/terminate_rem_co.gif
new file mode 100644
index 000000000..bd53994fb
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/clcl16/terminate_rem_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/dlcl16/relaunch_co.gif b/org.eclipse.debug.ui/icons/full/dlcl16/relaunch_co.gif
new file mode 100644
index 000000000..d390fab9d
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/dlcl16/relaunch_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/dlcl16/terminate_all_co.gif b/org.eclipse.debug.ui/icons/full/dlcl16/terminate_all_co.gif
new file mode 100644
index 000000000..76202f06f
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/dlcl16/terminate_all_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/dlcl16/terminate_rem_co.gif b/org.eclipse.debug.ui/icons/full/dlcl16/terminate_rem_co.gif
new file mode 100644
index 000000000..0d7c77e56
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/dlcl16/terminate_rem_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/elcl16/relaunch_co.gif b/org.eclipse.debug.ui/icons/full/elcl16/relaunch_co.gif
new file mode 100644
index 000000000..7a95d09ac
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/elcl16/relaunch_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/elcl16/terminate_all_co.gif b/org.eclipse.debug.ui/icons/full/elcl16/terminate_all_co.gif
new file mode 100644
index 000000000..87a3d38c3
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/elcl16/terminate_all_co.gif
diff --git a/org.eclipse.debug.ui/icons/full/elcl16/terminate_rem_co.gif b/org.eclipse.debug.ui/icons/full/elcl16/terminate_rem_co.gif
new file mode 100644
index 000000000..5fa729cd9
--- /dev/null
+++ b/org.eclipse.debug.ui/icons/full/elcl16/terminate_rem_co.gif
diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
index 1f145d9db..c11a11e64 100644
--- a/org.eclipse.debug.ui/plugin.xml
+++ b/org.eclipse.debug.ui/plugin.xml
@@ -216,6 +216,7 @@
       </action>

       <action

             label="%RelaunchLastAction.label"

+            icon="icons/full/clcl16/relaunch_co.gif"

             helpContextId="relaunch_last_action_context"

             tooltip="%RelaunchLastAction.tooltip"

             class="org.eclipse.debug.internal.ui.RelaunchLastAction"

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 c7c2a0edb..788de9910 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
@@ -74,6 +74,8 @@ public class DebugPluginImages {
 		declareRegistryImage(IDebugUIConstants.IMG_LCL_RESUME, LOCALTOOL + "resume_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_SUSPEND, LOCALTOOL + "suspend_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_TERMINATE, LOCALTOOL + "terminate_co.gif");

+		declareRegistryImage(IDebugUIConstants.IMG_LCL_TERMINATE_ALL, LOCALTOOL + "terminate_all_co.gif");

+		declareRegistryImage(IDebugUIConstants.IMG_LCL_TERMINATE_AND_REMOVE, LOCALTOOL + "terminate_rem_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_DISCONNECT, LOCALTOOL + "disconnect_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_STEPINTO, LOCALTOOL + "stepinto_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_STEPOVER, LOCALTOOL + "stepover_co.gif");

@@ -85,11 +87,14 @@ public class DebugPluginImages {
 		declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE, LOCALTOOL + "rem_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE_ALL, LOCALTOOL + "rem_all_co.gif");

 		declareRegistryImage(IDebugUIConstants.IMG_LCL_INSPECT, LOCALTOOL + "inspect_co.gif");

+		declareRegistryImage(IDebugUIConstants.IMG_LCL_RELAUNCH, LOCALTOOL + "relaunch_co.gif");

 			

 		// disabled local toolbars

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RESUME, DLCL + "resume_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_SUSPEND, DLCL + "suspend_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE, DLCL + "terminate_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_ALL, DLCL + "terminate_all_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE, DLCL + "terminate_rem_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT, DLCL + "disconnect_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEPINTO, DLCL + "stepinto_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_STEPOVER, DLCL + "stepover_co.gif");

@@ -100,12 +105,15 @@ public class DebugPluginImages {
 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES, DLCL + "tnames_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE, DLCL + "rem_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL, DLCL + "rem_all_co.gif");

-		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_INSPECT, DLCL + "inpsect_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_INSPECT, DLCL + "inpsect_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_DLCL_RELAUNCH, DLCL + "relaunch_co.gif");

 

 		// enabled local toolbars

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESUME, ELCL + "resume_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SUSPEND, ELCL + "suspend_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE, ELCL + "terminate_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL, ELCL + "terminate_all_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE, ELCL + "terminate_rem_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DISCONNECT, ELCL + "disconnect_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEPINTO, ELCL + "stepinto_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEPOVER, ELCL + "stepover_co.gif");

@@ -116,8 +124,8 @@ public class DebugPluginImages {
 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TYPE_NAMES, ELCL + "tnames_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE, ELCL + "rem_co.gif");

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE_ALL, ELCL + "rem_all_co.gif");

-		

 		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_INSPECT, ELCL + "inpsect_co.gif");

+		declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RELAUNCH, ELCL + "relaunch_co.gif");

 

 

 		//Object

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 54ab7238f..41d5e0430 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
@@ -21,6 +21,8 @@ public interface IInternalDebugUIConstants {
 	public static final String IMG_DLCL_RESUME= "IMG_DLCL_RESUME";

 	public static final String IMG_DLCL_SUSPEND= "IMG_DLCL_SUSPEND";

 	public static final String IMG_DLCL_TERMINATE= "IMG_DLCL_TERMINATE";

+	public static final String IMG_DLCL_TERMINATE_ALL= "IMG_DLCL_TERMINATE_ALL";

+	public static final String IMG_DLCL_TERMINATE_AND_REMOVE= "IMG_DLCL_TERMINATE_AND_REMOVE";

 	public static final String IMG_DLCL_DISCONNECT= "IMG_DLCL_DISCONNECT";

 	public static final String IMG_DLCL_STEPINTO= "IMG_DLCL_STEPINTO";

 	public static final String IMG_DLCL_STEPOVER= "IMG_DLCL_STEPOVER";

@@ -32,11 +34,14 @@ public interface IInternalDebugUIConstants {
 	public static final String IMG_DLCL_REMOVE= "IMG_DLCL_REMOVE";

 	public static final String IMG_DLCL_REMOVE_ALL= "IMG_DLCL_REMOVE_ALL";

 	public static final String IMG_DLCL_INSPECT= "IMG_DLCL_INSPECT";

+	public static final String IMG_DLCL_RELAUNCH= "IMG_DLCL_RELAUNCH";

 

 	// enabled local tool images

 	public static final String IMG_ELCL_RESUME= "IMG_ELCL_RESUME";

 	public static final String IMG_ELCL_SUSPEND= "IMG_ELCL_SUSPEND";

 	public static final String IMG_ELCL_TERMINATE= "IMG_ELCL_TERMINATE";

+	public static final String IMG_ELCL_TERMINATE_ALL= "IMG_ELCL_TERMINATE_ALL";

+	public static final String IMG_ELCL_TERMINATE_AND_REMOVE= "IMG_ELCL_TERMINATE_AND_REMOVE";

 	public static final String IMG_ELCL_DISCONNECT= "IMG_ELCL_DISCONNECT";

 	public static final String IMG_ELCL_STEPINTO= "IMG_ELCL_STEPINTO";

 	public static final String IMG_ELCL_STEPOVER= "IMG_ELCL_STEPOVER";

@@ -48,4 +53,5 @@ public interface IInternalDebugUIConstants {
 	public static final String IMG_ELCL_REMOVE= "IMG_ELCL_REMOVE";

 	public static final String IMG_ELCL_REMOVE_ALL= "IMG_ELCL_REMOVE_ALL";

 	public static final String IMG_ELCL_INSPECT= "IMG_ELCL_INSPECT";

+	public static final String IMG_ELCL_RELAUNCH= "IMG_ELCL_RELAUNCH";

 }

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 50b65c125..5940cba13 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
@@ -6,9 +6,12 @@ package org.eclipse.debug.internal.ui;
  */

 

 import java.text.MessageFormat;

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

+

+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.debug.ui.IDebugUIConstants;

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.dialogs.MessageDialog;

 

@@ -98,5 +101,8 @@ public class RelaunchActionDelegate extends ControlActionDelegate {
 	 * @see ControlActionDelegate

 	 */

 	protected void setActionImages(IAction action) {

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

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

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

 	}		

 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchLastAction.java
index c1902506a..a4bf6a46c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchLastAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/RelaunchLastAction.java
@@ -5,18 +5,33 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

-import org.eclipse.debug.core.ILaunch;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.help.WorkbenchHelp;

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

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

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

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

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

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.IWorkbenchWindowActionDelegate;

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

 

 /**

  * Re-runs or re-debugs the last launch.

  */

 public class RelaunchLastAction extends Action implements IWorkbenchWindowActionDelegate {

 	

+	/**

+	 * When this action is created as a delegate, this flag indicates

+	 * whether the workbench presentation has had its associated

+	 * images set.

+	 */

+	private boolean fInitializedImages = false;

 	

 	public RelaunchLastAction() {

 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.RELAUNCH_LAST_ACTION });

+		setActionImages(this);

 	}

 	

 	/**

@@ -58,6 +73,18 @@ public class RelaunchLastAction extends Action implements IWorkbenchWindowAction
 	 * @see IActionDelegate

 	 */

 	public void selectionChanged(IAction action, ISelection selection){

+		setActionImages(action);

+	}

+	

+	protected void setActionImages(IAction action) {

+		if (!fInitializedImages ) {

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

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

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

+			// only set the flag to true when setting images

+			// for the associated workbench presentation

+			fInitializedImages = action != this;

+		} 

 	}

 }

 

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAllAction.java
index 6b758d204..e2eaa95f3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/TerminateAllAction.java
@@ -5,7 +5,15 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

  

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

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

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

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

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

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

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

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

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

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

 

 /**

  * Terminates all launches.

@@ -21,6 +29,10 @@ public class TerminateAllAction extends Action {
 		WorkbenchHelp.setHelp(

 			this,

 			new Object[] { IDebugHelpContextIds.TERMINATE_ALL_ACTION });

+			

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

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

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

 	}

 

 	/**

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 65040b8a3..48723cfe1 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
@@ -5,8 +5,14 @@ package org.eclipse.debug.internal.ui;
  * All Rights Reserved.

  */

 

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

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

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

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

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

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

+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.ui.IDebugUIConstants;

 import org.eclipse.jface.action.IAction;

 

 public class TerminateAndRemoveActionDelegate extends ControlActionDelegate {

@@ -68,6 +74,9 @@ public class TerminateAndRemoveActionDelegate extends ControlActionDelegate {
 	/**

 	 * @see ControlActionDelegate

 	 */

-	protected void setActionImages(IAction action) {	

+	protected void setActionImages(IAction action) {

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

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

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

 	}	

 }
\ No newline at end of file
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 3eb5227ba..f645817d9 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
@@ -184,7 +184,7 @@ public interface IDebugUIConstants {
 	 * Run action image identifier.

 	 */

 	public static final String IMG_ACT_RUN= "IMG_ACT_RUN";

-	

+		

 	/** Resume action image identifier. */

 	public static final String IMG_LCL_RESUME= "IMG_LCL_RESUME";

 	

@@ -194,6 +194,12 @@ public interface IDebugUIConstants {
 	/** Terminate action image identifier. */

 	public static final String IMG_LCL_TERMINATE= "IMG_LCL_TERMINATE";

 	

+	/** Terminate all action image identifier. */

+	public static final String IMG_LCL_TERMINATE_ALL= "IMG_LCL_TERMINATE_ALL";

+	

+	/** Terminate and remove action image identifier. */

+	public static final String IMG_LCL_TERMINATE_AND_REMOVE= "IMG_LCL_TERMINATE_AND_REMOVE";

+	

 	/** Disconnect action image identifier. */

 	public static final String IMG_LCL_DISCONNECT= "IMG_LCL_DISCONNECT";

 	

@@ -227,6 +233,10 @@ public interface IDebugUIConstants {
 	/** Inspector action image identifier. */

 	public static final String IMG_LCL_INSPECT= "IMG_LCL_INSPECT";

 	

+	/** Re-launch action image identifier.*/

+	public static final String IMG_LCL_RELAUNCH= "IMG_LCL_RELAUNCH";

+

+	

 	// Debug element images

 	

 	/** Debug mode launch image identifier. */