layered: Correctly insert nodes during df model order layering.

eclipse-elk · Oct 18, 2023 · 6ddf867 · 6ddf867
1 parent cfc8845
commit 6ddf867
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...elk.alg.layered/src/org/eclipse/elk/alg/layered/p2layers/DepthFirstModelOrderLayerer.java b/...elk.alg.layered/src/org/eclipse/elk/alg/layered/p2layers/DepthFirstModelOrderLayerer.java
@@ -123,6 +123,9 @@ public void process(final LGraph thelayeredGraph, final IElkProgressMonitor moni
                     if (!nodesToPlace.isEmpty()) {
                         if (layerDiff > 0) {
                             // Case some dependency to the existing graph was found add all nodes to their layers.
+                            for (LNode toPlace : nodesToPlace) {
+                                toPlace.id += maxLayer;
+                            }
                             placeNodesToPlace();
                             // Remove all nodes since they are now placed correctly.
                             nodesToPlace.clear();
@@ -209,7 +212,7 @@ private boolean isConnectedToCurrentLayer(final LNode node) {
             boolean connectedViaLabelDummy;
             if (nodesToPlace.isEmpty()) {
                 // Case the node to check already has a layer.
-                // TODO this may case an NPE if getLayer is null;
+                // This may case an NPE if getLayer is null;
                 directlyConnected = edge.getSource().getNode().getType() == NodeType.NORMAL
                         && edge.getSource().getNode().getLayer() != null
                         && edge.getSource().getNode().getLayer().id == currentLayerId;