Fix: DFD loading bug

01Parzival10 · 01Parzival10 · commit fe6263c0d0f9 · 2025-07-07T12:29:41.000+02:00
diff --git a/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java b/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java
@@ -100,7 +100,7 @@ else if (message.startsWith("Json2DFD:")) {
 			    return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);	
 	    	} 
 	    	else if (message.startsWith("DFD:")) {
-	    		newJson = safeLoadAndConvertDFDString(message, name);
+	    		newJson = safeLoadAndConvertDFDString(message);
 	    	} else {
 	    	    newJson = safeLoadAndConvertPCMString(message);
 	    	}
@@ -143,8 +143,10 @@ private WebEditorDfd deserializeJson(String json){
 		return webEditorDfd;
     }
     
-    private WebEditorDfd safeLoadAndConvertDFDString(String message, String name) {
+    private WebEditorDfd safeLoadAndConvertDFDString(String message) {
 		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 {            

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ else if (message.startsWith("Json2DFD:")) {`
`100`	`100`	`return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);`
`101`	`101`	`}`
`102`	`102`	`else if (message.startsWith("DFD:")) {`
`103`		`- newJson = safeLoadAndConvertDFDString(message, name);`
	`103`	`+ newJson = safeLoadAndConvertDFDString(message);`
`104`	`104`	`} else {`
`105`	`105`	`newJson = safeLoadAndConvertPCMString(message);`
`106`	`106`	`}`
`@@ -143,8 +143,10 @@ private WebEditorDfd deserializeJson(String json){`
`143`	`143`	`return webEditorDfd;`
`144`	`144`	`}`
`145`	`145`
`146`		`- private WebEditorDfd safeLoadAndConvertDFDString(String message, String name) {`
	`146`	`+ private WebEditorDfd safeLoadAndConvertDFDString(String message) {`
`147`	`147`	`message = message.replaceFirst("DFD:", "");`
	`148`	`+ var name = message.split(":")[0];`
	`149`	`+ message = message.replaceFirst(name + ":", "");`
`148`	`150`	`var dfdMessage = message.split("\n:DD:\n")[0];`
`149`	`151`	`var ddMessage = message.split("\n:DD:\n")[1];`
`150`	`152`	`try {`