Merge branch '1-add-relast2uml-to-statemachine' into 'master'

Resolve "Add relast2uml to statemachine"

Closes #1

See merge request jastadd/ifm!1

build.gradle

@@ -10,9 +10,6 @@ allprojects  {
 subprojects {
 	apply plugin: 'java'
 
-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
-
 	task packageSources(type: Jar) {
 		classifier = 'sources'
 		from sourceSets.main.allSource
@@ -34,6 +31,10 @@ subprojects {
 
 	repositories {
 		mavenCentral()
+    maven {
+        name "gitlab-maven"
+        url "https://git-st.inf.tu-dresden.de/api/v4/groups/jastadd/-/packages/maven"
+    }
 	}
 
 	dependencies {

statemachine.drast/build.gradle

@@ -5,10 +5,6 @@ apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: "idea"
 
-sourceCompatibility = 1.8
-
-repositories.mavenCentral()
-
 dependencies {
 	implementation project(':statemachine.solution')
     implementation files('../libs/DrAST-1.2.2.jar')

statemachine.solution/.gitignore

@@ -5,3 +5,4 @@ src/gen-res/
 /bin/
 logs/
 /doc/
+/*.png

statemachine.solution/build.gradle

@@ -7,30 +7,26 @@ apply plugin: 'jastadd'
 apply plugin: 'application'
 apply plugin: "idea"
 
-sourceCompatibility = 1.8
-
-repositories.mavenCentral()
-
 buildscript {
-    repositories.mavenLocal()
     repositories.mavenCentral()
     dependencies {
         classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
     }
 }
 
-idea.module.generatedSourceDirs += file('src/gen/java')
-
 configurations {
     ragdoc
 }
 
-sourceSets.main.java.srcDir "src/gen/java"
-jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main')
+File genSrc = file("src/gen/java")
+idea.module.generatedSourceDirs += genSrc
+sourceSets.main.java.srcDir genSrc
+//jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main')
 
 dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
     implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
+    implementation group: 'de.tudresden.inf.st', name: 'dumpAstWithPlantuml', version: '0.3.5'
 
     jastadd2 "org.jastadd:jastadd:2.3.4"
     ragdoc files('../libs/rd-builder.jar')
@@ -39,7 +35,6 @@ dependencies {
 // Default run configuration
 run {
     mainClassName = 'de.tudresden.inf.st.statemachine.Main'
-    standardInput = System.in
 }
 
 // Generated files

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

 package de.tudresden.inf.st.statemachine;
 
 import beaver.Parser;
+import de.tudresden.inf.st.jastadd.dumpAst.ast.Dumper;
 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;
@@ -24,6 +25,7 @@ public class Main {
     }
     printHeading("Initial statemachine");
     System.out.println(stateMachine.prettyPrint());
+    Dumper.read(stateMachine).dumpAsPNG(Paths.get("01-initial.png"));
 
     stateMachine.printSomeAnalysis();
 
@@ -41,6 +43,7 @@ public class Main {
     }
     printHeading("DotGraph");
     System.out.println(stateMachine.toDot());
+    Dumper.read(stateMachine).dumpAsPNG(Paths.get("02-transformed.png"));
     DrAST_root_node = stateMachine;
   }
 

statemachine.task/.gitignore

@@ -5,3 +5,4 @@ src/gen-res/
 /bin/
 logs/
 /doc/
+/*.png

statemachine.task/build.gradle

@@ -7,30 +7,26 @@ apply plugin: 'jastadd'
 apply plugin: 'application'
 apply plugin: "idea"
 
-sourceCompatibility = 1.8
-
-repositories.mavenCentral()
-
 buildscript {
-    repositories.mavenLocal()
     repositories.mavenCentral()
     dependencies {
         classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
     }
 }
 
-idea.module.generatedSourceDirs += file('src/gen/java')
-
 configurations {
     ragdoc
 }
 
-sourceSets.main.java.srcDir "src/gen/java"
-jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main')
+File genSrc = file("src/gen/java")
+idea.module.generatedSourceDirs += genSrc
+sourceSets.main.java.srcDir genSrc
+//jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main')
 
 dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
     implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
+    implementation group: 'de.tudresden.inf.st', name: 'dumpAstWithPlantuml', version: '0.3.5'
 
     jastadd2 "org.jastadd:jastadd:2.3.4"
     ragdoc files('../libs/rd-builder.jar')
@@ -39,7 +35,6 @@ dependencies {
 // Default run configuration
 run {
     mainClassName = 'de.tudresden.inf.st.statemachine.Main'
-    standardInput = System.in
 }
 
 // Generated files

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

 package de.tudresden.inf.st.statemachine;
 
 import beaver.Parser;
+import de.tudresden.inf.st.jastadd.dumpAst.ast.Dumper;
 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;
@@ -24,6 +25,7 @@ public class Main {
     }
     printHeading("Initial statemachine");
     System.out.println(stateMachine.prettyPrint());
+    Dumper.read(stateMachine).dumpAsPNG(Paths.get("01-initial.png"));
 
     stateMachine.printSomeAnalysis();
 
@@ -39,6 +41,7 @@ public class Main {
       printHeading("StateMachine after");
       System.out.println(stateMachine.prettyPrint());
     }
+    Dumper.read(stateMachine).dumpAsPNG(Paths.get("02-transformed.png"));
     DrAST_root_node = stateMachine;
   }