-register our delete action,
now it is triggered also for by the DEL key stroke
previously the GEF action was triggered.
-remove double initialize, which caused loss
of our actions in the registry
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java
index 7ee223b..9cecf12 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/action/DeleteAction.java
@@ -25,6 +25,7 @@
import org.eclipse.graphiti.ui.internal.Messages;
import org.eclipse.graphiti.ui.internal.config.IConfigurationProvider;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.actions.ActionFactory;
/**
* @noinstantiate This class is not intended to be instantiated by clients.
@@ -36,7 +37,7 @@
private static final String TEXT = Messages.DeleteAction_1_xfld;
- public static final String ACTION_ID = "predefined delete action"; //$NON-NLS-1$
+ public static final String ACTION_ID = ActionFactory.DELETE.getId();
public DeleteAction(IWorkbenchPart part, IConfigurationProvider configurationProvider) {
super(part, configurationProvider);
@@ -45,6 +46,7 @@
setToolTipText(TOOL_TIP);
}
+ @Override
public boolean isAvailable() {
PictogramElement pe[] = getSelectedPictogramElements();
for (int i = 0; i < pe.length; i++) {
@@ -81,10 +83,12 @@
genericRun(this);
}
+ @Override
public IContext createContext(PictogramElement pe) {
return new DeleteContext(pe);
}
+ @Override
public IFeature provideFeatureForContext(IContext context) {
return getFeatureProvider().getDeleteFeature((IDeleteContext) context);
}
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java
index ab260f5..1afbd6e 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/editor/DiagramEditorInternal.java
@@ -1128,8 +1128,6 @@
}
}
- initActionRegistry();
-
buildNewObjectActions();
// this will cause the ActionBarContributor to refresh with the