From 71f0c46b00e1258916174ba6e308399a78287785 Mon Sep 17 00:00:00 2001
From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com>
Date: Sat, 14 Oct 2023 11:42:00 +0200
Subject: [PATCH] [Build] Take package & imports

---
 .../peeratcode/parser/java/JavaParser.java    | 44 +++++++++++--------
 .../peeratcode/parser/java/ClassTests.java    |  2 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index 3661d14..aa14c7a 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -921,7 +921,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 +942,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);
@@ -994,21 +1000,21 @@ public class JavaParser extends Parser<JavaElement> {
 		return 0;
 	}
 	
-	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");
-		
-		BufferedReader reader = new BufferedReader(new FileReader(file));
-		
-		time = System.currentTimeMillis();
-		
-		Parser<JavaElement> parser = new JavaParser();
-		JavaElement jFile = new JavaElement();
-		parser.parse(reader, jFile);
-
-		System.out.println((System.currentTimeMillis()-time)+"ms");
-		
-		System.out.println(TokenValidator.MAX_VALIDATE+" / "+TokenValidator.TOKENS);
-		
-		parser.build(new BufferedWriter(new FileWriter(new File("/home/ParserV2.txt"))));
-	}
+//	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");
+//		
+//		BufferedReader reader = new BufferedReader(new FileReader(file));
+//		
+//		time = System.currentTimeMillis();
+//		
+//		Parser<JavaElement> parser = new JavaParser();
+//		JavaElement jFile = new JavaElement();
+//		parser.parse(reader, jFile);
+//
+//		System.out.println((System.currentTimeMillis()-time)+"ms");
+//		
+//		System.out.println(TokenValidator.MAX_VALIDATE+" / "+TokenValidator.TOKENS);
+//		
+//		parser.build(new BufferedWriter(new FileWriter(new File("/home/ParserV2.txt"))));
+//	}
 }
diff --git a/test/be/jeffcheasey88/peeratcode/parser/java/ClassTests.java b/test/be/jeffcheasey88/peeratcode/parser/java/ClassTests.java
index dfc9ce9..c359432 100644
--- a/test/be/jeffcheasey88/peeratcode/parser/java/ClassTests.java
+++ b/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<>();