Check all connection types

archimatetool · Dec 11, 2024 · 1b2c088 · 1b2c088
1 parent 312f882
commit 1b2c088
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/...editor/src/com/archimatetool/editor/diagram/editparts/NestedConnectionEditPartFilter.java b/...editor/src/com/archimatetool/editor/diagram/editparts/NestedConnectionEditPartFilter.java
@@ -8,8 +8,6 @@
 import org.eclipse.gef.EditPart;
 
 import com.archimatetool.editor.model.DiagramModelUtils;
-import com.archimatetool.editor.preferences.ConnectionPreferences;
-import com.archimatetool.model.IDiagramModelArchimateConnection;
 import com.archimatetool.model.IDiagramModelConnection;
 
 
@@ -22,12 +20,6 @@ public class NestedConnectionEditPartFilter implements IConnectionEditPartFilter
 
     @Override
     public boolean isConnectionVisible(EditPart editPart, IDiagramModelConnection connection) {
-        // If the connection is an Archimate type and its target element is an Archimate type
-        // and this box contains that box and that box qualifies, don't show the connection
-        if(ConnectionPreferences.useNestedConnections() && connection instanceof IDiagramModelArchimateConnection) {
-            return !DiagramModelUtils.shouldBeHiddenConnection((IDiagramModelArchimateConnection)connection);
-        }
-
-        return true;
+        return !DiagramModelUtils.shouldBeHiddenConnection(connection);
     }
 }
diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/model/DiagramModelUtils.java b/com.archimatetool.editor/src/com/archimatetool/editor/model/DiagramModelUtils.java
@@ -271,25 +271,28 @@ public static boolean isNestedConnectionTypeRelationship(IArchimateRelationship
      * @param connection The connection to check
      * @return true if a connection should be hidden when its source (parent) element contains its target (child) element
      */
-    public static boolean shouldBeHiddenConnection(IDiagramModelArchimateConnection connection) {
+    public static boolean shouldBeHiddenConnection(IDiagramModelConnection connection) {
         if(!ConnectionPreferences.useNestedConnections()) {
             return false;
         }
 
-        // If the connection's source is an object and the connection's target is an object
-        // and the source contains the target or the target contains the source
-        if(connection.getSource() instanceof IDiagramModelArchimateObject dmoSource && connection.getTarget() instanceof IDiagramModelArchimateObject dmoTarget
-                && (dmoSource.getChildren().contains(dmoTarget) || dmoTarget.getChildren().contains(dmoSource))) {
-            return isNestedConnectionTypeRelationship(connection.getArchimateRelationship());
+        // This is an Archimate connection
+        // and the connection's source is an Archimate object and the connection's target is an Archimate object
+        // and the connection's source contains the connection's target or the connection's target contains the connection's source
+        if(connection instanceof IDiagramModelArchimateConnection dmc
+                                 && connection.getSource() instanceof IDiagramModelArchimateObject source
+                                 && connection.getTarget() instanceof IDiagramModelArchimateObject target
+                                 && (source.getChildren().contains(target) || target.getChildren().contains(source))) {
+            return isNestedConnectionTypeRelationship(dmc.getArchimateRelationship());
         }
 
         // If the connection's source is a connection and is a hidden type
-        if(connection.getSource() instanceof IDiagramModelArchimateConnection dmc) {
+        if(connection.getSource() instanceof IDiagramModelConnection dmc) {
             return shouldBeHiddenConnection(dmc);
         }
 
         // If the connection's target is a connection and is a hidden type
-        if(connection.getTarget() instanceof IDiagramModelArchimateConnection dmc) {
+        if(connection.getTarget() instanceof IDiagramModelConnection dmc) {
             return shouldBeHiddenConnection(dmc);
         }