Refactor loading namespaces

Author: Valekta

generator/org.svis.generator/src/org/svis/generator/famix/Famix2Famix.xtend

@@ -45,7 +45,6 @@ import org.svis.lib.database.Database
 import org.svis.lib.database.DBConnector
 import org.neo4j.graphdb.Node
 import org.neo4j.graphdb.Label
-import org.neo4j.graphdb.Transaction
 import org.neo4j.graphdb.traversal.Evaluators
 import org.neo4j.graphdb.Direction
 
@@ -68,50 +67,37 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 		log.info("Famix2Famix has started.")
 
 		if (fromDB) {
-
 			val famixRoot = famixFactory.createRoot
 			val famixDocument = famixFactory.createDocument
 			famixRoot.document = famixDocument
 			graph = Database::getInstance("../databases/graph.db")
 			dbConnector = new DBConnector(graph)
-
+			
+			// Create Namespaces
 			val ts = graph.beginTx
 			try {
-				val nodes = graph.findNodes(Label.label("Package"))
 				val namespaces = newHashMap
-				val namespaceNodes = newArrayList
+				val parentNamespaces = newHashMap
+				val packageLabel = Label.label("Package")
+				val nodes = graph.findNodes(packageLabel)
 				while (nodes.hasNext) {
 					val node = nodes.next
-					val name = node.getProperty("name") as String
-					val fqn = node.getProperty("fqn") as String
-					val id = node.getId.toString
-					val namespace = famixFactory.createFAMIXNamespace
-					namespace.value = name
-					namespace.fqn = fqn
-					namespace.name = id
-					namespace.id = id
-					namespaces.put(node.id, namespace)
-					namespaceNodes.add(node)
+					var namespace = createNamespace(node)
 					famixDocument.elements += namespace
-				}
-				for (node : namespaceNodes) {
-					println(node.getProperty("name"))
+					namespaces.put(node.id, namespace)
 					val td = graph.traversalDescription.breadthFirst.relationships(Rels.CONTAINS, Direction.INCOMING).
 						evaluator(Evaluators.toDepth(1))
-					var parentNodes = td.traverse(node).nodes
-					val parentNamespaces = newArrayList
-					for (pNode : parentNodes) {
-						val id = pNode.id
-						if (namespaces.containsKey(id) && id != node.id)
-							parentNamespaces.add(pNode)
-					}
-					val ns = namespaces.get(node.id)
-					for(pNode : parentNamespaces) {
-						var ref = famixFactory.createIntegerReference
-						ref.ref = namespaces.get(pNode.id)
-						ns.parentScope = ref
+					for (parentNode : td.traverse(node).nodes) {	
+						if (parentNode.id != node.id && parentNode.hasLabel(packageLabel)) {
+							parentNamespaces.put(node.id,parentNode.id)		
+						}
 					}
 				}
+				parentNamespaces.forEach[childId , parentId |
+					var ref = famixFactory.createIntegerReference
+					ref.ref = namespaces.get(parentId)
+					namespaces.get(childId).parentScope = ref
+				]
 				ts.success
 			} catch (Exception e) {
 				print(e)
@@ -612,4 +598,16 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 		enumValues.removeAll(duplicateEnumValues)
 		structures.removeAll(duplicateAnnotationTypes)
 	}
+	
+	def createNamespace(Node node) {
+		val namespace = famixFactory.createFAMIXNamespace
+		val name = node.getProperty("name") as String
+		val fqn = node.getProperty("fqn") as String
+		val id = node.getId.toString
+		namespace.value = name
+		namespace.fqn = fqn
+		namespace.name = id
+		namespace.id = id
+		return namespace
+	}
 }