Skip to content

Socket refactor #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Socket refactor #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
852ea59
Merge branch 'fix-behavior-analysis' of https://github.com/DataFlowAn…
01Parzival10 Sep 30, 2025
55e852f
Refactor: Clean up communication from/with websocket
01Parzival10 Sep 30, 2025
7305f91
Merge branch 'main' of https://github.com/DataFlowAnalysis/OnlineEdit…
01Parzival10 Oct 6, 2025
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
8 changes: 3 additions & 5 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 @@ -95,12 +95,12 @@ private String handleIncomingMessage(int id, String message) {
newJson = deserializeJsonAndAnnotate(message);
}
else if (message.startsWith("Json2DFD:")) {
message = message.replaceFirst("Json2DFD:" + name + ":", "");
message = message.replaceFirst("Json2DFD:", "");
var webEditorDfd = deserializeJson(message);
return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);
}
else if (message.startsWith("DFD:")) {
newJson = safeLoadAndConvertDFDString(message);
newJson = safeLoadAndConvertDFDString(message, name);
} else {
newJson = safeLoadAndConvertPCMString(message);
}
Expand Down Expand Up @@ -143,10 +143,8 @@ private WebEditorDfd deserializeJson(String json){
return webEditorDfd;
}

private WebEditorDfd safeLoadAndConvertDFDString(String message) {
private WebEditorDfd safeLoadAndConvertDFDString(String message, String name) {
message = message.replaceFirst("DFD:", "");
var name = message.split(":")[0];
message = message.replaceFirst(name + ":", "");
var dfdMessage = message.split("\n:DD:\n")[0];
var ddMessage = message.split("\n:DD:\n")[1];
try {
Expand Down
2 changes: 0 additions & 2 deletions frontend/webEditor/src/features/serialize/loadDFDandDD.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ export class LoadDFDandDDCommand extends Command {
// Send each file's content in separate WebSocket messages
sendMessage(
"DFD:" +
this.getFileNameWithoutExtension(dataflowFile) +
":" +
dataflowFileContent +
"\n:DD:\n" +
dictionaryFileContent,
Expand Down
2 changes: 1 addition & 1 deletion frontend/webEditor/src/features/serialize/saveDFDandDD.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class SaveDFDandDDCommand extends Command {
version: CURRENT_VERSION,
};
const diagramJson = JSON.stringify(diagram, undefined, 4);
sendMessage("Json2DFD:" + getModelFileName() + ":" + diagramJson);
sendMessage("Json2DFD:" + diagramJson);
return context.root;
}

Expand Down