Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2015-02-10 14:39:40 +0000
committerEsteban Dugueperoux2015-02-10 14:43:01 +0000
commit48a9ebe3a64d9971e5717ead84c6773dc58a3af5 (patch)
treea4a13c53c2e79e118a4c074263730ebe8f261d52
parent8fdf11d34706f2957c9e444509053ec443b9d3c5 (diff)
downloadorg.eclipse.sirius-48a9ebe3a64d9971e5717ead84c6773dc58a3af5.tar.gz
org.eclipse.sirius-48a9ebe3a64d9971e5717ead84c6773dc58a3af5.tar.xz
org.eclipse.sirius-48a9ebe3a64d9971e5717ead84c6773dc58a3af5.zip
[458977] Move AbstractActionWrapperHandler from diagram.ui to sirius.ui
Move AbstractActionWrapperHandler from diagram.ui to sirius.ui plugin to be reused by tree/table dialect to bind F5 shortcut on RefreshAction. Bug: 458977 Change-Id: I3f33471f6527507925ba0f28a5eafe5a55fa52af Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeleteFromDiagramHandler.java2
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeselectAllCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideElementCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideLabelCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/PinElementsHandler.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/QuickOutlineCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RefreshElementCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RevealAllElementsCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/ShowLabelCommand.java1
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/SynchronizedDiagramCommand.java4
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/UnpinElementsHandler.java1
-rw-r--r--plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/commands/AbstractActionWrapperHandler.java (renamed from plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/AbstractActionWrapperHandler.java)2
12 files changed, 13 insertions, 4 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeleteFromDiagramHandler.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeleteFromDiagramHandler.java
index f1e10bc425..be94c39c95 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeleteFromDiagramHandler.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeleteFromDiagramHandler.java
@@ -11,12 +11,12 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.delete.DeleteFromDiagramAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* Handles the delete from diagram action (Ctrl + Shift + D).
*
* @author fbarbin
- *
*/
public class DeleteFromDiagramHandler extends AbstractActionWrapperHandler {
/**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeselectAllCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeselectAllCommand.java
index 41dab8b12e..682956edb6 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeselectAllCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeselectAllCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.DeselectAllAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* Deselect all the selected elements.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideElementCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideElementCommand.java
index 7a2f94c054..f5f70c93f0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideElementCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideElementCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.visibility.HideDDiagramElementAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* A command to hide the DNode.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideLabelCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideLabelCommand.java
index e8a40ec37d..41661e3934 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideLabelCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/HideLabelCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.visibility.HideDDiagramElementLabelAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* A command to hide the label of a DNode.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/PinElementsHandler.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/PinElementsHandler.java
index b04592f6b1..224daeaa1e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/PinElementsHandler.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/PinElementsHandler.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.pinning.PinElementsEclipseAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* The default handler for the "Unpin Elements" handler.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/QuickOutlineCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/QuickOutlineCommand.java
index f4926456d0..b1e842997c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/QuickOutlineCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/QuickOutlineCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.outline.QuickOutlineAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* A command to show the quick outline.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RefreshElementCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RefreshElementCommand.java
index d83d969749..af29c33ea8 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RefreshElementCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RefreshElementCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.refresh.RefreshDDiagramElementAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* .
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RevealAllElementsCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RevealAllElementsCommand.java
index f9fdb9b929..b9ef966f2a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RevealAllElementsCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/RevealAllElementsCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.visibility.RevealAllElementsAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* Command to wrap reveal all elements action.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/ShowLabelCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/ShowLabelCommand.java
index 3763d63cff..144d8185ae 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/ShowLabelCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/ShowLabelCommand.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.visibility.RevealOutlineLabelsAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* A command to show the label of a DNode.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/SynchronizedDiagramCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/SynchronizedDiagramCommand.java
index d52693bed9..e7aac35763 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/SynchronizedDiagramCommand.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/SynchronizedDiagramCommand.java
@@ -15,6 +15,7 @@ import java.util.Map;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.SynchronizedDiagramAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
@@ -25,7 +26,6 @@ import org.eclipse.ui.menus.UIElement;
* Toggle between synchronized and unsynchronized diagram modes.
*
* @author smonnier
- *
*/
public class SynchronizedDiagramCommand extends AbstractActionWrapperHandler implements IElementUpdater {
@@ -42,7 +42,7 @@ public class SynchronizedDiagramCommand extends AbstractActionWrapperHandler imp
* @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement,
* java.util.Map)
*/
- public void updateElement(final UIElement element, final Map parameters) {
+ public void updateElement(final UIElement element, @SuppressWarnings("rawtypes") final Map parameters) {
final IWorkbenchWindow window = (IWorkbenchWindow) element.getServiceLocator().getService(IWorkbenchWindow.class);
if (window == null) {
return;
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/UnpinElementsHandler.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/UnpinElementsHandler.java
index b89b9351cf..f33ad15a88 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/UnpinElementsHandler.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/UnpinElementsHandler.java
@@ -11,6 +11,7 @@
package org.eclipse.sirius.diagram.ui.tools.internal.commands;
import org.eclipse.sirius.diagram.ui.tools.internal.actions.pinning.UnpinElementsEclipseAction;
+import org.eclipse.sirius.ui.tools.internal.commands.AbstractActionWrapperHandler;
/**
* The default handler for the "un pin Elements" command.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/AbstractActionWrapperHandler.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/commands/AbstractActionWrapperHandler.java
index 9fee54dd3b..ee27732d1d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/commands/AbstractActionWrapperHandler.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/commands/AbstractActionWrapperHandler.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.sirius.diagram.ui.tools.internal.commands;
+package org.eclipse.sirius.ui.tools.internal.commands;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;

Back to the top