Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Commit 8cb5534

Browse files
committed
Feat: Allow preservation of layout
1 parent b5919fd commit 8cb5534

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/analysis/Converter.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,14 @@ public static WebEditorDfd analyzeAnnotate(WebEditorDfd webEditorDfd) {
8989
dfdConverter.setConditions(constraints);
9090
}
9191
var newJson = dfdConverter.convert(dd).getModel();
92-
if (webEditorDfd.constraints() != null && !webEditorDfd.constraints().isEmpty())
93-
newJson.constraints().addAll(webEditorDfd.constraints()); //Reapply constraints
94-
return newJson;
92+
93+
for (var child : newJson.model().children()) {
94+
if (child.type().startsWith("node") && child.annotations() != null) {
95+
var oldNode = webEditorDfd.model().children().stream().filter(node -> node.id().equals(child.id())).findAny().orElseThrow();
96+
oldNode.annotations().addAll(child.annotations());
97+
}
98+
}
99+
return webEditorDfd;
95100
}
96101

97102
/**

bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.HashMap;
77

8+
import org.apache.log4j.Level;
89
import org.apache.log4j.Logger;
910
import org.dataflowanalysis.converter.web2dfd.model.WebEditorDfd;
1011
import org.dataflowanalysis.standalone.analysis.Converter;
@@ -78,6 +79,7 @@ public void onWebSocketError(Throwable cause)
7879
}
7980

8081
private String handleIncomingMessage(int id, String message) {
82+
logger.setLevel(Level.DEBUG);
8183
logger.info("Message received");
8284
logger.debug(message);
8385

0 commit comments

Comments
 (0)