remove WorkflowComponentWithConfig

David Baum · David Baum · commit 834d52db469a · 2018-07-18T20:51:47.000+02:00
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
@@ -1,7 +1,6 @@
 module org.svis.generator.run.city
 
 var inputPath = "./input/famix"
-var configPath = "config.json"
 
 Workflow {
 
@@ -34,7 +33,6 @@ Workflow {
 	
 	component = org.svis.generator.famix.Famix2DB {
 		modelSlot = 'metadata'
-		config = configPath
 	}
 
 	//transformation 2: from City to City
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
@@ -1,7 +1,6 @@
 module org.svis.generator.run.db
 
 var path = "./input/famix"
-var configPath = "config.json"
 
 Workflow {
 
@@ -24,13 +23,11 @@ Workflow {
 	// delete unnecessary objects
 	component = org.svis.generator.famix.Famix2Famix {
 		modelSlot = "famix"
-		config = configPath
 	}
 		
 	// transform famix into disks (s2m)
 	component = org.svis.generator.rd.s2m.Famix2RD {
 		modelSlot = "famix"
-		config = configPath
 	}
 	
 	//transformation 1: from FAMIX to CITY
@@ -40,7 +37,6 @@ Workflow {
 	
 	component = org.svis.generator.famix.Famix2DB {
 		modelSlot = "famix"
-		config = configPath
 	}
 
 	// calculate rd layout (m2m)
@@ -50,7 +46,6 @@ Workflow {
 
 	component = org.svis.generator.rd.m2t.RD2DB {
 		modelSlot = 'rdextended'
-		config = configPath
 	}
 	
 	//transformation 2: from City to City
@@ -60,6 +55,5 @@ Workflow {
 	
 	component = org.svis.generator.city.m2t.City2DB {
 		modelSlot = 'CITYv2'
-		config = configPath
 	}
 }
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
@@ -1,7 +1,6 @@
 module org.svis.generator.run.rd
 
 var path = "./input/famix"
-var configPath = "config.json"
 
 Workflow {
 
@@ -24,18 +23,15 @@ Workflow {
 	// delete unnecessary objects
 	component = org.svis.generator.famix.Famix2Famix {
 		modelSlot = "famix"
-		config = configPath
 	}
 		
 	// transform famix into disks (s2m)
 	component = org.svis.generator.rd.s2m.Famix2RD {
 		modelSlot = "famix"
-		config = configPath
 	}
 	
 	component = org.svis.generator.famix.Famix2DB {
 		modelSlot = "famix"
-		config = configPath
 	}
 
 	// calculate rd layout (m2m)
@@ -45,6 +41,5 @@ Workflow {
 
 	component = org.svis.generator.rd.m2t.RD2DB {
 		modelSlot = 'rdextended'
-		config = configPath
 	}
 }
diff --git a/generator/org.svis.generator/src/org/svis/generator/WorkflowComponentWithConfig.xtend b/generator/org.svis.generator/src/org/svis/generator/WorkflowComponentWithConfig.xtend
diff --git a/generator/org.svis.generator/src/org/svis/generator/city/m2t/City2DB.xtend b/generator/org.svis.generator/src/org/svis/generator/city/m2t/City2DB.xtend
@@ -2,17 +2,21 @@ package org.svis.generator.city.m2t
 
 import org.svis.lib.database.Database 
 import org.svis.xtext.city.District
-import org.svis.generator.WorkflowComponentWithConfig
 import org.eclipse.emf.mwe.core.WorkflowContext
 import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
 import org.eclipse.emf.mwe.core.issues.Issues
 import org.neo4j.graphdb.GraphDatabaseService
 import org.svis.xtext.city.Root
 import org.neo4j.graphdb.ConstraintViolationException
 import org.svis.lib.database.DBConnector
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.apache.commons.logging.LogFactory
+import org.svis.generator.SettingsConfiguration
 
-class City2DB extends WorkflowComponentWithConfig {
-
+class City2DB extends WorkflowComponentWithModelSlot {
+	
+	val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var GraphDatabaseService graphDb
 	var DBConnector dbconnector
 
@@ -22,7 +26,7 @@ class City2DB extends WorkflowComponentWithConfig {
 		dbconnector = new DBConnector(graphDb)
 		val resource = (ctx.get("CITYv2writer") as Root).document
 		val tx = graphDb.beginTx
-		val configSnapshotId = config.snapshotID
+		val configSnapshotId = ""//config.snapshotID
 		try {
 			dbconnector.createCityNode(configSnapshotId)
 			resource.entities.filter(District).filter[level == 1].forEach[dbconnector.addToDB(it)] 
diff --git a/generator/org.svis.generator/src/org/svis/generator/famix/Famix2DB.xtend b/generator/org.svis.generator/src/org/svis/generator/famix/Famix2DB.xtend
@@ -8,7 +8,6 @@ import org.svis.xtext.famix.FAMIXMethod
 import org.svis.xtext.famix.FAMIXAttribute
 import org.svis.xtext.famix.FAMIXEnumValue
 import org.neo4j.graphdb.ConstraintViolationException
-import org.svis.generator.WorkflowComponentWithConfig
 import org.eclipse.emf.mwe.core.WorkflowContext
 import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
 import org.eclipse.emf.mwe.core.issues.Issues
@@ -20,8 +19,13 @@ import org.svis.lib.database.Database
 import org.neo4j.graphdb.GraphDatabaseService
 import java.util.Map
 import org.svis.lib.database.DBConnector
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.svis.generator.SettingsConfiguration
+import org.apache.commons.logging.LogFactory
 
-class Famix2DB extends WorkflowComponentWithConfig  {
+class Famix2DB extends WorkflowComponentWithModelSlot  {
+	val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var GraphDatabaseService graphDb
 	var DBConnector dbconnector 
 	var Node rootNode
@@ -76,12 +80,12 @@ class Famix2DB extends WorkflowComponentWithConfig  {
 		val Map<String, String> nodeProperties = newHashMap
 		nodeProperties.put("repositoryName", config.repositoryName)
  	    nodeProperties.put("repositoryOwner", config.repositoryOwner)
- 		nodeProperties.put("systemId", config.systemID)
- 		nodeProperties.put("repositoryUrl", config.repositoryUrl)
- 		nodeProperties.put("language", config.language)
- 		nodeProperties.put("commitOrder", config.commitOrder.toString)
- 		nodeProperties.put("snapshotId", config.snapshotID)
- 		nodeProperties.put("commit" , config.commit)
+ 		//nodeProperties.put("systemId", config.systemID)
+ 		//nodeProperties.put("repositoryUrl", config.repositoryUrl)
+ 		//nodeProperties.put("language", config.language)
+ 		//nodeProperties.put("commitOrder", config.commitOrder.toString)
+ 		//nodeProperties.put("snapshotId", config.snapshotID)
+ 		//nodeProperties.put("commit" , config.commit)
  		return nodeProperties
 	}
 	
diff --git a/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphere.xtend b/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphere.xtend
@@ -10,10 +10,12 @@ import org.svis.xtext.graph.Edge
 import org.svis.xtext.graph.Model
 import org.svis.xtext.graph.Node
 import org.svis.xtext.graph.impl.GraphFactoryImpl
-import org.svis.generator.WorkflowComponentWithConfig
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.apache.commons.logging.LogFactory
 
-class Graph2MultiSphere extends WorkflowComponentWithConfig {
-	
+class Graph2MultiSphere extends WorkflowComponentWithModelSlot {
+	//val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var Model graphRoot
 	var myGraphFactory = new GraphFactoryImpl
 	
diff --git a/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphereBU.xtend b/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphereBU.xtend
@@ -8,10 +8,12 @@ import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
 import org.svis.xtext.graph.Model
 import org.svis.xtext.graph.Node
 import org.svis.xtext.graph.impl.GraphFactoryImpl
-import org.svis.generator.WorkflowComponentWithConfig
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.apache.commons.logging.LogFactory
 
-class Graph2MultiSphereBU extends WorkflowComponentWithConfig {
-	
+class Graph2MultiSphereBU extends WorkflowComponentWithModelSlot {
+	//val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var Model graphRoot
 	var myGraphFactory = new GraphFactoryImpl
 	
diff --git a/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphereRings.xtend b/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphereRings.xtend
@@ -17,10 +17,12 @@ import org.abego.treelayout.util.DefaultTreeForTreeLayout
 import org.abego.treelayout.util.DefaultConfiguration
 import org.abego.treelayout.util.FixedNodeExtentProvider
 import org.abego.treelayout.TreeLayout
-import org.svis.generator.WorkflowComponentWithConfig
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.apache.commons.logging.LogFactory
 
-class Graph2MultiSphereRings extends WorkflowComponentWithConfig {
-	
+class Graph2MultiSphereRings extends WorkflowComponentWithModelSlot {
+	//val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var Model graphRoot
 	var myGraphFactory = new GraphFactoryImpl
 	
diff --git a/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphereTD.xtend b/generator/org.svis.generator/src/org/svis/generator/multisphere/m2m/Graph2MultiSphereTD.xtend
@@ -8,10 +8,12 @@ import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
 import org.svis.xtext.graph.Model
 import org.svis.xtext.graph.Node
 import org.svis.xtext.graph.impl.GraphFactoryImpl
-import org.svis.generator.WorkflowComponentWithConfig
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.apache.commons.logging.LogFactory
 
-class Graph2MultiSphereTD extends WorkflowComponentWithConfig {
-	
+class Graph2MultiSphereTD extends WorkflowComponentWithModelSlot{
+	//val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var Model graphRoot
 	var myGraphFactory = new GraphFactoryImpl
 	
diff --git a/generator/org.svis.generator/src/org/svis/generator/multisphere/s2m/Famix2Graph.xtend b/generator/org.svis.generator/src/org/svis/generator/multisphere/s2m/Famix2Graph.xtend
@@ -15,10 +15,11 @@ import org.svis.xtext.famix.Root
 import org.svis.xtext.graph.Model
 import org.svis.xtext.graph.Node
 import org.svis.xtext.graph.impl.GraphFactoryImpl
-import org.svis.generator.WorkflowComponentWithConfig
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.apache.commons.logging.LogFactory
 
-class Famix2Graph extends WorkflowComponentWithConfig{
-	
+class Famix2Graph extends WorkflowComponentWithModelSlot {
+	val log = LogFactory::getLog(class)
 	val graphFactory = new GraphFactoryImpl()
 	var Document famixDocument
 	var Model graphRoot
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
@@ -1,6 +1,5 @@
 package org.svis.generator.rd.m2t
 
-import org.svis.generator.WorkflowComponentWithConfig
 import org.eclipse.emf.mwe.core.WorkflowContext
 import org.eclipse.emf.mwe.core.monitor.ProgressMonitor
 import org.eclipse.emf.mwe.core.issues.Issues
@@ -10,8 +9,13 @@ import org.neo4j.graphdb.ConstraintViolationException
 import org.svis.lib.database.Database
 import org.svis.lib.database.DBConnector
 import java.util.ArrayList
+import org.eclipse.emf.mwe.core.lib.WorkflowComponentWithModelSlot
+import org.svis.generator.SettingsConfiguration
+import org.apache.commons.logging.LogFactory
 
-class RD2DB extends WorkflowComponentWithConfig {
+class RD2DB extends WorkflowComponentWithModelSlot {
+	val config = SettingsConfiguration.instance
+	val log = LogFactory::getLog(class)
 	var GraphDatabaseService graphDb
 	var DBConnector dbconnector
 
@@ -22,7 +26,7 @@ class RD2DB extends WorkflowComponentWithConfig {
 		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
+		val configSnapshotId = ""//config.snapshotID
 		try {
 			dbconnector.createRDNode(rootDisks,configSnapshotId)
 			try {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`module org.svis.generator.run.db`
`2`	`2`
`3`	`3`	`var path = "./input/famix"`
`4`		`-var configPath = "config.json"`
`5`	`4`
`6`	`5`	`Workflow {`
`7`	`6`
`@@ -24,13 +23,11 @@ Workflow {`
`24`	`23`	`// delete unnecessary objects`
`25`	`24`	`component = org.svis.generator.famix.Famix2Famix {`
`26`	`25`	`modelSlot = "famix"`
`27`		`- config = configPath`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`// transform famix into disks (s2m)`
`31`	`29`	`component = org.svis.generator.rd.s2m.Famix2RD {`
`32`	`30`	`modelSlot = "famix"`
`33`		`- config = configPath`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`//transformation 1: from FAMIX to CITY`
`@@ -40,7 +37,6 @@ Workflow {`
`40`	`37`
`41`	`38`	`component = org.svis.generator.famix.Famix2DB {`
`42`	`39`	`modelSlot = "famix"`
`43`		`- config = configPath`
`44`	`40`	`}`
`45`	`41`
`46`	`42`	`// calculate rd layout (m2m)`
`@@ -50,7 +46,6 @@ Workflow {`
`50`	`46`
`51`	`47`	`component = org.svis.generator.rd.m2t.RD2DB {`
`52`	`48`	`modelSlot = 'rdextended'`
`53`		`- config = configPath`
`54`	`49`	`}`
`55`	`50`
`56`	`51`	`//transformation 2: from City to City`
`@@ -60,6 +55,5 @@ Workflow {`
`60`	`55`
`61`	`56`	`component = org.svis.generator.city.m2t.City2DB {`
`62`	`57`	`modelSlot = 'CITYv2'`
`63`		`- config = configPath`
`64`	`58`	`}`
`65`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`module org.svis.generator.run.rd`
`2`	`2`
`3`	`3`	`var path = "./input/famix"`
`4`		`-var configPath = "config.json"`
`5`	`4`
`6`	`5`	`Workflow {`
`7`	`6`
`@@ -24,18 +23,15 @@ Workflow {`
`24`	`23`	`// delete unnecessary objects`
`25`	`24`	`component = org.svis.generator.famix.Famix2Famix {`
`26`	`25`	`modelSlot = "famix"`
`27`		`- config = configPath`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`// transform famix into disks (s2m)`
`31`	`29`	`component = org.svis.generator.rd.s2m.Famix2RD {`
`32`	`30`	`modelSlot = "famix"`
`33`		`- config = configPath`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`component = org.svis.generator.famix.Famix2DB {`
`37`	`34`	`modelSlot = "famix"`
`38`		`- config = configPath`
`39`	`35`	`}`
`40`	`36`
`41`	`37`	`// calculate rd layout (m2m)`
`@@ -45,6 +41,5 @@ Workflow {`
`45`	`41`
`46`	`42`	`component = org.svis.generator.rd.m2t.RD2DB {`
`47`	`43`	`modelSlot = 'rdextended'`
`48`		`- config = configPath`
`49`	`44`	`}`
`50`	`45`	`}`