Load attributes from db

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.traversal.Evaluators
 import org.neo4j.graphdb.Direction
 import org.neo4j.graphdb.traversal.Uniqueness
 
@@ -114,6 +113,8 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 								type = "Class"
 							} else if (label.name == "Method") {
 								type = "Method"
+							} else if(label.name == "Field") {
+								type = "Field"
 							}
 						}
 						switch (type) {
@@ -171,6 +172,22 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 								method.sourceAnchor = anchorRef
 								famixDocument.elements += method
 							}
+							case "Field": {
+								val attribute = createAttribute(node)
+								val parentClass = classes.get(parent.id)
+								var ref = famixFactory.createIntegerReference
+								ref.ref = parentClass
+								attribute.parentType = ref
+								val fileAnchor = famixFactory.createFAMIXFileAnchor
+								val anchorRef = famixFactory.createIntegerReference
+								val attributeRef = famixFactory.createIntegerReference
+								fileAnchor.filename = parent.getProperty("sourceFileName") as String
+								anchorRef.ref = attribute
+								attributeRef.ref = fileAnchor
+								fileAnchor.element = attributeRef
+								attribute.sourceAnchor = anchorRef
+								famixDocument.elements+= attribute
+							}
 						}
 					]
 				]
@@ -679,7 +696,7 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 
 	def createNamespace(Node node) {
 		val namespace = famixFactory.createFAMIXNamespace
-		val id = node.getId.toString
+		val id = node.id.toString
 		namespace.name = id
 		namespace.id = id
 		namespace.value = node.getProperty("name") as String
@@ -689,7 +706,7 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 
 	def createClass(Node node) {
 		val class = famixFactory.createFAMIXClass
-		class.name = node.getId.toString
+		class.name = node.id.toString
 		if(node.hasProperty("name")) {
 			class.value = node.getProperty("name") as String
 		}		
@@ -712,7 +729,7 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 
 	def createMethod(Node node) {
 		val method = famixFactory.createFAMIXMethod
-		method.name = node.getId.toString
+		method.name = node.id.toString
 		if(node.hasProperty("name")) {
 			method.value = node.getProperty("name") as String
 		}	
@@ -728,4 +745,16 @@ class Famix2Famix extends WorkflowComponentWithConfig {
 		method.signature = node.getProperty("signature") as String
 		return method
 	}
+	
+	def createAttribute(Node node) {
+		val attribute = famixFactory.createFAMIXAttribute
+		attribute.name = node.id.toString
+		if(node.hasProperty("name")) {
+			attribute.value = node.getProperty("name") as String
+		}
+		if(node.hasProperty("visibility")) {
+			attribute.modifiers+= node.getProperty("visibility") as String
+		}
+		return attribute
+	}
 }

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

@@ -3,7 +3,6 @@ package org.svis.generator.famix
 import org.neo4j.graphdb.Path
 import org.neo4j.graphdb.traversal.Evaluation
 import org.neo4j.graphdb.traversal.Evaluator
-import org.neo4j.graphdb.Direction
 import org.neo4j.graphdb.Label
 
 class FamixEvaluator implements Evaluator {
@@ -24,6 +23,11 @@ class FamixEvaluator implements Evaluator {
 						result = Evaluation.INCLUDE_AND_CONTINUE
 				}
 			}
+			if(label.name == "Field") {
+				result = Evaluation.INCLUDE_AND_CONTINUE
+				//To-Do: Attribute entfernen, die nur lokal in Funktionen deklariert werden
+			}
+		
 		}
 		return result
 	}