JavaElement -> Abstract to Interface + 'Function<E, Boolean>' to 'Predicate<E>' + Visitor Concat in JavaArrayAccessValueVisitor Operator Count little refractor

src/dev/peerat/parser/java/Annotation.java

@@ -1,9 +1,11 @@
 package dev.peerat.parser.java;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.value.Value;
@@ -11,7 +13,7 @@ import dev.peerat.parser.java.visitor.JavaVisitor;
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public class Annotation extends JavaElement{
+public class Annotation implements JavaElement{
 	
 	public static interface AnnotableBuffer{
 		
@@ -21,7 +23,7 @@ public class Annotation extends JavaElement{
 		
 	}
 	
-	public static abstract class Annotable extends JavaElement{
+	public static abstract class Annotable implements JavaElement{
 		
 		private List<Annotation> annotations;
 		
@@ -52,21 +54,21 @@ public class Annotation extends JavaElement{
 		}
 		
 		@Override
-		public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+		public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 			if(annotations != null){
 				for(Annotation annotation : this.annotations){
-					if(finder.apply(annotation)) return (E) annotation;
+					if(finder.test(annotation)) return (E) annotation;
 				}
 			}
 			return null;
 		}
 		
 		@Override
-		public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+		public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 			if(annotations != null){
 				for(Annotation annotation : this.annotations){
-					if(finder.apply(annotation)) list.add((E) annotation);
+					if(finder.test(annotation)) collector.add((E) annotation);
-					annotation.findAll(finder, list);
+					annotation.findAll(finder, collector);
 				}
 			}
 		}
@@ -93,25 +95,25 @@ public class Annotation extends JavaElement{
 	}
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		if(this.values != null){
 			for(Value value : this.values.values()){
-				if(finder.apply(value)) return (E)value;
+				if(finder.test(value)) return (E)value;
 			}
 		}
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 		if(this.values != null){
 			for(Value value : this.values.values()){
-				if(finder.apply(value)) list.add((E)value);
+				if(finder.test(value)) collector.add((E)value);
-				value.findAll(finder, list);
+				value.findAll(finder, collector);
 			}
 		}
 	}
-
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/AnnotationClass.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -41,27 +43,27 @@ public class AnnotationClass extends ClassBase{
 	public List<JavaElement> getElements(){
 		return this.elements;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		E annotation = super.find(finder);
 		if(annotation != null) return annotation;
 		
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) return (E) element;
+				if(finder.test(element)) return (E) element;
 			}
 		}
 		return null;
 	}
-	
+
 	@Override
-	public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) list.add((E) element);
+				if(finder.test(element)) collector.add((E) element);
-				element.findAll(finder, list);
+				element.findAll(finder, collector);
 			}
 		}
 	}

src/dev/peerat/parser/java/Class.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.visitor.Visitor;
@@ -51,27 +53,27 @@ public class Class extends ClassBase{
 	public List<JavaElement> getElements(){
 		return this.elements;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		E annotation = super.find(finder);
 		if(annotation != null) return annotation;
 		
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) return (E) element;
+				if(finder.test(element)) return (E) element;
 			}
 		}
 		return null;
 	}
-	
+
 	@Override
-	public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) list.add((E) element);
+				if(finder.test(element)) collector.add((E) element);
-				element.findAll(finder, list);
+				element.findAll(finder, collector);
 			}
 		}
 	}

src/dev/peerat/parser/java/Enumeration.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -46,27 +48,27 @@ public class Enumeration extends ClassBase{
 	public List<JavaElement> getElements(){
 		return this.elements;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		E annotation = super.find(finder);
 		if(annotation != null) return annotation;
 		
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) return (E) element;
+				if(finder.test(element)) return (E) element;
 			}
 		}
 		return null;
 	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) list.add((E) element);
+				if(finder.test(element)) collector.add((E) element);
-				element.findAll(finder, list);
+				element.findAll(finder, collector);
 			}
 		}
 	}

src/dev/peerat/parser/java/Function.java

@@ -2,7 +2,9 @@ package dev.peerat.parser.java;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.TokenType;
@@ -100,36 +102,36 @@ public class Function extends Annotable implements VariableContainer, OperationC
 	}
 	
 	@Override
-	public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		E annotation = super.find(finder);
 		if(annotation != null) return annotation;
 		
 		if(parameters != null){
 			for(Variable param : this.parameters){
-				if(finder.apply(param)) return (E) param;
+				if(finder.test(param)) return (E) param;
 			}
 		}
 		if(elements != null){
 			for(JavaElement content : this.elements){
-				if(finder.apply(content)) return (E) content;
+				if(finder.test(content)) return (E) content;
 			}
 		}
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 		if(parameters != null){
 			for(Variable param : this.parameters){
-				if(finder.apply(param)) list.add((E) param);
+				if(finder.test(param)) collector.add((E) param);
-				param.findAll(finder, list);
+				param.findAll(finder, collector);
 			}
 		}
 		if(elements != null){
 			for(JavaElement content : this.elements){
-				if(finder.apply(content)) list.add((E) content);
+				if(finder.test(content)) collector.add((E) content);
-				content.findAll(finder, list);
+				content.findAll(finder, collector);
 			}
 		}
 	}

src/dev/peerat/parser/java/Import.java

@@ -1,14 +1,16 @@
 package dev.peerat.parser.java;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.visitor.JavaVisitor;
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public class Import extends JavaElement{
+public class Import implements JavaElement{
 	
 	private boolean isStatic;
 	private Token value;
@@ -27,15 +29,15 @@ public class Import extends JavaElement{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 		
 	}
-
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/Interface.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -46,27 +48,27 @@ public class Interface extends ClassBase{
 	public List<JavaElement> getElements(){
 		return this.elements;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(java.util.function.Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		E annotation = super.find(finder);
 		if(annotation != null) return annotation;
 		
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) return (E) element;
+				if(finder.test(element)) return (E) element;
 			}
 		}
 		return null;
 	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(java.util.function.Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) list.add((E) element);
+				if(finder.test(element)) collector.add((E) element);
-				element.findAll(finder, list);
+				element.findAll(finder, collector);
 			}
 		}
 	}

src/dev/peerat/parser/java/JavaElement.java

@@ -1,16 +1,16 @@
 package dev.peerat.parser.java;
 
-import java.util.List;
+import java.util.Collection;
-import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public abstract class JavaElement{
+public interface JavaElement{
 	
-	public abstract <E extends JavaElement> E find(Function<JavaElement, Boolean> finder);
+	<E extends JavaElement> E find(Predicate<JavaElement> finder);
 	
-	public abstract <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list);
+	<E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector);
 
-	public abstract VisitorBag visit(Visitor<JavaElement> visitor);
+	VisitorBag visit(Visitor<JavaElement> visitor);
 }

src/dev/peerat/parser/java/JavaFile.java

@@ -1,8 +1,10 @@
 package dev.peerat.parser.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.Annotation.AnnotableBuffer;
@@ -10,7 +12,7 @@ import dev.peerat.parser.java.visitor.JavaVisitor;
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public class JavaFile extends JavaElement implements ClassContainer, AnnotableBuffer{
+public class JavaFile implements JavaElement, ClassContainer, AnnotableBuffer{
 	
 	private List<Annotation> annotationBuffer;
 	
@@ -67,24 +69,24 @@ public class JavaFile extends JavaElement implements ClassContainer, AnnotableBu
 	}
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(finder.apply(mainClazz)) return (E) mainClazz;
+		if(finder.test(mainClazz)) return (E) mainClazz;
 		for(ClassBase clazz : subClazz){
-			if(finder.apply(clazz)) return (E) clazz;
+			if(finder.test(clazz)) return (E) clazz;
 		}
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		if(finder.apply(mainClazz)) list.add((E) mainClazz);
+		if(finder.test(mainClazz)) collector.add((E) mainClazz);
-		mainClazz.findAll(finder, list);
+		mainClazz.findAll(finder, collector);
 		for(ClassBase clazz : subClazz){
-			if(finder.apply(clazz)) list.add((E) clazz);
+			if(finder.test(clazz)) collector.add((E) clazz);
-			clazz.findAll(finder, list);
+			clazz.findAll(finder, collector);
 		}
 	}
-
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor){
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/JavaProject.java

@@ -1,13 +1,14 @@
 package dev.peerat.parser.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public class JavaProject extends JavaElement{
+public class JavaProject implements JavaElement{
 	
 	private List<JavaFile> files;
 	
@@ -22,14 +23,14 @@ public class JavaProject extends JavaElement{
 	public List<JavaFile> getFiles(){
 		return this.files;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		return null;
 	}
 
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 		
 	}
 

src/dev/peerat/parser/java/Variable.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.Annotation.Annotable;
@@ -64,21 +66,21 @@ public class Variable extends Annotable{
 	public Value getValue(){
 		return this.value;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		E annotation = super.find(finder);
 		if(annotation != null) return annotation;
 		
-		return value != null ? finder.apply(value) ? (E)value : null : null;
+		return value != null ? finder.test(value) ? (E)value : null : null;
 	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 		if(value != null){
-			if(finder.apply(value)) list.add((E)value);
+			if(finder.test(value)) collector.add((E)value);
-			value.findAll(finder, list);
+			value.findAll(finder, collector);
 		}
 	}
 	

src/dev/peerat/parser/java/builder/JavaOperationBuilder.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.builder;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Parser;
 import dev.peerat.parser.java.JavaElement;
@@ -28,7 +30,7 @@ public class JavaOperationBuilder extends JavaBuilder<Operation>{
 		return this.operation;
 	}
 
-	class Container extends JavaElement implements OperationContainer{
+	class Container implements JavaElement, OperationContainer{
 
 		@Override
 		public void addOperation(Operation operation){
@@ -36,12 +38,14 @@ public class JavaOperationBuilder extends JavaBuilder<Operation>{
 		}
 		
 		@Override
-		public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+		public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+			// TODO Auto-generated method stub
 			return null;
 		}
-
+		
 		@Override
-		public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+		public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+			// TODO Auto-generated method stub
 			
 		}
 

src/dev/peerat/parser/java/builder/JavaValueBuilder.java

@@ -1,8 +1,10 @@
 package dev.peerat.parser.java.builder;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Parser;
 import dev.peerat.parser.Token;
@@ -121,7 +123,7 @@ public class JavaValueBuilder extends JavaBuilder<Value>{
 		return this.value;
 	}
 
-	class Container extends JavaElement implements ValueContainer{
+	class Container implements JavaElement, ValueContainer{
 
 		@Override
 		public void addValue(Value value) {
@@ -129,14 +131,12 @@ public class JavaValueBuilder extends JavaBuilder<Value>{
 		}
 		
 		@Override
-		public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+		public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 			return null;
 		}
-
+		
 		@Override
-		public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+		public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {}
-			
-		}
 
 		@Override
 		public VisitorBag visit(Visitor<JavaElement> visitor) {

src/dev/peerat/parser/java/operation/AssignOperation.java

@@ -1,11 +1,10 @@
 package dev.peerat.parser.java.operation;
 
-import java.util.List;
+import java.util.Collection;
-import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.value.Value;
-import dev.peerat.parser.java.visitor.JavaVisitor;
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
@@ -28,16 +27,16 @@ public class AssignOperation extends Operation{
 	}
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		return finder.apply(left) ? (E)left : finder.apply(right) ? (E)right : null;
+		return finder.test(left) ? (E)left : finder.test(right) ? (E)right : null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		if(finder.apply(left)) list.add((E) left);
+		if(finder.test(left)) collector.add((E) left);
-		left.findAll(finder, list);
+		left.findAll(finder, collector);
-		if(finder.apply(right)) list.add((E) right);
+		if(finder.test(right)) collector.add((E) right);
-		right.findAll(finder, list);
+		right.findAll(finder, collector);
 	}
 
 	@Override

src/dev/peerat/parser/java/operation/BreakOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -13,12 +15,16 @@ public class BreakOperation extends Operation{
 	public BreakOperation(){}
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){}
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
+		
+	}
 
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {

src/dev/peerat/parser/java/operation/ContinueOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -11,12 +13,16 @@ import dev.peerat.parser.visitor.VisitorBag;
 public class ContinueOperation extends Operation{
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){}
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
+		
+	}
 
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {

src/dev/peerat/parser/java/operation/ForOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.Variable;
@@ -44,50 +46,50 @@ public class ForOperation extends OperationBag{
 	public List<Value> getUpdates(){
 		return this.updates;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		if(init_vars != null){
 			for(Variable variable : this.init_vars){
-				if(finder.apply(variable)) return (E)variable;
+				if(finder.test(variable)) return (E)variable;
 			}
 		}
 		if(init_values != null){
 			for(Value value : this.init_values){
-				if(finder.apply(value)) return (E)value;
+				if(finder.test(value)) return (E)value;
 			}
 		}
-		if(finder.apply(condition)) return (E)condition;
+		if(finder.test(condition)) return (E)condition;
 		if(this.updates != null){
 			for(Value value : this.updates){
-				if(finder.apply(value)) return (E)value;
+				if(finder.test(value)) return (E)value;
 			}
 		}
 		return super.find(finder);
 	}
-	
+
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 		if(init_vars != null){
 			for(Variable variable : this.init_vars){
-				if(finder.apply(variable)) list.add((E)variable);
+				if(finder.test(variable)) collector.add((E)variable);
-				variable.findAll(finder, list);
+				variable.findAll(finder, collector);
 			}
 		}
 		if(init_values != null){
 			for(Value value : this.init_values){
-				if(finder.apply(value)) list.add((E)value);
+				if(finder.test(value)) collector.add((E)value);
-				value.findAll(finder, list);
+				value.findAll(finder, collector);
 			}
 		}
-		if(finder.apply(condition)) list.add((E)condition);
+		if(finder.test(condition)) collector.add((E)condition);
 		if(this.updates != null){
 			for(Value value : this.updates){
-				if(finder.apply(value)) list.add((E)value);
+				if(finder.test(value)) collector.add((E)value);
-				value.findAll(finder, list);
+				value.findAll(finder, collector);
 			}
 		}
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 	}
 
 	@Override

src/dev/peerat/parser/java/operation/ForeachOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -35,18 +37,17 @@ public class ForeachOperation extends OperationBag{
 	public Value getIterator(){
 		return this.iterator;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(finder.apply(iterator)) return (E)iterator;
+		// TODO Auto-generated method stub
 		return super.find(finder);
 	}
 
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		if(finder.apply(iterator)) list.add((E)iterator);
+		// TODO Auto-generated method stub
-		iterator.findAll(finder, list);
+		super.findAll(finder, collector);
-		super.findAll(finder, list);
 	}
 
 	@Override

src/dev/peerat/parser/java/operation/IfOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.value.Value;
@@ -21,20 +23,20 @@ public class IfOperation extends OperationBag{
 	public Value getCondition(){
 		return this.condition;
 	}
-
-	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
-		if(finder.apply(condition)) return (E)condition;
-		return super.find(finder);
-	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(finder.apply(condition)) list.add((E)condition);
+		if(finder.test(condition)) return (E)condition;
-		condition.findAll(finder, list);
+		return super.find(finder);
-		super.findAll(finder, list);
 	}
 
+	@Override
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		if(finder.test(condition)) collector.add((E)condition);
+		condition.findAll(finder, collector);
+		super.findAll(finder, collector);
+	}
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/operation/Operation.java

@@ -2,7 +2,7 @@ package dev.peerat.parser.java.operation;
 
 import dev.peerat.parser.java.JavaElement;
 
-public abstract class Operation extends JavaElement{
+public abstract class Operation implements JavaElement{
 	
 	public static interface OperationContainer{
 		

src/dev/peerat/parser/java/operation/OperationBag.java

@@ -1,8 +1,10 @@
 package dev.peerat.parser.java.operation;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.Variable;
@@ -40,27 +42,28 @@ public abstract class OperationBag extends Operation implements VariableContaine
 	public List<JavaElement> getElements(){
 		return this.elements;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) return (E)element;
+				if(finder.test(element)) return (E)element;
 			}
 		}
 		return null;
 	}
-	
+
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 		if(elements != null){
 			for(JavaElement element : this.elements){
-				if(finder.apply(element)) list.add((E)element);
+				if(finder.test(element)) collector.add((E)element);
-				element.findAll(finder, list);
+				element.findAll(finder, collector);
 			}
 		}
 	}
 	
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor){
 		VisitorBag bag = new VisitorBag();

src/dev/peerat/parser/java/operation/ReturnOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.value.Value;
@@ -20,17 +22,17 @@ public class ReturnOperation extends Operation{
 	public Value getValue(){
 		return this.value;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		return value != null ? finder.apply(value) ? (E)value : null : null;
+		return value != null ? finder.test(value) ? (E)value : null : null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
 		if(value != null){
-			if(finder.apply(value)) list.add((E) value);
+			if(finder.test(value)) collector.add((E) value);
-			value.findAll(finder, list);
+			value.findAll(finder, collector);
 		}
 	}
 

src/dev/peerat/parser/java/operation/SwitchOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -13,12 +15,16 @@ public class SwitchOperation extends Operation{
 	//+ AND OBJECT FOR CONTAINING EVERY CASE OP
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){}
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
+		
+	}
 
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {

src/dev/peerat/parser/java/operation/SynchronizedOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.value.Value;
@@ -21,20 +23,20 @@ public class SynchronizedOperation extends OperationBag{
 	public Value getValue(){
 		return this.value;
 	}
-
-	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
-		if(finder.apply(value)) return (E)value;
-		return super.find(finder);
-	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(finder.apply(value)) list.add((E)value);
+		if(finder.test(value)) return (E)value;
-		value.findAll(finder, list);
+		return super.find(finder);
-		super.findAll(finder, list);
 	}
 
+	@Override
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		if(finder.test(value)) collector.add((E)value);
+		value.findAll(finder, collector);
+		super.findAll(finder, collector);
+	}
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/operation/ThrowOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.value.Value;
@@ -20,16 +22,16 @@ public class ThrowOperation extends Operation{
 	public Value getValue(){
 		return this.value;
 	}
-
-	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
-		return finder.apply(value) ? (E)value : null;
-	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(finder.apply(value)) list.add((E) value);
+		return finder.test(value) ? (E)value : null;
-		value.findAll(finder, list);
+	}
+
+	@Override
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		if(finder.test(value)) collector.add((E) value);
+		value.findAll(finder, collector);
 	}
 
 	@Override

src/dev/peerat/parser/java/operation/TryOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.Variable;
@@ -25,21 +27,21 @@ public class TryOperation extends OperationBag{
 	public Variable getResource(){
 		return this.resource;
 	}
-
-	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
-		return resource != null ? finder.apply(resource) ? (E)resource : super.find(finder) : super.find(finder);
-	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(resource != null){
+		return resource != null ? finder.test(resource) ? (E)resource : super.find(finder) : super.find(finder);
-			if(finder.apply(resource)) list.add((E) resource);
-			resource.findAll(finder, list);
-		}
-		super.findAll(finder, list);
 	}
 
+	@Override
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		if(resource != null){
+			if(finder.test(resource)) collector.add((E) resource);
+			resource.findAll(finder, collector);
+		}
+		super.findAll(finder, collector);
+	}
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/operation/WhileOperation.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.operation;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.value.Value;
@@ -20,20 +22,20 @@ public class WhileOperation extends OperationBag{
 	public Value getCondition(){
 		return this.condition;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder){
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
-		if(finder.apply(condition)) return (E)condition;
+		if(finder.test(condition)) return (E)condition;
 		return super.find(finder);
 	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list){
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		if(finder.apply(condition)) list.add((E) condition);
+		if(finder.test(condition)) collector.add((E) condition);
-		condition.findAll(finder, list);
+		condition.findAll(finder, collector);
-		super.findAll(finder, list);
+		super.findAll(finder, collector);
 	}
-
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/value/ArrayAccessValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.visitor.Visitor;
@@ -24,14 +26,16 @@ public class ArrayAccessValue extends Value{
 	public Value getAccessor(){
 		return this.access;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 

src/dev/peerat/parser/java/value/ArrayValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.visitor.Visitor;
@@ -20,12 +22,14 @@ public class ArrayValue extends Value{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 

src/dev/peerat/parser/java/value/BiValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.visitor.JavaVisitor;
@@ -33,12 +35,14 @@ public class BiValue extends Value{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 

src/dev/peerat/parser/java/value/CastValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -27,12 +29,14 @@ public class CastValue extends Value{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 

src/dev/peerat/parser/java/value/InstanceValue.java

@@ -1,84 +1,95 @@
 package dev.peerat.parser.java.value;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
+import dev.peerat.parser.java.Annotation;
 import dev.peerat.parser.java.Annotation.AnnotableBuffer;
 import dev.peerat.parser.java.Function.FunctionContainer;
-import dev.peerat.parser.java.Annotation;
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.java.Variable;
 import dev.peerat.parser.java.Variable.VariableContainer;
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public class InstanceValue extends Value implements VariableContainer, FunctionContainer, AnnotableBuffer{ //TODO LIKE A CLASS, CAN CONTAINS CLASS
+public class InstanceValue extends Value implements VariableContainer, FunctionContainer, AnnotableBuffer { // TODO LIKE
-	
+																											// A CLASS,
+																											// CAN
+																											// CONTAINS
+																											// CLASS
+
 	private Token token;
 	private List<Value> parameters;
-	
+
 	private List<JavaElement> elements;
 	private List<Annotation> annotationBuffer;
-	
+
-	public InstanceValue(Token token, List<Value> parameters){
+	public InstanceValue(Token token, List<Value> parameters) {
 		this.token = token;
 		this.parameters = parameters;
 		this.elements = new ArrayList<>();
 	}
-	
+
-	public Token getToken(){
+	public Token getToken() {
 		return token;
 	}
-	
+
-	public List<Value> getParameters(){
+	public List<Value> getParameters() {
 		return this.parameters;
 	}
-	
+
-	public List<JavaElement> getElements(){
+	public List<JavaElement> getElements() {
 		return this.elements;
 	}
-	
+
 	@Override
-	public void addFunction(dev.peerat.parser.java.Function function){
+	public void addFunction(dev.peerat.parser.java.Function function) {
 		this.elements.add(function);
 	}
 
 	@Override
-	public void addVariable(Variable variable){
+	public void addVariable(Variable variable) {
 		this.elements.add(variable);
 	}
-	
+
 	@Override
-	public void addAnnotationBuffer(Annotation annotation){
+	public void addAnnotationBuffer(Annotation annotation) {
-		if(annotationBuffer == null) annotationBuffer = new ArrayList<>();
+		if (annotationBuffer == null)
+			annotationBuffer = new ArrayList<>();
 		annotationBuffer.add(annotation);
 	}
-	
+
-	public List<Annotation> getAnnotationBuffer(){
+	public List<Annotation> getAnnotationBuffer() {
 		List<Annotation> list = this.annotationBuffer;
 		this.annotationBuffer = null;
 		return list;
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
-		
+		// TODO Auto-generated method stub
+
 	}
 
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
-		if(visitor.canVisit(getClass())) return visitor.visit(this);
+		if (visitor.canVisit(getClass()))
+			return visitor.visit(this);
 		VisitorBag bag = new VisitorBag();
-		
+
-		for(Value value : parameters) bag.merge(value.visit(visitor));
+		for (Value value : parameters)
-		for(JavaElement content : elements) bag.merge(content.visit(visitor)); 
+			bag.merge(value.visit(visitor));
+		for (JavaElement content : elements)
+			bag.merge(content.visit(visitor));
 		return bag;
 	}
 

src/dev/peerat/parser/java/value/LambdaValue.java

@@ -1,8 +1,10 @@
 package dev.peerat.parser.java.value;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -53,12 +55,14 @@ public class LambdaValue extends Value implements OperationContainer, VariableCo
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 	

src/dev/peerat/parser/java/value/MethodCallValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -39,12 +41,14 @@ public class MethodCallValue extends Value{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 

src/dev/peerat/parser/java/value/ModifierValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -27,12 +29,14 @@ public class ModifierValue extends Value{
 	}
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
 	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 	

src/dev/peerat/parser/java/value/StaticValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -21,15 +23,16 @@ public class StaticValue extends Value{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
-
 	
 	@Override
 	public String toString(){

src/dev/peerat/parser/java/value/TriValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.java.JavaElement;
 import dev.peerat.parser.visitor.Visitor;
@@ -32,12 +34,14 @@ public class TriValue extends Value{
 	}
 
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
 	

src/dev/peerat/parser/java/value/Value.java

@@ -2,7 +2,7 @@ package dev.peerat.parser.java.value;
 
 import dev.peerat.parser.java.JavaElement;
 
-public abstract class Value extends JavaElement{
+public abstract class Value implements JavaElement{
 	
 	//Only for TESTS purpose!
 	public static interface ValueContainer{

src/dev/peerat/parser/java/value/VariableAccessValue.java

@@ -1,7 +1,9 @@
 package dev.peerat.parser.java.value;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import dev.peerat.parser.Token;
 import dev.peerat.parser.java.JavaElement;
@@ -27,15 +29,17 @@ public class VariableAccessValue extends Value{
 	}
 	
 	@Override
-	public <E extends JavaElement> E find(Function<JavaElement, Boolean> finder) {
+	public <E extends JavaElement> E find(Predicate<JavaElement> finder) {
+		// TODO Auto-generated method stub
 		return null;
 	}
-
+	
 	@Override
-	public <E extends JavaElement> void findAll(Function<JavaElement, Boolean> finder, List<E> list) {
+	public <E extends JavaElement> void findAll(Predicate<JavaElement> finder, Collection<E> collector) {
+		// TODO Auto-generated method stub
 		
 	}
-
+	
 	@Override
 	public VisitorBag visit(Visitor<JavaElement> visitor) {
 		if(visitor.canVisit(getClass())) return visitor.visit(this);

src/dev/peerat/parser/java/visitor/JavaFileVisitor.java

@@ -0,0 +1,71 @@
+package dev.peerat.parser.java.visitor;
+
+import java.util.function.Predicate;
+
+import dev.peerat.parser.java.JavaElement;
+import dev.peerat.parser.java.JavaFile;
+import dev.peerat.parser.visitor.Visitor;
+import dev.peerat.parser.visitor.VisitorBag;
+
+public class JavaFileVisitor extends JavaVisitor<JavaFile>{
+
+	private boolean checkPackage;
+	private boolean checkNoPackage;
+	private Predicate<String> pack;
+	private Visitor<JavaElement> imports;
+	private Visitor<JavaElement> classes;
+	
+	public JavaFileVisitor(boolean propagate){
+		super(JavaFile.class, propagate);
+	}
+	
+	public JavaFileVisitor hasPackage(){
+		this.checkPackage = true;
+		this.checkNoPackage = false;
+		return this;
+	}
+	
+	public JavaFileVisitor hasNoPackage(){
+		this.checkPackage = false;
+		this.checkNoPackage = true;
+		return this;
+	}
+	
+	public JavaFileVisitor packaged(Predicate<String> predicate){
+		this.pack = predicate;
+		return this;
+	}
+	
+	public JavaFileVisitor imp(Visitor<JavaElement> visitor){
+		this.imports = visitor;
+		return this;
+	}
+	
+	public JavaFileVisitor clazz(Visitor<JavaElement> visitor){
+		this.classes = visitor;
+		return this;
+	}
+
+	@Override
+	public VisitorBag visitElement(JavaFile element){
+		VisitorBag bag = new VisitorBag();
+		
+		if(this.checkPackage && element.getPackage() == null) return bag;
+		else if(this.checkNoPackage && element.getPackage() != null) return bag;
+		
+		if(this.pack != null && element.getPackage() != null && !this.pack.test(element.getPackage().getValue())) return bag;
+		
+		if(this.imports != null && validates(bag, element.getImports(), this.imports)) return bag;
+		if(this.classes != null){
+			VisitorBag resultMain = this.classes.visit(element.getMainClass());
+			if(resultMain.isValidated()) bag.merge(resultMain);
+			if(!(validates(bag, element.getSubClasses(), this.classes) || resultMain.isValidated())) return bag;
+		}
+		
+		bag.compute(element);
+		return bag;
+	}
+	
+	
+
+}

src/dev/peerat/parser/java/visitor/JavaVariableVisitor.java

@@ -5,11 +5,10 @@ import java.util.function.Predicate;
 import dev.peerat.parser.java.Variable;
 import dev.peerat.parser.visitor.VisitorBag;
 
-public class JavaVariableVisitor extends JavaVisitor<Variable>{
+public class JavaVariableVisitor extends JavaModifiableVisitor<Variable, JavaVariableVisitor>{
 	
 	private Predicate<String> typeFilter;
 	private Predicate<String> nameFilter;
-	private Predicate<Integer> modifierFilter;
 	
 	public JavaVariableVisitor(boolean propagate){
 		super(Variable.class, propagate);
@@ -25,54 +24,6 @@ public class JavaVariableVisitor extends JavaVisitor<Variable>{
 		return this;
 	}
 	
-	public JavaVariableVisitor isPublic(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x1) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isPrivate(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x2) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isProtected(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x4) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isStatic(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x8) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isFinal(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x10) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isVolatile(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x40) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isTransient(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x80) != 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-	
-	public JavaVariableVisitor isPackageLevel(){
-		Predicate<Integer> validator = (mod) -> (mod & 0x1) == 0 && (mod & 0x2) == 0 && (mod & 0x4) == 0;
-		this.modifierFilter = (this.modifierFilter == null) ? validator : this.modifierFilter.and(validator);
-		return this;
-	}
-
 	@Override
 	public VisitorBag visitElement(Variable element){
 		VisitorBag bag = new VisitorBag();

src/dev/peerat/parser/java/visitor/JavaVisitor.java

@@ -54,6 +54,10 @@ public abstract class JavaVisitor<T extends JavaElement> extends Visitor<JavaEle
 		return javaElement(true);
 	}
 	
+	public static JavaFileVisitor allFile(){
+		return new JavaFileVisitor(true);
+	}
+	
 	public static JavaClassBaseVisitor allClassBase(){
 		return new JavaClassBaseVisitor(true);
 	}
@@ -153,6 +157,10 @@ public abstract class JavaVisitor<T extends JavaElement> extends Visitor<JavaEle
 		return javaElement(false);
 	}
 	
+	public static JavaFileVisitor file(){
+		return new JavaFileVisitor(false);
+	}
+	
 	public static JavaClassBaseVisitor classBase(){
 		return new JavaClassBaseVisitor(false);
 	}

src/dev/peerat/parser/java/visitor/value/JavaArrayAccessValueVisitor.java

@@ -3,6 +3,7 @@ package dev.peerat.parser.java.visitor.value;
 import dev.peerat.parser.java.value.ArrayAccessValue;
 import dev.peerat.parser.java.value.Value;
 import dev.peerat.parser.java.visitor.JavaVisitor;
+import dev.peerat.parser.visitor.Operator;
 import dev.peerat.parser.visitor.Visitor;
 import dev.peerat.parser.visitor.VisitorBag;
 
@@ -16,12 +17,12 @@ public class JavaArrayAccessValueVisitor extends JavaVisitor<ArrayAccessValue>{
 	}
 	
 	public JavaArrayAccessValueVisitor checkBase(Visitor<Value> visitor){
-		this.basePredicate = visitor;
+		this.basePredicate = this.basePredicate == null ? visitor : Operator.and(this.basePredicate, visitor);
 		return this;
 	}
 	
 	public JavaArrayAccessValueVisitor accessor(Visitor<Value> visitor){
-		this.accessPredicate = visitor;
+		this.accessPredicate = this.accessPredicate == null ? visitor : Operator.and(this.accessPredicate, visitor);
 		return this;
 	}
 

src/dev/peerat/parser/state/StateTree.java

@@ -24,10 +24,14 @@ public class StateTree<E>{
 	}
 	
 	public void seed(TokenValidator validator, E container) throws SyntaxMissMatchException{
-		BuilderStateTree<E, ?> build = internalSeed(validator, container);
+		int parsed = 0;
-		if(build == null) throw new SyntaxMissMatchException(validator);
+		while(validator.hasNext()){
-		build.build(validator, container);
+			BuilderStateTree<E, ?> build = internalSeed(validator, container);
-		if(validator.hasNext()) throw new SyntaxMissMatchException(validator);
+			if(build != null) build.build(validator, container);
+			int current = validator.getValidatedTokenCount();
+			if(parsed == current) throw new SyntaxMissMatchException(validator);
+			parsed = current;
+		}
 	}
 	
 	BuilderStateTree<E, ?> internalSeed(TokenValidator validator, E element){

src/dev/peerat/parser/visitor/Example.java

@@ -3,8 +3,14 @@ package dev.peerat.parser.visitor;
 import static dev.peerat.parser.java.visitor.JavaVisitor.*;
 import static dev.peerat.parser.visitor.Operator.*;
 
+import java.util.List;
+import java.util.Map;
+
+import dev.peerat.parser.java.Import;
 import dev.peerat.parser.java.JavaFile;
 import dev.peerat.parser.java.JavaParser;
+import dev.peerat.parser.java.JavaProject;
+import dev.peerat.parser.java.Class;
 
 public class Example {
 	
@@ -12,18 +18,23 @@ public class Example {
 		
 		JavaParser parser = new JavaParser();
 		JavaFile container = new JavaFile();
-		parser.parse("package dev.peerat.test; public class Example{ private int i = j, j; public void helloTest(){ System.out.println(\"hello\"); } }", container);
+		parser.parse("package dev.peerat.test; import a; import b; public class C{} public class D{}",
+				container);
 		
-		VisitorBag result = container.visit(
+		JavaProject project = new JavaProject();
-				key(allClass()
+		project.addFile(container);
-					.isPublic()
-					.elements(
-							value(allVariable()
-							)
-					)
-				));
 		
-		System.out.println("allJavaElement in class : "+result.toList());
+		System.out.println(project.visit(
+				allFile().clazz(key(allClass())).imp(value(allImport()))
+				).toList());
+		
+//		Map<Class, List<Import>> map = project.visit(
+//				and(
+//					allFile().imp(value(allImport()))
+//					,
+//					allFile().clazz(key(allClass()))
+//				)).toMapValues();
+//		System.out.println(map);
 	}
 
 }

src/dev/peerat/parser/visitor/Operator.java

@@ -1,5 +1,6 @@
 package dev.peerat.parser.visitor;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -12,9 +13,11 @@ public class Operator{
 		return new Visitor<E>(){
 			@Override
 			public VisitorBag visit(E element){
+				System.out.println("and "+Arrays.toString(visitors)+" -> "+element);
 				VisitorBag bag = new VisitorBag();
 				Set<Object> set = new HashSet<>();
 				for(Visitor<E> visitor : visitors){
+					if(!visitor.canVisit(element.getClass())) continue;
 					VisitorBag vbag = visitor.visit(element);
 					if(!vbag.isValidated()) return new VisitorBag();
 					bag.merge(vbag);
@@ -138,24 +141,24 @@ public class Operator{
 		};
 	}
 	
-	public static <E, T extends Visitor<E>> T count(T visitor, Predicate<Integer> validator){
+	public static <E> Visitor<E> count(Visitor<E> visitor, Predicate<Integer> validator){
-		return (T) new Visitor<E>(){
+		return new Visitor<E>(){
 			@Override
 			public VisitorBag visit(E element){
 				VisitorBag visited = visitor.visit(element);
-				return validator.test(visited.toList().size()) ? visited : new VisitorBag();
+				return visited.isValidated() && validator.test(visited.toList().size()) ? visited : new VisitorBag();
 			}
 
 			@Override
-			public boolean canVisit(Class<?> type) {
+			public boolean canVisit(Class<?> type){
-				return true;
+				return visitor.canVisit(type);
 			}
 			
 			@Override
 			public boolean canPropagate(){
-				return true;
+				return visitor.canPropagate();
 			}
 		};
 	}
-
+	
 }

src/dev/peerat/parser/visitor/Visitor.java

@@ -1,5 +1,7 @@
 package dev.peerat.parser.visitor;
 
+import java.util.Collection;
+
 import dev.peerat.parser.Token;
 
 public abstract class Visitor<T>{
@@ -18,4 +20,15 @@ public abstract class Visitor<T>{
 	
 	public abstract VisitorBag visit(T element);
 	
+	protected <E> boolean validates(VisitorBag bag, Collection<? extends E> list, Visitor<E> visitor){
+		boolean validateOne = false;
+		for(E element : list){
+			VisitorBag result = visitor.visit(element);
+			if(result.isValidated()){
+				validateOne = true;
+				bag.merge(result);
+			}
+		}
+		return validateOne;
+	}
 }

src/dev/peerat/parser/visitor/VisitorBag.java

@@ -96,5 +96,10 @@ public class VisitorBag{
 		public List<V> getValues(){
 			return (List<V>) this.values;
 		}
+		
+		@Override
+		public String toString(){
+			return "[key="+key+", values="+values+"]";
+		}
 	}
 }