[426] Refactor getContainerTopLeftInsets without change

Bug: #426
eclipse-sirius · Sep 17, 2024 · 8eb52ab · 8eb52ab
1 parent f99c275
commit 8eb52ab
Showing 1 changed file with 33 additions and 16 deletions.
diff --git a/....sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java b/....sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java
@@ -162,6 +162,38 @@ public static Point getAbsoluteLocation(Node node, boolean insetsAware) {
         return absoluteNodeLocation;
     }
 
+    /**
+     * Return the top-left insets of this <code>container</code>. The insets also considers its border.
+     * 
+     * @param container
+     *            The container for which we wish to have the insets. This {@link Node} must correspond to a container,
+     *            otherwise, {0,0} is returned
+     * @return the top-left insets of this <code>container</code>
+     */
+    public static Dimension getTopLeftInsets(Node container) {
+        Dimension result = new Dimension(0, 0);
+        NodeQuery nodeQuery = new NodeQuery(container);
+        if (nodeQuery.isContainer()) {
+            EObject element = container.getElement();
+            if (element instanceof DDiagramElementContainer) {
+                DDiagramElementContainer ddec = (DDiagramElementContainer) element;
+                // RegionContainer do not have containers insets
+                if (ddec instanceof DNodeContainer) {
+                    if (new DNodeContainerExperimentalQuery((DNodeContainer) ddec).isRegionContainer() || hasFullLabelBorder(ddec)) {
+                        result.setHeight(CONTAINER_INSETS.y + getLabelSize(container) + AbstractDiagramElementContainerEditPart.DEFAULT_SPACING);
+                    } else {
+                        result.setWidth(CONTAINER_INSETS.x);
+                        result.setHeight(CONTAINER_INSETS.y);
+                    }
+                }
+                Dimension borderSize = getBorderSize(ddec);
+                result.setWidth(result.width() + borderSize.width());
+                result.setHeight(result.height() + borderSize.height());
+            }
+        }
+        return result;
+    }
+
     /**
      * Return the top-left insets of the container of this <code>node</code>. The insets also considers its border.
      * 
@@ -179,22 +211,7 @@ public static Dimension getContainerTopLeftInsets(Node node, boolean searchFirst
             Node parentNode = (Node) nodeContainer;
             NodeQuery nodeQuery = new NodeQuery(parentNode);
             if (nodeQuery.isContainer()) {
-                EObject element = parentNode.getElement();
-                if (element instanceof DDiagramElementContainer) {
-                    DDiagramElementContainer ddec = (DDiagramElementContainer) element;
-                    // RegionContainer do not have containers insets
-                    if (ddec instanceof DNodeContainer) {
-                        if (new DNodeContainerExperimentalQuery((DNodeContainer) ddec).isRegionContainer() || hasFullLabelBorder(ddec)) {
-                            result.setHeight(CONTAINER_INSETS.y + getLabelSize(parentNode) + AbstractDiagramElementContainerEditPart.DEFAULT_SPACING);
-                        } else {
-                            result.setWidth(CONTAINER_INSETS.x);
-                            result.setHeight(CONTAINER_INSETS.y);
-                        }
-                    }
-                    Dimension borderSize = getBorderSize(ddec);
-                    result.setWidth(result.width() + borderSize.width());
-                    result.setHeight(result.height() + borderSize.height());
-                }
+                result = getTopLeftInsets(parentNode);
             } else if (searchFirstParentContainer) {
                 result = getContainerTopLeftInsets(parentNode, searchFirstParentContainer);
             }