make use of logger and take in sourceFolder

Author: FelixAnthonisen

src/main/java/anthonisen/felix/Main.java

@@ -1,13 +1,41 @@
 package anthonisen.felix;
 
-import com.github.javaparser.utils.Log;
-
 import anthonisen.felix.astParsing.Covariancer;
 
+import javax.annotation.processing.Messager;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.tools.Diagnostic;
+
 class Main {
     public static void main(String[] args) {
-        Log.setAdapter(new Log.StandardOutStandardErrorAdapter());
-        Covariancer manip = new Covariancer();
-        manip.makeCovariant();
+        Covariancer manip = new Covariancer(new StdoutMessager(), "example");
+        manip.makeCovariant("Herd.java");
+        manip.applyChanges();
+    }
+}
+
+class StdoutMessager implements Messager {
+    @Override
+    public void printMessage(Diagnostic.Kind kind, CharSequence msg) {
+        System.out.println("[" + kind + "]: " + msg);
+    }
+
+    @Override
+    public void printMessage(Diagnostic.Kind kind, CharSequence msg, Element e) {
+        System.out.println("[" + kind + "]: " + msg + " Element: " + e);
+    }
+
+    @Override
+    public void printMessage(Diagnostic.Kind kind, CharSequence msg, Element e, AnnotationMirror a) {
+        System.out.println("[" + kind + "]: " + msg + " Element: " + e + " AnnotationMirror: " + a);
+    }
+
+    @Override
+    public void printMessage(Diagnostic.Kind kind, CharSequence msg, Element e, AnnotationMirror a,
+            AnnotationValue v) {
+        System.out.println(
+                "[" + kind + "]: " + msg + " Element: " + e + " AnnotationMirror: " + a + " AnnotationValue: " + v);
     }
 }

src/main/java/anthonisen/felix/astParsing/Covariancer.java

@@ -20,17 +20,27 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.processing.Messager;
+import javax.tools.Diagnostic.Kind;
 
 public class Covariancer {
+    private Messager messager;
+    private String sourceFolder;
+    private SourceRoot sourceRoot;
 
-    public void makeCovariant() {
-        String sourceFolder = "example";
-        SourceRoot sourceRoot = new SourceRoot(
+    public Covariancer(Messager messager, String sourceFolder) {
+        this.messager = messager;
+        this.sourceFolder = sourceFolder;
+        sourceRoot = new SourceRoot(
                 CodeGenerationUtils.mavenModuleRoot(Covariancer.class).resolve(sourceFolder));
+    }
+
+    public void makeCovariant(String cls) {
+        messager.printMessage(Kind.NOTE, "Now parsing AST's");
         MethodCollector collector = new MethodCollector(Arrays.asList("T"));
         Map<String, MethodData> methodMap = new HashMap<>();
         Set<ClassData> classesToWatch = new HashSet<>();
-        sourceRoot.parse("", "Herd.java").accept(collector, methodMap);
+        sourceRoot.parse("", cls).accept(collector, methodMap);
 
         File dir = Paths.get(sourceFolder).toFile();
         assert dir.exists();
@@ -52,6 +62,11 @@ public void makeCovariant() {
 
             }
         }
-        sourceRoot.saveAll(CodeGenerationUtils.mavenModuleRoot(Covariancer.class).resolve(Paths.get("output")));
+
+    }
+
+    public void applyChanges() {
+        this.sourceRoot.saveAll(
+                CodeGenerationUtils.mavenModuleRoot(Covariancer.class).resolve(Paths.get(sourceFolder + "/output")));
     }
-}
+}