Add accelerator for RemoveAction
diff --git a/plugins/org.eclipse.graphiti.ui/plugin.properties b/plugins/org.eclipse.graphiti.ui/plugin.properties
index 981a2fa..77bf585 100644
--- a/plugins/org.eclipse.graphiti.ui/plugin.properties
+++ b/plugins/org.eclipse.graphiti.ui/plugin.properties
@@ -33,3 +33,5 @@
_key_binding_category = Edit
_command_name_update = Update
_command_description_update = Update selected Pictogram Elements
+_command_name_remove = Remove
+_command_description_remove = Remove selected Pictogram Elements
diff --git a/plugins/org.eclipse.graphiti.ui/plugin.xml b/plugins/org.eclipse.graphiti.ui/plugin.xml
index 1ce4509..4e720e5 100644
--- a/plugins/org.eclipse.graphiti.ui/plugin.xml
+++ b/plugins/org.eclipse.graphiti.ui/plugin.xml
Binary files differ
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorActionBarContributor.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorActionBarContributor.java
index 800d430..e4e8623 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorActionBarContributor.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/editor/DiagramEditorActionBarContributor.java
@@ -32,7 +32,6 @@
import org.eclipse.graphiti.ui.internal.action.SaveImageAction;
import org.eclipse.graphiti.ui.internal.action.UpdateAction;
import org.eclipse.graphiti.ui.services.GraphitiUi;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
@@ -89,6 +88,7 @@
RetargetAction removeRetargetAction = new RetargetAction(RemoveAction.ACTION_ID, RemoveAction.TEXT);
removeRetargetAction.setImageDescriptor(GraphitiUi.getImageService().getImageDescriptorForId(
IPlatformImageConstants.IMG_EDIT_REMOVE));
+ removeRetargetAction.setActionDefinitionId(RemoveAction.ACTION_DEFINITION_ID);
addRetargetAction(removeRetargetAction);
RetargetAction updateRetargetAction = new RetargetAction(UpdateAction.ACTION_ID, UpdateAction.TEXT);
updateRetargetAction.setImageDescriptor(GraphitiUi.getImageService().getImageDescriptorForId(
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/RemoveAction.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/RemoveAction.java
index 9144e4c..e860989 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/RemoveAction.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/RemoveAction.java
@@ -9,6 +9,7 @@
*
* Contributors:
* SAP AG - initial API, implementation and documentation
+ * jpasch - Bug 323025 ActionBarContributor clean up
*
* </copyright>
*
@@ -38,10 +39,13 @@
public static final String TEXT = Messages.RemoveAction_1_xfld;
public static final String ACTION_ID = "predefined remove action"; //$NON-NLS-1$
+
+ public static final String ACTION_DEFINITION_ID = "org.eclipse.graphiti.ui.internal.action.RemoveAction"; //$NON-NLS-1$
public RemoveAction(IWorkbenchPart part, IConfigurationProvider configurationProvider) {
super(part, configurationProvider);
setId(ACTION_ID);
+ setActionDefinitionId(ACTION_DEFINITION_ID);
setText(TEXT);
setToolTipText(TOOL_TIP);
}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/UpdateAction.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/UpdateAction.java
index e105b97..a345cf4 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/UpdateAction.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/UpdateAction.java
@@ -9,6 +9,7 @@
*
* Contributors:
* SAP AG - initial API, implementation and documentation
+ * jpasch - Bug 323025 ActionBarContributor clean up
*
* </copyright>
*