Merge branch 'feature/db2famix' into development

Author: Valekta

generator/org.svis.app.analyzer.metrics/pom.xml

@@ -26,7 +26,7 @@
 	<dependency>
     	<groupId>org.neo4j</groupId>
     	<artifactId>neo4j</artifactId>
-    	<version>3.0.4</version>
+    	<version>3.3.5</version>
 	</dependency>
 	<dependency>
 		<groupId>org.svis.generator</groupId>

generator/org.svis.generator/pom.xml

@@ -25,7 +25,7 @@
 		<dependency>
     		<groupId>org.neo4j</groupId>
     		<artifactId>neo4j</artifactId>
-    		<version>3.1.0</version>
+    		<version>3.3.5</version>
 		</dependency>
 		<dependency>
     		<groupId>com.jayway.jsonpath</groupId>

generator/org.svis.generator/src/org/svis/generator/famix/DBLabel.java

@@ -0,0 +1,20 @@
+package org.svis.generator.famix;
+
+import org.neo4j.graphdb.Label;
+
+public class DBLabel {
+
+	public static Label PACKAGE = createLabel("Package");
+	public static Label MEMBER = createLabel("Member");
+	public static Label TYPE = createLabel("Type");
+	public static Label METHOD = createLabel("Method");
+	public static Label FIELD = createLabel("Field");
+	public static Label CLASS = createLabel("Class");
+	public static Label INTERFACE = createLabel("Interface");
+	public static Label ENUM = createLabel("Enum");
+	public static Label ANNOTATION = createLabel("Annotation");
+	
+	public static Label createLabel(String name) {
+		return Label.label(name);
+	}
+}

generator/org.svis.generator/src/org/svis/generator/famix/FAMIXSettings.java

@@ -27,8 +27,10 @@ public enum FAMIXSettings{;
 	 */
 	public static FamixParser FAMIX_PARSER = FamixParser.VERVEINEJ;
 
+	public static String DATABASE_NAME = "../databases/graph.db";
+	
 	public static enum FamixParser {
 
-		JDT2FAMIX,VERVEINEJ;	
+		JDT2FAMIX,VERVEINEJ,JQA_BYTECODE;	
 	}
 }