Little fixes

src/be/jeffcheasey88/peeratcode/parser/java/Function.java

@@ -1,5 +1,6 @@
 package be.jeffcheasey88.peeratcode.parser.java;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import be.jeffcheasey88.peeratcode.parser.Token;
@@ -30,6 +31,8 @@ public class Function extends JavaElement implements Annotable, VariableContaine
 		this.mod = mod;
 		this.type = type;
 		this.name = name;
+		this.annotations = new ArrayList<>();
+		this.elements = new ArrayList<>();
 	}
 	
 	public Function(int mod, Token generic, Token type, Token name){

src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java

@@ -175,10 +175,17 @@ public class JavaParser extends Parser<JavaElement> {
 		
 		//VALUE
 		BiFunction<JavaElement, Bag, JavaElement> value_builder = (parent, bag) -> {
-			if(bag.has("right")){
-				BiValue result = new BiValue(bag.get("left"), bag.get("action"), bag.get("right"));
-				bag.set(result);
-			}
+//			if(bag.has("right")){
+//				
+//				BiValue result = new BiValue(
+//						
+//						bag.get("left"),
+//						
+//						bag.get("action"),
+//						
+//						bag.get("right"));
+//				bag.set(result);
+//			}
 			return null;
 		};
 		
@@ -443,7 +450,7 @@ public class JavaParser extends Parser<JavaElement> {
 				(token) -> token.getType().equals(TokenType.NAME),
 				(bag, token) -> bag.set("index", token)));
 		StateTree<JavaElement> annotation_value = annotation_var.then((validator) -> validator.validate((token) -> token.getValue().equals("=")))
-				.then(new RedirectStateTree<>(ValueTests.get(), (global, local) -> {
+				.then(new RedirectStateTree<>(value, (global, local) -> {
 					Map<Token, Value> map = global.get("values");
 					if(map == null){
 						map = new LinkedHashMap<>();
@@ -497,7 +504,7 @@ public class JavaParser extends Parser<JavaElement> {
 		variable_split.then(variable_name);
 		StateTree<JavaElement> variable_value = variable_name.then((validator) -> validator.validate((token) -> token.getValue().equals("=")))
 			.then(new RedirectStateTree<>(value_container, (global, local) -> {
-				global.<Map<Token, Value>>get("vars").put(global.get("last"), local.get());
+//				global.<Map<Token, Value>>get("vars").put(global.get("last"), local.get());
 			}));
 		variable_value.then(variable_split);
 		variable_value.then((validator) -> validator.validate((token) -> token.getValue().equals(";")))
@@ -921,7 +928,10 @@ public class JavaParser extends Parser<JavaElement> {
 				return validator.validate((token) -> token.getValue().equals(";"));
 			}
 			return false;
-		}).<JavaElement>end((javafile, bag) -> javafile);
+		}).<JavaElement>end((parent, bag) -> {
+			((JavaFile)parent).addImport(bag);
+			return parent;
+		});
 
 		
 		InitialStateTree<JavaElement> main = new InitialStateTree<>();
@@ -939,7 +949,10 @@ public class JavaParser extends Parser<JavaElement> {
 				return validator.validate((token) -> token.getValue().equals(";"));
 			}
 			return false;
-		}).end((javafile, bag) -> javafile);
+		}).end((parent, bag) -> {
+			((JavaFile)parent).setPackage(bag);
+			return parent;
+		});
 		main.multiple(pack);
 		main.multiple(importState);
 		main.multiple(annotation);
@@ -995,14 +1008,14 @@ public class JavaParser extends Parser<JavaElement> {
 	}
 	
 	public static void main(String[] args) throws Exception{
-		File file = new File("C:\\Users\\jeffc\\eclipse-workspace\\Eclipse_Lhoist_Xavier_plan2Track_IT1\\app\\src\\main\\java\\be\\helmo\\plan2track\\planner\\domain\\Assembly.java");
+		File file = new File("C:\\Users\\jeffc\\eclipse-workspace\\peer-at-code-backend\\src\\dev\\peerat\\backend\\Configuration.java");
 		
 		BufferedReader reader = new BufferedReader(new FileReader(file));
 		
 		time = System.currentTimeMillis();
 		
 		Parser<JavaElement> parser = new JavaParser();
-		JavaElement jFile = new JavaElement();
+		JavaFile jFile = new JavaFile();
 		parser.parse(reader, jFile);
 
 		System.out.println((System.currentTimeMillis()-time)+"ms");

src/be/jeffcheasey88/peeratcode/parser/java/Variable.java

@@ -1,5 +1,6 @@
 package be.jeffcheasey88.peeratcode.parser.java;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import be.jeffcheasey88.peeratcode.parser.Token;
@@ -25,6 +26,7 @@ public class Variable extends JavaElement implements Annotable{
 		this.mod = mod;
 		this.type = type;
 		this.name = name;
+		this.annotations = new ArrayList<>();
 	}
 	
 	public Variable(int mod, Token type, Token name, boolean elips){

test/be/jeffcheasey88/peeratcode/parser/java/ClassTests.java

@@ -10,7 +10,7 @@ import be.jeffcheasey88.peeratcode.parser.TokenValidator;
 import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
 import be.jeffcheasey88.peeratcode.parser.state.StateTree;
 
-public class ClassTests {
+public class ClassTests{
 	
 	public static StateTree<JavaElement> get(){
 		StateTree<JavaElement> clazz_ = new StateTree<>();