Bug 577958: use "Delete" label and icon in launch viewY20220119-0600Y20220118-0600Y20220117-0600Y20220116-0600Y20220115-0600Y20220114-0600Y20220113-0900Y20220113-0600Y20220112-0630Y20220112-0600I20220120-0220I20220119-1800I20220119-1440I20220119-1320I20220119-0540I20220118-1800I20220117-1800I20220116-1800I20220115-1800I20220114-1800I20220113-1800I20220112-1800

Since the launch config is really deleted and not just removed from the
view, the icon and label should match the normale delete action.

Change-Id: I63d411da46b353bccef4035560cd59f88d8f42c6
Signed-off-by: Michael Keppler <michael.keppler@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.debug/+/189131
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Markus Duft <markus.duft@ssi-schaefer.com>

6 files changed, 8 insertions, 8 deletions

diff --git a/org.eclipse.debug.ui.launchview/icons/delete_exc.png b/org.eclipse.debug.ui.launchview/icons/delete_exc.png
new file mode 100644
index 000000000..5f0038585
--- /dev/null
+++ b/org.eclipse.debug.ui.launchview/icons/delete_exc.png
diff --git a/org.eclipse.debug.ui.launchview/icons/delete_exc@2x.png b/org.eclipse.debug.ui.launchview/icons/delete_exc@2x.png
new file mode 100644
index 000000000..eb2fc720b
--- /dev/null
+++ b/org.eclipse.debug.ui.launchview/icons/delete_exc@2x.png
diff --git a/org.eclipse.debug.ui.launchview/icons/remove_exc.png b/org.eclipse.debug.ui.launchview/icons/remove_exc.png
deleted file mode 100644
index 3f119f9e3..000000000
--- a/org.eclipse.debug.ui.launchview/icons/remove_exc.png
+++ /dev/null
diff --git a/org.eclipse.debug.ui.launchview/icons/remove_exc@2x.png b/org.eclipse.debug.ui.launchview/icons/remove_exc@2x.png
deleted file mode 100644
index bc0c8d90d..000000000
--- a/org.eclipse.debug.ui.launchview/icons/remove_exc@2x.png
+++ /dev/null
diff --git a/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/impl/DebugCoreProvider.java b/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/impl/DebugCoreProvider.java
index 4f341f970..67123d023 100644
--- a/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/impl/DebugCoreProvider.java
+++ b/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/impl/DebugCoreProvider.java
@@ -114,14 +114,14 @@ public class DebugCoreProvider extends AbstractLaunchObjectProvider implements I
 
 	@Override
 	public void contributeContextMenu(Supplier<Set<ILaunchObject>> selected, MMenu menu) {
-		MDirectMenuItem cleanup = MMenuFactory.INSTANCE.createDirectMenuItem();
-		cleanup.setLabel(LaunchViewMessages.DebugCoreProvider_delete);
-		cleanup.setTooltip(LaunchViewMessages.DebugCoreProvider_deleteHint);
-		cleanup.setIconURI("platform:/plugin/" + LaunchViewBundleInfo.PLUGIN_ID + "/icons/remove_exc.png"); //$NON-NLS-1$ //$NON-NLS-2$
-		cleanup.setObject(new Object() {
+		MDirectMenuItem delete = MMenuFactory.INSTANCE.createDirectMenuItem();
+		delete.setLabel(LaunchViewMessages.DebugCoreProvider_delete);
+		delete.setTooltip(LaunchViewMessages.DebugCoreProvider_deleteHint);
+		delete.setIconURI("platform:/plugin/" + LaunchViewBundleInfo.PLUGIN_ID + "/icons/delete_exc.png"); //$NON-NLS-1$ //$NON-NLS-2$
+		delete.setObject(new Object() {
 
 			@Execute
-			public void cleanup() throws CoreException {
+			public void delete() throws CoreException {
 				for (ILaunchObject e : selected.get()) {
 					findLaunchConfiguration(e.getType(), e.getId()).delete();
 				}
@@ -137,7 +137,7 @@ public class DebugCoreProvider extends AbstractLaunchObjectProvider implements I
 		});
 
 		menu.getChildren().add(MMenuFactory.INSTANCE.createMenuSeparator());
-		menu.getChildren().add(cleanup);
+		menu.getChildren().add(delete);
 	}
 
 	ILaunchConfiguration findLaunchConfiguration(ILaunchConfigurationType type, String name) {
diff --git a/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/messages.properties b/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/messages.properties
index a11779190..ca997d10c 100644
--- a/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/messages.properties
+++ b/org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/messages.properties
@@ -17,7 +17,7 @@ DebugCoreLaunchObject_CannotRelaunch=Cannot relaunch {0}
 DebugCoreLaunchObject_CannotTerminate=Cannot terminate {0}
 DebugCoreLaunchObject_Terminate=Terminate {0}
 DebugCoreProvider_cannotFetchError=Cannot fetch existing launch configurations
-DebugCoreProvider_delete=Remove
+DebugCoreProvider_delete=Delete
 DebugCoreProvider_deleteHint=Deletes the selected launch configuration
 DebugCoreProvider_FailedLookup=Cannot fetch launch configurations from Eclipse.
 EditAction_Edit=Edit...