small bug fixes

Author: David Baum

generator2/org.getaviz.generator/.project

@@ -10,16 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.xtext.ui.shared.xtextBuilder.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>

generator2/org.getaviz.generator/src/org/getaviz/generator/city/m2m/City2City.xtend

@@ -29,7 +29,7 @@ class City2City {
 	var Node model
 
 	new () {
-		log.info("CityModification started")
+		log.info("City2City started")
 		graph = Database::getInstance(config.databaseName)
 			var tx = graph.beginTx
 			try {
@@ -113,7 +113,7 @@ class City2City {
 			} finally {
 				tx.close
 			}
-			log.info("CityModification finished")
+			log.info("City2City finished")
 	}
 
 	def private void setDistrictAttributes(Path districtPath) {

generator2/org.getaviz.generator/src/org/getaviz/generator/jqa/JQA2JSON.xtend

@@ -193,7 +193,7 @@ class JQA2JSON {
 	
 	def private toMetaDataAnnotation(Node annotation) {
 		var belongsTo = ""
-		val parent = annotation.getRelationships(Direction.INCOMING, Rels.CONTAINS, Rels.DECLARES).head
+		val parent = annotation.getRelationships(Direction.INCOMING, Rels.CONTAINS, Rels.DECLARES).filter[hasProperty("Package")].head
 		if(parent !== null) {
 			belongsTo = parent.startNode.getProperty("hash") as String
 		}			
@@ -300,8 +300,12 @@ class JQA2JSON {
 	def private getParameters(Node method) {
 		val parameterList = newArrayList
 		val list = method.getRelationships(Rels.HAS, Direction.OUTGOING).map[endNode];
-		list.filter[hasLabel(Labels.Parameter)].sortBy[p|p.getProperty("index") as Integer].forEach[p|
-			parameterList += p.getSingleRelationship(Rels.OF_TYPE, Direction.OUTGOING).endNode.getProperty("name") as String
+		list.filter[hasLabel(Labels.Parameter)].sortBy[p|p.getProperty("index", 0) as Integer].forEach[p|
+			try {
+				parameterList += p.getSingleRelationship(Rels.OF_TYPE, Direction.OUTGOING).endNode.getProperty("name") as String
+			} catch (NullPointerException e) {
+				
+			}
 		]
 		return parameterList.removeBrackets
 	}

generator2/org.getaviz.generator/src/org/getaviz/generator/jqa/JQAEnhancement.xtend

@@ -56,7 +56,6 @@ class JQAEnhancement {
 			graph.traversalDescription.depthFirst.relationships(Rels.CONTAINS, Direction.OUTGOING).relationships(
 				Rels.DECLARES, Direction.OUTGOING).uniqueness(Uniqueness.NONE).evaluator(evaluator).traverse(package).
 				nodes.forEach [
-				//	log.debug(id)
 					var fqn = getProperty("fqn", "") as String
 					if (fqn.empty) {
 						val container = getSingleRelationship(Rels.DECLARES, Direction.INCOMING).startNode
@@ -80,9 +79,7 @@ class JQAEnhancement {
 						}
 						setProperty("fqn", fqn)
 					}
-					// fqn = fqn.replace("$", ".")
-					var hash = getProperty("hash", "") as String
-					if (hash.empty) {
+					if (!hasProperty("hash")) {
 						setProperty("hash", createHash(fqn))
 					}
 				]

generator2/org.getaviz.generator/src/org/getaviz/generator/jqa/JQAEvaluator.xtend

@@ -65,15 +65,6 @@ class JQAEvaluator implements Evaluator {
 				} else {
 					return Evaluation.INCLUDE_AND_CONTINUE
 				}
-
-//				val result = graph.execute(
-//					"MATCH (m1:Method)<-[:DECLARES]-(c:Type)-[:EXTENDS]->(p:Type)-[:DECLARES]->(m2) WHERE ID(m1) = " +
-//						node.id + " AND m1.signature = m2.signature RETURN m1")
-//				if (result === null) {
-//					return Evaluation.INCLUDE_AND_CONTINUE
-//				} else {
-//					return Evaluation.EXCLUDE_AND_CONTINUE
-//				}
 			}
 		}
 		return Evaluation.EXCLUDE_AND_PRUNE

generator2/org.getaviz.generator/src/org/getaviz/generator/rd/m2m/RD2RD.xtend

@@ -31,7 +31,7 @@ class RD2RD {
 	RGBColor[] NS_colors
 
 	new() {
-		log.info("RDModifikation started")
+		log.info("RD2RD started")
 		var tx = graph.beginTx
 		try {
 			var result = graph.execute(
@@ -91,7 +91,7 @@ class RD2RD {
 		} finally {
 			tx.close
 		}
-		log.info("RDModifikation finished")
+		log.info("RD2RD finished")
 	}
 
 	def private setNamespaceColor(Node namespaceDisk) {