Refactor object order actions

archimatetool · Feb 14, 2025 · 6a8be5d · 6a8be5d
1 parent 8c2efa9
commit 6a8be5d
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 611 deletions.
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/AbstractDiagramEditor.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/AbstractDiagramEditor.java
@@ -91,8 +91,6 @@
 
 import com.archimatetool.editor.ArchiPlugin;
 import com.archimatetool.editor.diagram.actions.BorderColorAction;
-import com.archimatetool.editor.diagram.actions.BringForwardAction;
-import com.archimatetool.editor.diagram.actions.BringToFrontAction;
 import com.archimatetool.editor.diagram.actions.ConnectionRouterAction;
 import com.archimatetool.editor.diagram.actions.CopyAction;
 import com.archimatetool.editor.diagram.actions.CutAction;
@@ -108,6 +106,7 @@
 import com.archimatetool.editor.diagram.actions.LineColorAction;
 import com.archimatetool.editor.diagram.actions.LineWidthAction;
 import com.archimatetool.editor.diagram.actions.LockObjectAction;
+import com.archimatetool.editor.diagram.actions.ObjectPositionAction;
 import com.archimatetool.editor.diagram.actions.OpacityAction;
 import com.archimatetool.editor.diagram.actions.OutlineOpacityAction;
 import com.archimatetool.editor.diagram.actions.PasteAction;
@@ -117,8 +116,6 @@
 import com.archimatetool.editor.diagram.actions.ResetAspectRatioAction;
 import com.archimatetool.editor.diagram.actions.SelectAllAction;
 import com.archimatetool.editor.diagram.actions.SelectElementInTreeAction;
-import com.archimatetool.editor.diagram.actions.SendBackwardAction;
-import com.archimatetool.editor.diagram.actions.SendToBackAction;
 import com.archimatetool.editor.diagram.actions.TextAlignmentAction;
 import com.archimatetool.editor.diagram.actions.TextPositionAction;
 import com.archimatetool.editor.diagram.actions.ToggleGridEnabledAction;
@@ -871,29 +868,12 @@ protected void createActions(GraphicalViewer viewer) {
         action = new ConnectionRouterAction.ManhattanConnectionRouterAction(this);
         registry.registerAction(action);
 
-        // Send Backward
-        action = new SendBackwardAction(this);
-        registry.registerAction(action);
-        getSelectionActions().add(action.getId());
-        getUpdateCommandStackActions().add((UpdateAction)action);
-
-        // Bring Forward
-        action = new BringForwardAction(this);
-        registry.registerAction(action);
-        getSelectionActions().add(action.getId());
-        getUpdateCommandStackActions().add((UpdateAction)action);
-
-        // Send to Back
-        action = new SendToBackAction(this);
-        registry.registerAction(action);
-        getSelectionActions().add(action.getId());
-        getUpdateCommandStackActions().add((UpdateAction)action);
-
-        // Bring To Front
-        action = new BringToFrontAction(this);
-        registry.registerAction(action);
-        getSelectionActions().add(action.getId());
-        getUpdateCommandStackActions().add((UpdateAction)action);
+        // Object Position Actions
+        for(ObjectPositionAction a : ObjectPositionAction.createActions(this)) {
+            registry.registerAction(a);
+            getSelectionActions().add(a.getId());
+            getUpdateCommandStackActions().add(a);
+        }
 
         // Text Alignment Actions
         for(TextAlignmentAction a : TextAlignmentAction.createActions(this)) {

diff --git a/...ditor/src/com/archimatetool/editor/diagram/AbstractDiagramEditorActionBarContributor.java b/...ditor/src/com/archimatetool/editor/diagram/AbstractDiagramEditorActionBarContributor.java
@@ -34,8 +34,6 @@
 
 import com.archimatetool.editor.actions.ArchiActionFactory;
 import com.archimatetool.editor.diagram.actions.BorderColorAction;
-import com.archimatetool.editor.diagram.actions.BringForwardAction;
-import com.archimatetool.editor.diagram.actions.BringToFrontAction;
 import com.archimatetool.editor.diagram.actions.ConnectionRouterAction;
 import com.archimatetool.editor.diagram.actions.DefaultEditPartSizeAction;
 import com.archimatetool.editor.diagram.actions.DeleteContainerAction;
@@ -48,11 +46,11 @@
 import com.archimatetool.editor.diagram.actions.LineColorAction;
 import com.archimatetool.editor.diagram.actions.LineWidthAction;
 import com.archimatetool.editor.diagram.actions.LockObjectAction;
+import com.archimatetool.editor.diagram.actions.ObjectPositionAction;
+import com.archimatetool.editor.diagram.actions.ObjectPositionAction.ObjectPositionActionDefinition;
 import com.archimatetool.editor.diagram.actions.OpacityAction;
 import com.archimatetool.editor.diagram.actions.OutlineOpacityAction;
 import com.archimatetool.editor.diagram.actions.ResetAspectRatioAction;
-import com.archimatetool.editor.diagram.actions.SendBackwardAction;
-import com.archimatetool.editor.diagram.actions.SendToBackAction;
 import com.archimatetool.editor.diagram.actions.TextAlignmentAction;
 import com.archimatetool.editor.diagram.actions.TextAlignmentAction.TextAlignmentActionDefinition;
 import com.archimatetool.editor.diagram.actions.TextPositionAction;
@@ -169,21 +167,9 @@ protected void buildActions() {
         }
 
         // Order Actions
-        retargetAction = new RetargetAction(BringToFrontAction.ID, BringToFrontAction.TEXT);
-        retargetAction.setActionDefinitionId(BringToFrontAction.ID); // key binding
-        addRetargetAction(retargetAction);
-
-        retargetAction = new RetargetAction(BringForwardAction.ID, BringForwardAction.TEXT);
-        retargetAction.setActionDefinitionId(BringForwardAction.ID); // key binding
-        addRetargetAction(retargetAction);
-
-        retargetAction = new RetargetAction(SendToBackAction.ID, SendToBackAction.TEXT);
-        retargetAction.setActionDefinitionId(SendToBackAction.ID); // key binding
-        addRetargetAction(retargetAction);
-
-        retargetAction = new RetargetAction(SendBackwardAction.ID, SendBackwardAction.TEXT);
-        retargetAction.setActionDefinitionId(SendBackwardAction.ID); // key binding
-        addRetargetAction(retargetAction);
+        for(RetargetAction action : ObjectPositionAction.createRetargetActions()) {
+            addRetargetAction(action);
+        }
 
         // Connection Routers
         addRetargetAction(new RetargetAction(ConnectionRouterAction.BendPointConnectionRouterAction.ID,
@@ -256,10 +242,9 @@ protected IMenuManager createViewMenu(IMenuManager menuManager) {
 
         IMenuManager orderMenu = new MenuManager(Messages.AbstractDiagramEditorActionBarContributor_5, "menu_order"); //$NON-NLS-1$
         viewMenu.add(orderMenu);
-        orderMenu.add(getAction(BringToFrontAction.ID));
-        orderMenu.add(getAction(BringForwardAction.ID));
-        orderMenu.add(getAction(SendToBackAction.ID));
-        orderMenu.add(getAction(SendBackwardAction.ID));
+        for(ObjectPositionActionDefinition def : ObjectPositionAction.getActionDefinitions()) {
+            orderMenu.add(getAction(def.id()));
+        }
 
         viewMenu.add(new GroupMarker(GROUP_POSITION));
         IMenuManager alignmentMenu = new MenuManager(Messages.AbstractDiagramEditorActionBarContributor_6, "menu_position"); //$NON-NLS-1$

diff --git a/...editor/src/com/archimatetool/editor/diagram/AbstractDiagramEditorContextMenuProvider.java b/...editor/src/com/archimatetool/editor/diagram/AbstractDiagramEditorContextMenuProvider.java
@@ -17,18 +17,16 @@
 import org.eclipse.ui.actions.ActionFactory;
 
 import com.archimatetool.editor.actions.ArchiActionFactory;
-import com.archimatetool.editor.diagram.actions.BringForwardAction;
-import com.archimatetool.editor.diagram.actions.BringToFrontAction;
 import com.archimatetool.editor.diagram.actions.ConnectionRouterAction;
 import com.archimatetool.editor.diagram.actions.DefaultEditPartSizeAction;
 import com.archimatetool.editor.diagram.actions.DeleteContainerAction;
 import com.archimatetool.editor.diagram.actions.ExportAsImageAction;
 import com.archimatetool.editor.diagram.actions.ExportAsImageToClipboardAction;
 import com.archimatetool.editor.diagram.actions.LockObjectAction;
+import com.archimatetool.editor.diagram.actions.ObjectPositionAction;
+import com.archimatetool.editor.diagram.actions.ObjectPositionAction.ObjectPositionActionDefinition;
 import com.archimatetool.editor.diagram.actions.ResetAspectRatioAction;
 import com.archimatetool.editor.diagram.actions.SelectElementInTreeAction;
-import com.archimatetool.editor.diagram.actions.SendBackwardAction;
-import com.archimatetool.editor.diagram.actions.SendToBackAction;
 
 
 /**
@@ -124,10 +122,9 @@ public void buildContextMenu(IMenuManager menu) {
         menu.add(new Separator(GROUP_ORDER));
         IMenuManager orderMenu = new MenuManager(Messages.AbstractDiagramEditorContextMenuProvider_1, "menu_order"); //$NON-NLS-1$
         menu.add(orderMenu);
-        orderMenu.add(actionRegistry.getAction(BringToFrontAction.ID));
-        orderMenu.add(actionRegistry.getAction(BringForwardAction.ID));
-        orderMenu.add(actionRegistry.getAction(SendToBackAction.ID));
-        orderMenu.add(actionRegistry.getAction(SendBackwardAction.ID));
+        for(ObjectPositionActionDefinition def : ObjectPositionAction.getActionDefinitions()) {
+            orderMenu.add(actionRegistry.getAction(def.id()));
+        }
 
         menu.add(new GroupMarker(GROUP_POSITION));
         IMenuManager alignmentMenu = new MenuManager(Messages.AbstractDiagramEditorContextMenuProvider_2, "menu_position"); //$NON-NLS-1$

diff --git a/...archimatetool.editor/src/com/archimatetool/editor/diagram/actions/BringForwardAction.java b/...archimatetool.editor/src/com/archimatetool/editor/diagram/actions/BringForwardAction.java