Replace ErrorEmitter with LJDiagnostics

liquidjava-example/src/main/java/testSuite/SimpleTest.java → liquidjava-example/src/main/java/testSuite/CorrectSimple.java

@@ -3,7 +3,7 @@
 import liquidjava.specification.Refinement;
 
 @SuppressWarnings("unused")
-public class SimpleTest {
+public class CorrectSimple {
     public static void main(String[] args) {
         // Arithmetic Binary Operations
         @Refinement("a >= 10")

liquidjava-example/src/main/java/testSuite/ErrorExtRefNonExistentClass.java → liquidjava-example/src/main/java/testSuite/WarningExtRefNonExistentClass.java

@@ -3,6 +3,6 @@
 import liquidjava.specification.ExternalRefinementsFor;
 
 @ExternalRefinementsFor("non.existent.Class")
-public interface ErrorExtRefNonExistentClass {
+public interface WarningExtRefNonExistentClass {
     public void NonExistentClass(); 
 }

liquidjava-example/src/main/java/testSuite/ErrorExtRefNonExistentMethod.java → liquidjava-example/src/main/java/testSuite/WarningExtRefNonExistentMethod.java

@@ -5,7 +5,7 @@
 import liquidjava.specification.StateRefinement;
 
 @ExternalRefinementsFor("java.util.ArrayList")
-public interface ErrorExtRefNonExistentMethod<E> {
+public interface WarningExtRefNonExistentMethod<E> {
 
     @RefinementPredicate("int size(ArrayList l)")
     @StateRefinement(to = "size(this) == 0")

liquidjava-example/src/main/java/testSuite/ErrorExtRefWrongConstructor.java → liquidjava-example/src/main/java/testSuite/WarningExtRefWrongConstructor.java

@@ -5,7 +5,7 @@
 import liquidjava.specification.StateRefinement;
 
 @ExternalRefinementsFor("java.util.ArrayList")
-public interface ErrorExtRefWrongConstructor<E> {
+public interface WarningExtRefWrongConstructor<E> {
 
     @RefinementPredicate("int size(ArrayList l)")
     @StateRefinement(to = "size(this) == 0")

liquidjava-example/src/main/java/testSuite/ErrorExtRefWrongParameterType.java → liquidjava-example/src/main/java/testSuite/WarningExtRefWrongParameterType.java

@@ -5,7 +5,7 @@
 import liquidjava.specification.StateRefinement;
 
 @ExternalRefinementsFor("java.util.ArrayList")
-public interface ErrorExtRefWrongParameterType<E> {
+public interface WarningExtRefWrongParameterType<E> {
 
     @RefinementPredicate("int size(ArrayList l)")
     @StateRefinement(to = "size(this) == 0")

liquidjava-example/src/main/java/testSuite/ErrorExtRefWrongRetType.java → liquidjava-example/src/main/java/testSuite/WarningExtRefWrongRetType.java

@@ -5,7 +5,7 @@
 import liquidjava.specification.StateRefinement;
 
 @ExternalRefinementsFor("java.util.ArrayList")
-public interface ErrorExtRefWrongRetType<E> {
+public interface WarningExtRefWrongRetType<E> {
 
     @RefinementPredicate("int size(ArrayList l)")
     @StateRefinement(to = "size(this) == 0")

liquidjava-verifier/src/main/java/liquidjava/api/CommandLineLauncher.java

@@ -1,10 +1,12 @@
 package liquidjava.api;
 
+import static liquidjava.diagnostics.LJDiagnostics.diagnostics;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
-import liquidjava.diagnostics.ErrorEmitter;
+import liquidjava.diagnostics.errors.CustomError;
 import liquidjava.processor.RefinementProcessor;
 import spoon.Launcher;
 import spoon.processing.ProcessingManager;
@@ -14,51 +16,44 @@
 
 public class CommandLineLauncher {
     public static void main(String[] args) {
-        // String allPath = "C://Regen/test-projects/src/Main.java";
-        // In eclipse only needed this:"../liquidjava-example/src/main/java/"
-        // In VSCode needs:
-        // "../liquidjava/liquidjava-umbrella/liquidjava-example/src/main/java/liquidjava/test/project";
-
         if (args.length == 0) {
-            System.out.println("No input files or directories provided");
+            System.out.println("No input paths provided");
             System.out.println("\nUsage: ./liquidjava <...paths>");
-            System.out.println("  <...paths>: Paths to files or directories to be verified by LiquidJava");
+            System.out.println("  <...paths>: Paths to be verified by LiquidJava");
             System.out.println(
-                    "\nExample: ./liquidjava liquidjava-example/src/main/java/test/currentlyTesting liquidjava-example/src/main/java/testingInProgress/Account.java");
+                    "\nExample: ./liquidjava liquidjava-example/src/main/java/test liquidjava-example/src/main/java/testingInProgress/Account.java");
             return;
         }
         List<String> paths = Arrays.asList(args);
-        ErrorEmitter ee = launch(paths.toArray(new String[0]));
-        System.out.println(ee.foundError() ? (ee.getFullMessage()) : ("Correct! Passed Verification."));
+        launch(paths.toArray(new String[0]));
+        if (diagnostics.foundError()) {
+            System.out.println(diagnostics.getErrorOutput());
+        } else {
+            System.out.println(diagnostics.getWarningOutput());
+            System.out.println("Correct! Passed Verification.");
+        }
     }
 
-    public static ErrorEmitter launch(String... paths) {
+    public static void launch(String... paths) {
         System.out.println("Running LiquidJava on: " + Arrays.toString(paths).replaceAll("[\\[\\]]", ""));
 
-        ErrorEmitter ee = new ErrorEmitter();
         Launcher launcher = new Launcher();
         for (String path : paths) {
             if (!new File(path).exists()) {
-                ee.addError("Path not found", "The path " + path + " does not exist", 1);
-                return ee;
+                diagnostics.add(new CustomError("The path " + path + " was not found"));
+                return;
             }
             launcher.addInputResource(path);
         }
-        launcher.getEnvironment().setNoClasspath(true);
-
-        // Get the current classpath from the system
-        // String classpath = System.getProperty("java.class.path");
-        // launcher.getEnvironment().setSourceClasspath(classpath.split(File.pathSeparator));
 
-        // optional
-        // launcher.getEnvironment().setSourceClasspath(
-        // "lib1.jar:lib2.jar".split(":"));
+        launcher.getEnvironment().setNoClasspath(true);
         launcher.getEnvironment().setComplianceLevel(8);
         launcher.run();
+        diagnostics.clear();
 
         final Factory factory = launcher.getFactory();
         final ProcessingManager processingManager = new QueueProcessingManager(factory);
-        final RefinementProcessor processor = new RefinementProcessor(factory, ee);
+        final RefinementProcessor processor = new RefinementProcessor(factory);
         processingManager.addProcessor(processor);
 
         try {
@@ -71,6 +66,6 @@ public static ErrorEmitter launch(String... paths) {
             throw e;
         }
 
-        return ee;
+        return;
     }
 }