Remove frontEnd (no idea why it was still here), fixed palladio dependency

Author: 01Parzival10

bundles/org.dataflowanalysis.standalone/.classpath

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry excluding="**/node_modules/" kind="src" path="resources"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

bundles/org.dataflowanalysis.standalone/META-INF/MANIFEST.MF

@@ -23,7 +23,9 @@ Require-Bundle: org.dataflowanalysis.dfd.datadictionary;bundle-version="2.0.0",
  org.dataflowanalysis.analysis.dfd;bundle-version="3.0.0",
  org.dataflowanalysis.converter;bundle-version="3.0.0",
  org.dataflowanalysis.pcm.extension.nodecharacteristics;bundle-version="0.1.0",
- org.dataflowanalysis.analysis.pcm
+ org.dataflowanalysis.analysis.pcm,
+ org.palladiosimulator.commons.stoex;bundle-version="5.2.1",
+ de.uka.ipd.sdq.stoex.analyser;bundle-version="5.2.1"
 Automatic-Module-Name: DataFlowAnalalysisStandalone
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: 

bundles/org.dataflowanalysis.standalone/build.properties

@@ -1,4 +1,4 @@
-source.. = src/, resources/
+source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

bundles/org.dataflowanalysis.standalone/resources/WebEditor

@@ -1,46 +1,40 @@
-package org.dataflowanalysis.standalone;
-
-import java.util.Scanner;
-
-import org.dataflowanalysis.standalone.frontend.FrontendUtils;
-import org.dataflowanalysis.standalone.websocket.WebSocketServerUtils;
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-
-public class Application implements IApplication {
-	@Override
-	public Object start(IApplicationContext context) throws Exception {		
-		try {			
-			           
-            Thread frontend =  FrontendUtils.startFrontendServerForApplication();
-            Thread webSocketServer = WebSocketServerUtils.startWebSocketServer();
-            
-           
-            Scanner scanner = new Scanner(System.in);
-            String input = "";
-
-            System.out.println("Type 'exit' to quit the program.");
-
-            // Loop until user types "exit"
-            
-            
-            while(frontend.isAlive() || webSocketServer.isAlive()) {
-            	while (!input.equalsIgnoreCase("exit")) {
-                    input = scanner.nextLine();
-                } 
-                FrontendUtils.stopFrontendServer();
-                scanner.close();
-                return IApplication.EXIT_OK;                
-            };
-            scanner.close();            
-        } catch (Exception e) {
-            e.printStackTrace();
-        }      
-		return IApplication.EXIT_OK;
-	}
-
-	@Override
-	public void stop() {
-		FrontendUtils.stopFrontendServer();		
-	}
-}
+package org.dataflowanalysis.standalone;
+
+import java.util.Scanner;
+
+import org.dataflowanalysis.standalone.websocket.WebSocketServerUtils;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+public class Application implements IApplication {
+	@Override
+	public Object start(IApplicationContext context) throws Exception {		
+		try {			
+            Thread webSocketServer = WebSocketServerUtils.startWebSocketServer();            
+           
+            Scanner scanner = new Scanner(System.in);
+            String input = "";
+
+            System.out.println("Type 'exit' to quit the program.");
+
+            // Loop until user types "exit"            
+            
+            while(webSocketServer.isAlive()) {
+            	while (!input.equalsIgnoreCase("exit")) {
+                    input = scanner.nextLine();
+            	}
+            	scanner.close();
+                return IApplication.EXIT_OK;                
+            };
+            scanner.close();            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }      
+		return IApplication.EXIT_OK;
+	}
+
+	@Override
+	public void stop() {
+		
+	}
+}

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

@@ -1,19 +1,17 @@
-package org.dataflowanalysis.standalone;
-
-import org.dataflowanalysis.standalone.frontend.FrontendUtils;
-import org.dataflowanalysis.standalone.websocket.WebSocketServerUtils;
-
-public class Main {
-	public static void main(String[] args) {		
-		try {			       
-            Thread frontEnd =  FrontendUtils.startFrontendServer();
-            Thread webSocketServer =  WebSocketServerUtils.startWebSocketServer();
-                        
-            while(frontEnd.isAlive() || webSocketServer.isAlive());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }      
-
-	}
-}
+package org.dataflowanalysis.standalone;
+
+import org.dataflowanalysis.standalone.websocket.WebSocketServerUtils;
+
+public class Main {
+	public static void main(String[] args) {		
+		try {			       
+            Thread webSocketServer =  WebSocketServerUtils.startWebSocketServer();
+                        
+            while(webSocketServer.isAlive());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }      
+
+	}
+}