update new workflows

David Baum · David Baum · commit 05da5fcf415f · 2018-07-19T22:34:46.000+02:00
diff --git a/generator/org.svis.generator.releng/.classpath b/generator/org.svis.generator.releng/.classpath
@@ -6,6 +6,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/Famix2Hismo.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/Famix2Hismo.mwe2
@@ -2,7 +2,6 @@ module org.svis.generator.run.Famix2Hismo
 
 var projectName = "org.svis.generator.run"
 var runtimeProject = "../${projectName}"
-var configPath = "./metadata.json"
 
 
 /**
@@ -21,9 +20,8 @@ Workflow {
 	}
 	
 	// Reads multiple famix models
-	component = org.svis.generator.ReaderWithConfig {
+	component =  org.eclipse.xtext.mwe.Reader {
 		register = org.svis.xtext.FamixStandaloneSetup {}
-		config = configPath
 		loadResource = {
 			slot = "famix"
 		}
@@ -36,7 +34,6 @@ Workflow {
 	
 	// Transforms multiple famix models into hismo
 	component = org.svis.generator.hismo.s2m.Famix2Hismo {
-		config = configPath
 		modelSlot = "famix"
 	}
 	
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/Famix2JQA.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/Famix2JQA.mwe2
@@ -11,7 +11,7 @@ Workflow {
     	registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"
 	}
 	
-	component = org.svis.generator.ReaderWithConfig {
+	component =  org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetupGenerated {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/plant/JQA2Plant.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/plant/JQA2Plant.mwe2
@@ -5,7 +5,6 @@ var outputPath = "./output/plant/famix"
 //var runtimeProject = "../${projectName}"
 var texturSourcePath = "org.svis.generator/src/org/svis/generator/plant/m2t/textures"
 var texturDestinyPath = "org.svis.generator.run/output/plant/famix/pics"
-var configPath = "./input/famix/plantConfig.json"
 
 Workflow {
 
@@ -27,7 +26,6 @@ Workflow {
 	// transform famix into disks (s2m)
 	component = org.svis.generator.plant.s2m.Famix2Plant {
 		modelSlot = "famix"
-		config = configPath
 	}
 	
 	// write metaData
@@ -48,7 +46,6 @@ Workflow {
 	// calculate  layout (m2m)
 	component = org.svis.generator.plant.m2m.Plant2Plant {
 		modelSlot = "plant"
-		config = configPath
 	}
 	
 	component = org.eclipse.emf.mwe.utils.Writer {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ module org.svis.generator.run.Famix2Hismo`
`2`	`2`
`3`	`3`	`var projectName = "org.svis.generator.run"`
`4`	`4`	`var runtimeProject = "../${projectName}"`
`5`		`-var configPath = "./metadata.json"`
`6`	`5`
`7`	`6`
`8`	`7`	`/**`
`@@ -21,9 +20,8 @@ Workflow {`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`// Reads multiple famix models`
`24`		`- component = org.svis.generator.ReaderWithConfig {`
	`23`	`+ component = org.eclipse.xtext.mwe.Reader {`
`25`	`24`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`26`		`- config = configPath`
`27`	`25`	`loadResource = {`
`28`	`26`	`slot = "famix"`
`29`	`27`	`}`
`@@ -36,7 +34,6 @@ Workflow {`
`36`	`34`
`37`	`35`	`// Transforms multiple famix models into hismo`
`38`	`36`	`component = org.svis.generator.hismo.s2m.Famix2Hismo {`
`39`		`- config = configPath`
`40`	`37`	`modelSlot = "famix"`
`41`	`38`	`}`
`42`	`39`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ Workflow {`
`11`	`11`	`registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"`
`12`	`12`	`}`
`13`	`13`
`14`		`- component = org.svis.generator.ReaderWithConfig {`
	`14`	`+ component = org.eclipse.xtext.mwe.Reader {`
`15`	`15`	`path = "${inputPath}"`
`16`	`16`	`register = org.svis.xtext.FamixStandaloneSetupGenerated {}`
`17`	`17`	`loadResource = {`