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

Feat: Slight changes that allow batch conversion with the WebConverter #5

Merged
01Parzival10 merged 1 commit into from
May 27, 2025
Merged

Feat: Slight changes that allow batch conversion with the WebConverter #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public static void main(String[] args) {

} catch (Exception e) {
e.printStackTrace();
}

}
}
}
22 changes: 10 additions & 12 deletions ...ysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,21 @@ private String handleIncomingMessage(int id, String message) {
var objectMapper = new ObjectMapper();
WebEditorDfd newJson = null;

var name = message.split(":")[0];
message = message.replaceFirst(name + ":", "");

try {
if (message.startsWith("Json:")) {
message = message.substring(message.indexOf(":") + 1);

message = message.substring(message.indexOf(":") + 1);
newJson = deserializeJsonAndAnnotate(message);
}
else if (message.startsWith("Json2DFD:")) {
message = message.replaceFirst("Json2DFD:", "");
var name = message.split(":")[0];
message = message.replaceFirst(name + ":", "");
message = message.replaceFirst("Json2DFD:", "");
var webEditorDfd = deserializeJson(message);
return Converter.convertToDFDandStringify(webEditorDfd, name);
return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);
}
else if (message.startsWith("DFD:")) {
newJson = safeLoadAndConvertDFDString(message);
newJson = safeLoadAndConvertDFDString(message, name);
} else {
newJson = safeLoadAndConvertPCMString(message);
}
Expand All @@ -111,7 +111,7 @@ else if (message.startsWith("DFD:")) {
}

try {
return objectMapper.writeValueAsString(newJson);
return name + ":" + objectMapper.writeValueAsString(newJson);
} catch (JsonProcessingException e) {
return null;
}
Expand Down Expand Up @@ -145,10 +145,8 @@ private WebEditorDfd deserializeJson(String json) throws IllegalArgumentExceptio
return webEditorDfd;
}

private WebEditorDfd safeLoadAndConvertDFDString(String message) {
message = message.replaceFirst("DFD:", "");
String name = message.split(":")[0];
message = message.replaceFirst(name + ":", "");
private WebEditorDfd safeLoadAndConvertDFDString(String message, String name) {
message = message.replaceFirst("DFD:", "");
var dfdMessage = message.split("\n:DD:\n")[0];
var ddMessage = message.split("\n:DD:\n")[1];
try {
Expand Down