Skip to content
Snippets Groups Projects
Commit 13904512 authored by Johannes Mey's avatar Johannes Mey
Browse files

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

Resolve "Add relast2uml to statemachine"

Closes #1

See merge request !1
parents 0b3c6787 261e79da
No related branches found
No related tags found
1 merge request!1Resolve "Add relast2uml to statemachine"
...@@ -10,9 +10,6 @@ allprojects { ...@@ -10,9 +10,6 @@ allprojects {
subprojects { subprojects {
apply plugin: 'java' apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
task packageSources(type: Jar) { task packageSources(type: Jar) {
classifier = 'sources' classifier = 'sources'
from sourceSets.main.allSource from sourceSets.main.allSource
...@@ -34,6 +31,10 @@ subprojects { ...@@ -34,6 +31,10 @@ subprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven {
name "gitlab-maven"
url "https://git-st.inf.tu-dresden.de/api/v4/groups/jastadd/-/packages/maven"
}
} }
dependencies { dependencies {
......
...@@ -5,10 +5,6 @@ apply plugin: 'java' ...@@ -5,10 +5,6 @@ apply plugin: 'java'
apply plugin: 'application' apply plugin: 'application'
apply plugin: "idea" apply plugin: "idea"
sourceCompatibility = 1.8
repositories.mavenCentral()
dependencies { dependencies {
implementation project(':statemachine.solution') implementation project(':statemachine.solution')
implementation files('../libs/DrAST-1.2.2.jar') implementation files('../libs/DrAST-1.2.2.jar')
......
...@@ -5,3 +5,4 @@ src/gen-res/ ...@@ -5,3 +5,4 @@ src/gen-res/
/bin/ /bin/
logs/ logs/
/doc/ /doc/
/*.png
...@@ -7,30 +7,26 @@ apply plugin: 'jastadd' ...@@ -7,30 +7,26 @@ apply plugin: 'jastadd'
apply plugin: 'application' apply plugin: 'application'
apply plugin: "idea" apply plugin: "idea"
sourceCompatibility = 1.8
repositories.mavenCentral()
buildscript { buildscript {
repositories.mavenLocal()
repositories.mavenCentral() repositories.mavenCentral()
dependencies { dependencies {
classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3' classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
} }
} }
idea.module.generatedSourceDirs += file('src/gen/java')
configurations { configurations {
ragdoc ragdoc
} }
sourceSets.main.java.srcDir "src/gen/java" File genSrc = file("src/gen/java")
jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main') idea.module.generatedSourceDirs += genSrc
sourceSets.main.java.srcDir genSrc
//jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main')
dependencies { dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" 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: '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" jastadd2 "org.jastadd:jastadd:2.3.4"
ragdoc files('../libs/rd-builder.jar') ragdoc files('../libs/rd-builder.jar')
...@@ -39,7 +35,6 @@ dependencies { ...@@ -39,7 +35,6 @@ dependencies {
// Default run configuration // Default run configuration
run { run {
mainClassName = 'de.tudresden.inf.st.statemachine.Main' mainClassName = 'de.tudresden.inf.st.statemachine.Main'
standardInput = System.in
} }
// Generated files // Generated files
......
package de.tudresden.inf.st.statemachine; package de.tudresden.inf.st.statemachine;
import beaver.Parser; 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.State;
import de.tudresden.inf.st.statemachine.jastadd.model.StateMachine; 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.model.Transition;
...@@ -24,6 +25,7 @@ public class Main { ...@@ -24,6 +25,7 @@ public class Main {
} }
printHeading("Initial statemachine"); printHeading("Initial statemachine");
System.out.println(stateMachine.prettyPrint()); System.out.println(stateMachine.prettyPrint());
Dumper.read(stateMachine).dumpAsPNG(Paths.get("01-initial.png"));
stateMachine.printSomeAnalysis(); stateMachine.printSomeAnalysis();
...@@ -41,6 +43,7 @@ public class Main { ...@@ -41,6 +43,7 @@ public class Main {
} }
printHeading("DotGraph"); printHeading("DotGraph");
System.out.println(stateMachine.toDot()); System.out.println(stateMachine.toDot());
Dumper.read(stateMachine).dumpAsPNG(Paths.get("02-transformed.png"));
DrAST_root_node = stateMachine; DrAST_root_node = stateMachine;
} }
......
...@@ -5,3 +5,4 @@ src/gen-res/ ...@@ -5,3 +5,4 @@ src/gen-res/
/bin/ /bin/
logs/ logs/
/doc/ /doc/
/*.png
...@@ -7,30 +7,26 @@ apply plugin: 'jastadd' ...@@ -7,30 +7,26 @@ apply plugin: 'jastadd'
apply plugin: 'application' apply plugin: 'application'
apply plugin: "idea" apply plugin: "idea"
sourceCompatibility = 1.8
repositories.mavenCentral()
buildscript { buildscript {
repositories.mavenLocal()
repositories.mavenCentral() repositories.mavenCentral()
dependencies { dependencies {
classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3' classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
} }
} }
idea.module.generatedSourceDirs += file('src/gen/java')
configurations { configurations {
ragdoc ragdoc
} }
sourceSets.main.java.srcDir "src/gen/java" File genSrc = file("src/gen/java")
jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main') idea.module.generatedSourceDirs += genSrc
sourceSets.main.java.srcDir genSrc
//jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.statemachine.Main')
dependencies { dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" 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: '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" jastadd2 "org.jastadd:jastadd:2.3.4"
ragdoc files('../libs/rd-builder.jar') ragdoc files('../libs/rd-builder.jar')
...@@ -39,7 +35,6 @@ dependencies { ...@@ -39,7 +35,6 @@ dependencies {
// Default run configuration // Default run configuration
run { run {
mainClassName = 'de.tudresden.inf.st.statemachine.Main' mainClassName = 'de.tudresden.inf.st.statemachine.Main'
standardInput = System.in
} }
// Generated files // Generated files
......
package de.tudresden.inf.st.statemachine; package de.tudresden.inf.st.statemachine;
import beaver.Parser; 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.State;
import de.tudresden.inf.st.statemachine.jastadd.model.StateMachine; 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.model.Transition;
...@@ -24,6 +25,7 @@ public class Main { ...@@ -24,6 +25,7 @@ public class Main {
} }
printHeading("Initial statemachine"); printHeading("Initial statemachine");
System.out.println(stateMachine.prettyPrint()); System.out.println(stateMachine.prettyPrint());
Dumper.read(stateMachine).dumpAsPNG(Paths.get("01-initial.png"));
stateMachine.printSomeAnalysis(); stateMachine.printSomeAnalysis();
...@@ -39,6 +41,7 @@ public class Main { ...@@ -39,6 +41,7 @@ public class Main {
printHeading("StateMachine after"); printHeading("StateMachine after");
System.out.println(stateMachine.prettyPrint()); System.out.println(stateMachine.prettyPrint());
} }
Dumper.read(stateMachine).dumpAsPNG(Paths.get("02-transformed.png"));
DrAST_root_node = stateMachine; DrAST_root_node = stateMachine;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment