Can run DrAST as a JAR now.

- removed DrAST config
- removed old Gradle subprojects
- changed Main to accept filename for input to be parsed

settings.gradle

 rootProject.name = 'ifm-refactoring-jastadd'
 
 include 'statemachine'
-include 'trainbenchmark'
-//include 'ragdoc-builder'
 include 'ragdoc-view'

statemachine/.gitignore

@@ -5,3 +5,4 @@ src/gen-res/
 /bin/
 logs/
 /doc/
+DrAST.cfg

statemachine/DrAST.cfg

-#DrAST settings file.
-#Mon Nov 18 17:23:41 CET 2019
-normalEdgeWidth=1.0
-showEdges=true
-refEdgeWidth=2.0
-NTA-depth=1
-NTA-cached=1
-dynamic-values=0
-prevJar=build/libs/statemachine-0.1.jar
-dashedVertexEdgeWidth=0.2
-NTA-computed=0
-normalVertexEdgeWidth=1.0
-nodeThreshold=1000
-showNodes=true
-curvedEdges=true
-dashedEdgeWidth=0.2

statemachine/build.gradle

 group 'de.tudresden.inf.st'
-version '2.0-SNAPSHOT'
+version '0.1'
 
 apply plugin: 'java'
 apply plugin: 'jastadd'
@@ -62,25 +62,29 @@ buildscript {
 jar {
     manifest {
         attributes(
-                'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
                 'Main-Class': 'de.tudresden.inf.st.statemachine.Main'
         )
     }
 }
 
-task DrAST(type: JavaExec, dependsOn:jar) {
-    group = "verification"
-    description = 'run the DrAST visual debugger tool'
-    classpath = sourceSets.test.runtimeClasspath
-    main = 'de.tudresden.inf.st.statemachine.DrAstRunner'
+task jarDrAst(type: Jar) {
+    group = "build"
+    description = 'create a jar to runthe DrAST visual debugger tool'
+    manifest {
+        attributes 'Implementation-Title': 'DrAST visual debugger tool for StateMachine',
+                'Implementation-Version': project.version,
+                'Main-Class': 'de.tudresden.inf.st.statemachine.DrAstRunner'
+    }
+    archivesBaseName = 'drast-statemachine-all'
+    from { sourceSets.main.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
 }
 
-String[] drastArguments = ['../libs/DrAST-1.2.2.jar']
-task DrASTjar(type: JavaExec, dependsOn:jar) {
-    group = "verification"
-    description = 'run the DrAST visual debugger tool as a JAR'
-    main = '-jar'
-    args drastArguments
+task runDrAST(type: JavaExec, dependsOn:jar) {
+    group = "application"
+    description = 'run the DrAST visual debugger tool'
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'de.tudresden.inf.st.statemachine.DrAstRunner'
 }
 
 def relastFiles = fileTree('src/main/jastadd/') {

statemachine/run_DrAST.sh

+#!/bin/bash
+java -Dlog4j2.disableJmx=true -jar build/libs/drast-statemachine-all-0.1.jar

statemachine/src/main/jastadd/Util.jadd

@@ -33,7 +33,7 @@ aspect JastAddAPIExtension {
     return getLabel();
   }
 
-  public String State.toString() {
+  public String Element.toString() {
     return getLabel();
   }
 }

statemachine/src/main/java/de/tudresden/inf/st/statemachine/DrAstRunner.java

@@ -38,14 +38,15 @@ public class DrAstRunner extends DrASTGUI {
   private static void openView() {
     guiHasBeenCreated = true;
     DrASTSettings.put(DrASTSettings.PREV_JAR, "build/libs/statemachine-0.1.jar");
-    launch(new String[0]);
+    DrASTSettings.put(DrASTSettings.PREV_TAIL_ARGS, "-Dlog4j2.disable.jmx=true");
+    launch();
     con.onApplicationClose();
   }
 
   public void setRoot(Object root) {
     long timeStart = System.currentTimeMillis();
     DrAST newAst = new DrAST(root, TreeFilter.readFilter(con.getFilter()));
-    Log.info("Filter update: done after %d ms", new Object[]{System.currentTimeMillis() - timeStart});
+    Log.info("Filter update: done after %d ms", System.currentTimeMillis() - timeStart);
     Platform.runLater(() -> {
       mon.reset(newAst);
       if (guiHasBeenCreated) {
@@ -59,8 +60,8 @@ public class DrAstRunner extends DrASTGUI {
 
   public void start(Stage stage) throws Exception {
     FXMLLoader loader = new FXMLLoader();
-    Parent rootView = (Parent)loader.load(this.getClass().getResource("/main.fxml").openStream());
-    con = (Controller)loader.getController();
+    Parent rootView = loader.load(this.getClass().getResource("/main.fxml").openStream());
+    con = loader.getController();
     mon.setParentStage(stage);
     mon.setController(con);
     mon.setDrASTUI(this);

statemachine/src/main/java/de/tudresden/inf/st/statemachine/Main.java

 package de.tudresden.inf.st.statemachine;
 
-import de.tudresden.inf.st.statemachine.jastadd.model.*;
-import drast.model.DrAST;
+import beaver.Parser;
+import de.tudresden.inf.st.statemachine.jastadd.model.State;
+import de.tudresden.inf.st.statemachine.jastadd.model.StateMachine;
+import de.tudresden.inf.st.statemachine.jastadd.model.Transition;
 
+import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.Set;
 
 public class Main {
 
+	@SuppressWarnings("WeakerAccess")
 	public static Object DrAST_root_node;
 
 	public static void main(String[] args) {
-		// manual construction of a simple statemachine
-		// (S) -- 1 --> (A) -- 3 --> (E)
-		//  ^            |
-		//  \            /
-		//  `---- 2 ----*
-		StateMachine statemachine = new StateMachine();
-		State start = new State();
-		start.setLabel("S");
-		State stateA = new State();
-		stateA.setLabel("A");
-		State end = new State();
-		end.setLabel("E");
-		Transition t1 = new Transition();
-		t1.setLabel("1");
-		Transition t2 = new Transition();
-		t2.setLabel("2");
-		Transition t3 = new Transition();
-		t3.setLabel("3");
-		t1.setFrom(start);
-		t1.setTo(stateA);
-		t2.setFrom(stateA);
-		t2.setTo(start);
-		t3.setFrom(stateA);
-		t3.setTo(end);
-		statemachine.addElement(start);
-		statemachine.addElement(stateA);
-		statemachine.addElement(end);
-		statemachine.setInitial(start);
-		statemachine.addFinal(end);
+		if (args.length == 0) {
+			// manual construction of a simple statemachine
+			// (S) -- 1 --> (B) -- 3 --> (E)
+			//  ^            |
+			//  \            /
+			//  `---- 2 ----*
+			StateMachine statemachine = new StateMachine();
+			State start = new State();
+			start.setLabel("S");
+			State stateB = new State();
+			stateB.setLabel("B");
+			State end = new State();
+			end.setLabel("E");
+			Transition t1 = new Transition();
+			t1.setLabel("1");
+			Transition t2 = new Transition();
+			t2.setLabel("2");
+			Transition t3 = new Transition();
+			t3.setLabel("3");
+			t1.setFrom(start);
+			t1.setTo(stateB);
+			t2.setFrom(stateB);
+			t2.setTo(start);
+			t3.setFrom(stateB);
+			t3.setTo(end);
+			statemachine.addElement(start);
+			statemachine.addElement(stateB);
+			statemachine.addElement(end);
+			statemachine.setInitial(start);
+			statemachine.addFinal(end);
 
-		// reachability analysis
-		Set<Set<State>> sccs = statemachine.SCC();
-		System.out.println("SCCs found:");
-		for (Set<State> scc : sccs) {
-			System.out.println(scc);
+			// reachability analysis
+			Set<Set<State>> sccs = statemachine.SCC();
+			System.out.println("SCCs found:");
+			for (Set<State> scc : sccs) {
+				System.out.println(scc);
+			}
+			DrAST_root_node = statemachine;
+		} else {
+			// load the file given as first argument
+			try {
+				StateMachine stateMachine = ParserUtils.load(Paths.get(args[0]));
+				stateMachine.treeResolveAll();
+				DrAST_root_node = stateMachine;
+			} catch (IOException | Parser.Exception e) {
+				e.printStackTrace();
+			}
 		}
-
-		DrAST_root_node = statemachine;
-//		DrAST.ui.DrASTUI debugger = new DrAST.ui.DrASTUI(statemachine);
 	}
 
 }

statemachine/src/main/java/de/tudresden/inf/st/statemachine/ParserUtils.java

+package de.tudresden.inf.st.statemachine;
+
+import beaver.Parser;
+import de.tudresden.inf.st.statemachine.jastadd.model.StateMachine;
+import de.tudresden.inf.st.statemachine.jastadd.parser.StateMachineParser;
+import de.tudresden.inf.st.statemachine.jastadd.scanner.StateMachineScanner;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Utility methods for loading statemachine files.
+ *
+ * @author rschoene - Initial contribution
+ */
+public class ParserUtils {
+  static StateMachine load(Path path) throws IOException, Parser.Exception {
+    Reader reader = Files.newBufferedReader(path);
+    StateMachineScanner scanner = new StateMachineScanner(reader);
+    StateMachineParser parser = new StateMachineParser();
+    StateMachine result = (StateMachine) parser.parse(scanner);
+    reader.close();
+    return result;
+  }
+}

statemachine/src/test/java/de/tudresden/inf/st/statemachine/ParserTest.java

@@ -4,14 +4,9 @@ import beaver.Parser;
 import de.tudresden.inf.st.statemachine.jastadd.model.State;
 import de.tudresden.inf.st.statemachine.jastadd.model.StateMachine;
 import de.tudresden.inf.st.statemachine.jastadd.model.Transition;
-import de.tudresden.inf.st.statemachine.jastadd.parser.StateMachineParser;
-import de.tudresden.inf.st.statemachine.jastadd.scanner.StateMachineScanner;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.io.Reader;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -21,7 +16,7 @@ import static org.hamcrest.collection.IsEmptyCollection.empty;
 import static org.junit.Assert.*;
 
 /**
- * TODO: Add description.
+ * Testing the statemachine parser.
  *
  * @author rschoene - Initial contribution
  */
@@ -29,7 +24,7 @@ public class ParserTest {
 
   @Test
   public void test1() throws IOException, Parser.Exception {
-    StateMachine stateMachine = load(Paths.get("src", "test", "resources", "machine_one.sm"));
+    StateMachine stateMachine = ParserUtils.load(Paths.get("src", "test", "resources", "machine_one.sm"));
 
     assertEquals(6, stateMachine.getNumElement());
     assertEquals(3, stateMachine.states().size());
@@ -87,12 +82,4 @@ public class ParserTest {
     return s.getOutgoingList().stream().map(Transition::getTo).collect(Collectors.toList());
   }
 
-  private static StateMachine load(Path path) throws IOException, Parser.Exception {
-    Reader reader = Files.newBufferedReader(path);
-    StateMachineScanner scanner = new StateMachineScanner(reader);
-    StateMachineParser parser = new StateMachineParser();
-    StateMachine result = (StateMachine) parser.parse(scanner);
-    reader.close();
-    return result;
-  }
 }