update workflows

David Baum · David Baum · commit af83f5da6e4a · 2018-07-18T23:09:34.000+02:00
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/city/Dynamix2City.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/city/Dynamix2City.mwe2
@@ -15,15 +15,15 @@ Workflow {
 	}
 
 	//input for reader
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
 			slot = "famix"
 		}
 	}
 	
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${dynamixPath}"
 		register = org.svis.xtext.DynamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/city/Famix2City.mwe2
@@ -13,7 +13,7 @@ Workflow {
 	}
 
 	//input for reader
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/city/Famix2City2DB.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/city/Famix2City2DB.mwe2
@@ -10,7 +10,7 @@ Workflow {
 	}
 
 	//input for reader
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/db/Famix2DB.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/db/Famix2DB.mwe2
@@ -9,7 +9,7 @@ Workflow {
     	registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"
 	}
 	
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${path}"
 		register = org.svis.xtext.FamixStandaloneSetupGenerated {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphere.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphere.mwe2
@@ -15,7 +15,7 @@ Workflow {
 	}
 	
 	// reader Famix
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphereBU.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphereBU.mwe2
@@ -15,7 +15,7 @@ Workflow {
 	}
 	
 	// reader Famix
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphereRings.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphereRings.mwe2
@@ -14,7 +14,7 @@ Workflow {
 	}
 	
 	// reader Famix
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphereTD.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/multisphere/Famix2MultiSphereTD.mwe2
@@ -15,7 +15,7 @@ Workflow {
 	}
 	
 	// reader Famix
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${inputPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/plant/Famix2Plant.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/plant/Famix2Plant.mwe2
@@ -16,7 +16,7 @@ Workflow {
     	registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"
 	}
 	
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${path}"
 		register = org.svis.xtext.FamixStandaloneSetupGenerated {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2
@@ -12,15 +12,15 @@ Workflow {
     	platformUri = "${runtimeProject}/.."
 	}
 	
-	component = org.svis.generator.ReaderWithConfig{
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${famixPath}"
 		register = org.svis.xtext.FamixStandaloneSetup {}
 		loadResource = {
 			slot = "famix"
 		}
 	}
 	
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${dynamixPath}"
 		register = org.svis.xtext.DynamixStandaloneSetup {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Famix2RD.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Famix2RD.mwe2
@@ -12,7 +12,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/rd/Famix2RD2DB.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Famix2RD2DB.mwe2
@@ -9,7 +9,7 @@ Workflow {
     	registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"
 	}
 	
-	component = org.svis.generator.ReaderWithConfig {
+	component = org.eclipse.xtext.mwe.Reader {
 		path = "${path}"
 		register = org.svis.xtext.FamixStandaloneSetupGenerated {}
 		loadResource = {
diff --git a/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Hismo2RD.mwe2 b/generator/org.svis.generator.run/src/org/svis/generator/run/rd/Hismo2RD.mwe2
@@ -39,16 +39,6 @@ Workflow {
 		}
 	}
 	
-//	// famix stats
-//	component = org.eclipse.xtext.generator.GeneratorComponent {
-//		register = org.svis.generator.FamixStatsStandaloneSetup {}
-//		slot = 'famixstats'
-//		outlet = {
-//			path = "output/rd"
-//		}
-//	}
-
-
 	// write out resulting model (rd)
 	component = org.eclipse.emf.mwe.utils.Writer {
 		modelSlot = "rdwriter"
diff --git a/generator/org.svis.generator/src/org/svis/generator/rd/m2t/RD2DB.xtend b/generator/org.svis.generator/src/org/svis/generator/rd/m2t/RD2DB.xtend
@@ -23,7 +23,7 @@ class RD2DB extends WorkflowComponentWithModelSlot {
 		log.info("RD2DB has started.")
 		graphDb = Database::getInstance(config.repositoryOwner, config.repositoryName)
 		dbconnector = new DBConnector(graphDb)
-		val resource = ((ctx.get("rd") as ArrayList).get(0) as Root).document
+		val resource = ((ctx.get("rd") as ArrayList<?>).get(0) as Root).document
 		val rootDisks = resource.disks.filter[level == 1].toList
 		val tx = graphDb.beginTx
 		val configSnapshotId = ""//config.snapshotID

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ Workflow {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`//input for reader`
`18`		`- component = org.svis.generator.ReaderWithConfig {`
	`18`	`+ component = org.eclipse.xtext.mwe.Reader {`
`19`	`19`	`path = "${inputPath}"`
`20`	`20`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`21`	`21`	`loadResource = {`
`22`	`22`	`slot = "famix"`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- component = org.svis.generator.ReaderWithConfig {`
	`26`	`+ component = org.eclipse.xtext.mwe.Reader {`
`27`	`27`	`path = "${dynamixPath}"`
`28`	`28`	`register = org.svis.xtext.DynamixStandaloneSetup {}`
`29`	`29`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ Workflow {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`//input for reader`
`16`		`- component = org.svis.generator.ReaderWithConfig {`
	`16`	`+ component = org.eclipse.xtext.mwe.Reader {`
`17`	`17`	`path = "${inputPath}"`
`18`	`18`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`19`	`19`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Workflow {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`//input for reader`
`13`		`- component = org.svis.generator.ReaderWithConfig {`
	`13`	`+ component = org.eclipse.xtext.mwe.Reader {`
`14`	`14`	`path = "${inputPath}"`
`15`	`15`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`16`	`16`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Workflow {`
`9`	`9`	`registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"`
`10`	`10`	`}`
`11`	`11`
`12`		`- component = org.svis.generator.ReaderWithConfig {`
	`12`	`+ component = org.eclipse.xtext.mwe.Reader {`
`13`	`13`	`path = "${path}"`
`14`	`14`	`register = org.svis.xtext.FamixStandaloneSetupGenerated {}`
`15`	`15`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Workflow {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`// reader Famix`
`18`		`- component = org.svis.generator.ReaderWithConfig {`
	`18`	`+ component = org.eclipse.xtext.mwe.Reader {`
`19`	`19`	`path = "${inputPath}"`
`20`	`20`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`21`	`21`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Workflow {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`// reader Famix`
`17`		`- component = org.svis.generator.ReaderWithConfig {`
	`17`	`+ component = org.eclipse.xtext.mwe.Reader {`
`18`	`18`	`path = "${inputPath}"`
`19`	`19`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`20`	`20`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ Workflow {`
`16`	`16`	`registerGeneratedEPackage = "org.svis.xtext.famix.FamixPackage"`
`17`	`17`	`}`
`18`	`18`
`19`		`- component = org.svis.generator.ReaderWithConfig {`
	`19`	`+ component = org.eclipse.xtext.mwe.Reader {`
`20`	`20`	`path = "${path}"`
`21`	`21`	`register = org.svis.xtext.FamixStandaloneSetupGenerated {}`
`22`	`22`	`loadResource = {`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,15 @@ Workflow {`
`12`	`12`	`platformUri = "${runtimeProject}/.."`
`13`	`13`	`}`
`14`	`14`
`15`		`- component = org.svis.generator.ReaderWithConfig{`
	`15`	`+ component = org.eclipse.xtext.mwe.Reader {`
`16`	`16`	`path = "${famixPath}"`
`17`	`17`	`register = org.svis.xtext.FamixStandaloneSetup {}`
`18`	`18`	`loadResource = {`
`19`	`19`	`slot = "famix"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`- component = org.svis.generator.ReaderWithConfig {`
	`23`	`+ component = org.eclipse.xtext.mwe.Reader {`
`24`	`24`	`path = "${dynamixPath}"`
`25`	`25`	`register = org.svis.xtext.DynamixStandaloneSetup {}`
`26`	`26`	`loadResource = {`