Merge pull request #5 from DataFlowAnalysis/WebConverterUpdate

Feat: Slight changes that allow batch conversion with the WebConverter

Author: 01Parzival10

bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/Main.java

@@ -11,7 +11,6 @@ public static void main(String[] args) {
 
         } catch (Exception e) {
             e.printStackTrace();
-        }      
-
+        }
 	}
 }

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

@@ -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);
 	    	}
@@ -111,7 +111,7 @@ else if (message.startsWith("DFD:")) {
 		}
 
     	try {
-			return objectMapper.writeValueAsString(newJson);
+			return name + ":" + objectMapper.writeValueAsString(newJson);
 		} catch (JsonProcessingException e) {
 			return null;
 		}
@@ -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 {