diagrams: Fixed bundle dependencies option for reactions

This was lost in the conversion from xtend to java
lf-lang · Mar 14, 2022 · 35f5c02 · 35f5c02
1 parent fe17be8
commit 35f5c02
Showing 1 changed file with 33 additions and 24 deletions.
diff --git a/org.lflang.diagram/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java b/org.lflang.diagram/src/org/lflang/diagram/synthesis/LinguaFrancaSynthesis.java
@@ -722,14 +722,18 @@ private Collection<KNode> transformReactorNetwork(
 			// connect input
 			KPort port = null;
 	        for (TriggerInstance<?> trigger : reaction.triggers) {
-	            port = addInvisiblePort(node);
-	            setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-	            int triggersSize = reaction.triggers != null ? reaction.triggers.size() : 0;
-                int sourcesSize  = reaction.sources  != null ? reaction.sources.size()  : 0;
-	            if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || triggersSize + sourcesSize == 1) {
-	                // manual adjustment disabling automatic one
-	                setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, 
-	                        (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+                // Create new port if there is no previous one or each dependency should have its own one
+	            if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+	                port = addInvisiblePort(node);
+	                setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+
+	                int triggersSize = reaction.triggers != null ? reaction.triggers.size() : 0;
+	                int sourcesSize  = reaction.sources  != null ? reaction.sources.size()  : 0;
+	                if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || triggersSize + sourcesSize == 1) {
+	                    // manual adjustment disabling automatic one
+	                    setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET,
+	                            (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+	                }
 	            }
 
 	            if (trigger.isStartup()) {
@@ -764,20 +768,22 @@ private Collection<KNode> transformReactorNetwork(
 	        }
 
 			// connect dependencies
-			//port = null // create new ports
 			for (TriggerInstance<?> dep : reaction.sources) {
-			    if (reaction.triggers.contains(dep)) continue;
-			    if (!(getBooleanValue(REACTIONS_USE_HYPEREDGES) && port != null)) {
-			        port = addInvisiblePort(node);
-	                setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
-	                int triggersSize = reaction.triggers != null ? reaction.triggers.size() : 0;
-	                int sourcesSize  = reaction.sources  != null ? reaction.sources.size()  : 0;
-	                if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || triggersSize + sourcesSize == 1) {
-	                 // manual adjustment disabling automatic one
-	                    setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, 
-	                            (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
-	                }
-			    }
+			    if (reaction.triggers.contains(dep)) continue; // skip
+
+                // Create new port if there is no previous one or each dependency should have its own one
+			    if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+                    port = addInvisiblePort(node);
+                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.WEST);
+
+                    int triggersSize = reaction.triggers != null ? reaction.triggers.size() : 0;
+                    int sourcesSize  = reaction.sources  != null ? reaction.sources.size()  : 0;
+                    if (getBooleanValue(REACTIONS_USE_HYPEREDGES) || triggersSize + sourcesSize == 1) {
+                        // manual adjustment disabling automatic one
+                        setLayoutOption(port, CoreOptions.PORT_BORDER_OFFSET, 
+                                (double) -LinguaFrancaShapeExtensions.REACTION_POINTINESS);
+                    }
+                }
 
 			    if (dep instanceof PortInstance) {
                     KPort src = null;
@@ -794,11 +800,14 @@ private Collection<KNode> transformReactorNetwork(
 			}
 
 			// connect outputs
-			port = null; // create new ports
+			port = null; // enforce new ports for outputs
 			Set<TriggerInstance<?>> iterSet = reaction.effects != null ? reaction.effects : new HashSet<>();
 			for (TriggerInstance<?> effect : iterSet) {
-                port = addInvisiblePort(node);
-                setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
+			    // Create new port if there is no previous one or each dependency should have its own one
+			    if (port == null || !getBooleanValue(REACTIONS_USE_HYPEREDGES)) {
+                    port = addInvisiblePort(node);
+                    setLayoutOption(port, CoreOptions.PORT_SIDE, PortSide.EAST);
+                }
 
                 if (effect instanceof ActionInstance) {
                     actionSources.put((ActionInstance) effect, port);