Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2021-12-26 07:47:09 +0000
committerMarkus Duft2022-01-12 09:58:19 +0000
commit6f1920aeee2419391e51609facabf1251cb5808e (patch)
tree2c85e6aa082a90fb44fcf3336e35af939d178d3a
parent4873edf0eeadeec0aace36f7c43fc17e762255fb (diff)
downloadeclipse.platform.debug-I20220119-1320.tar.gz
eclipse.platform.debug-I20220119-1320.tar.xz
eclipse.platform.debug-I20220119-1320.zip
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>
-rw-r--r--org.eclipse.debug.ui.launchview/icons/delete_exc.pngbin0 -> 582 bytes
-rw-r--r--org.eclipse.debug.ui.launchview/icons/delete_exc@2x.pngbin0 -> 1296 bytes
-rw-r--r--org.eclipse.debug.ui.launchview/icons/remove_exc.pngbin496 -> 0 bytes
-rw-r--r--org.eclipse.debug.ui.launchview/icons/remove_exc@2x.pngbin961 -> 0 bytes
-rw-r--r--org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/impl/DebugCoreProvider.java14
-rw-r--r--org.eclipse.debug.ui.launchview/src/org/eclipse/debug/ui/launchview/internal/messages.properties2
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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...

Back to the top