Feat: Move analysis logic to converter

Author: 01Parzival10

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

@@ -113,13 +113,13 @@ public static WebEditorDfd analyzeAnnotate(WebEditorDfd webEditorDfd) {
 	    		var webEditorconverter = new Web2DFDConverter();
 	        	var dd = webEditorconverter.convert(new WebEditorConverterModel(webEditorDfd));
 	        	var dfdConverter = new DFD2WebConverter();
-	        	var newJson = dfdConverter.convert(dd).getModel();
-	        	if (webEditorDfd.constraints() != null && !webEditorDfd.constraints().isEmpty()) {
+	        	if (webEditorDfd.constraints() != null && !webEditorDfd.constraints().isEmpty()) {	        		
 	        		var constraints = parseConstraints(webEditorDfd);
-	        		var violations = runAnalysis(dd, constraints);
-	        		newJson.constraints().addAll(webEditorDfd.constraints()); //Reapply constraints
-	        		return annotateViolations(newJson, violations);
+	        		dfdConverter.setConditions(constraints);
 	        	}
+	        	var newJson = dfdConverter.convert(dd).getModel();
+	        	if (webEditorDfd.constraints() != null && !webEditorDfd.constraints().isEmpty()) 
+	        		newJson.constraints().addAll(webEditorDfd.constraints()); //Reapply constraints
 	        	return newJson;
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -183,17 +183,16 @@ private static List<DSLResult> runAnalysis(DataFlowDiagramAndDictionary dfd, Lis
 	    }
 
 	    private static WebEditorDfd annotateViolations(WebEditorDfd webEditorDfd, List<DSLResult> violations) {
-	    	Map<Child, List<String>> nodeToAnnotationMap = new HashMap<>();
+	    	Map<Child, List<Annotation>> nodeToAnnotationMap = new HashMap<>();
 
 	    	for (int i = 0; i < violations.size(); i++) {
 	    		var violation = violations.get(i);
 	    		violation.getMatchedVertices().stream().forEach(it -> {
 	    			var node = webEditorDfd.model().children().stream()
 	    					.filter(child -> child.id().equals(((Node)it.getReferencedElement()).getId())).findFirst().orElseThrow();
 	    			nodeToAnnotationMap.putIfAbsent(node, new ArrayList<>());
-	    			if (nodeToAnnotationMap.containsKey(node)) {
-	    				nodeToAnnotationMap.get(node).add("Constraint " + violation.getName() + " violated");
-	    			}
+	    			String message = "Constraint " + violation.getName() + " violated";
+    				nodeToAnnotationMap.get(node).add(new Annotation(message, "bolt", stringToColorHex(message), violation.getTransposeFlowGraph().hashCode()));
 	    		});
 	    	}
 
@@ -202,11 +201,8 @@ private static WebEditorDfd annotateViolations(WebEditorDfd webEditorDfd, List<D
 	    	for (Child child : webEditorDfd.model().children()) {
 	    		if (nodeToAnnotationMap.containsKey(child)) {
 	    			var annotations = child.annotations();
-	    			nodeToAnnotationMap.get(child).forEach(annotation -> {
-	    				annotations.add(new Annotation(annotation, "bolt", stringToColorHex(annotation)));
-	    			});
-	    			
 
+	    			annotations.addAll(nodeToAnnotationMap.get(child));
 
 	    			var newChild = new Child(child.text(), child.labels(), child.ports(), child.id(), child.type(), null, null, annotations, child.children());
 	    			newChildren.add(newChild);	    			
@@ -230,7 +226,7 @@ private static WebEditorDfd annotateViolations(WebEditorDfd webEditorDfd, List<D
 	    	return webEditorDfd;
 	    }
 
-	    public static String stringToColorHex(String input) {
+	    private static String stringToColorHex(String input) {
 	        byte[] hash;
 	        try {
 	            MessageDigest md = MessageDigest.getInstance("MD5");