Replace ErrorEmitter with LJDiagnostics

Author: rcosta358

…/src/main/java/testSuite/SimpleTest.java …c/main/java/testSuite/CorrectSimple.javaliquidjava-example/src/main/java/testSuite/SimpleTest.java renamed to liquidjava-example/src/main/java/testSuite/CorrectSimple.java liquidjava-example/src/main/java/testSuite/SimpleTest.java renamed to 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")

…stSuite/ErrorExtRefNonExistentClass.java …Suite/WarningExtRefNonExistentClass.javaliquidjava-example/src/main/java/testSuite/ErrorExtRefNonExistentClass.java renamed to liquidjava-example/src/main/java/testSuite/WarningExtRefNonExistentClass.java liquidjava-example/src/main/java/testSuite/ErrorExtRefNonExistentClass.java renamed to 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(); 
 }

…tSuite/ErrorExtRefNonExistentMethod.java …uite/WarningExtRefNonExistentMethod.javaliquidjava-example/src/main/java/testSuite/ErrorExtRefNonExistentMethod.java renamed to liquidjava-example/src/main/java/testSuite/WarningExtRefNonExistentMethod.java liquidjava-example/src/main/java/testSuite/ErrorExtRefNonExistentMethod.java renamed to 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")

…stSuite/ErrorExtRefWrongConstructor.java …Suite/WarningExtRefWrongConstructor.javaliquidjava-example/src/main/java/testSuite/ErrorExtRefWrongConstructor.java renamed to liquidjava-example/src/main/java/testSuite/WarningExtRefWrongConstructor.java liquidjava-example/src/main/java/testSuite/ErrorExtRefWrongConstructor.java renamed to 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")

…Suite/ErrorExtRefWrongParameterType.java …ite/WarningExtRefWrongParameterType.javaliquidjava-example/src/main/java/testSuite/ErrorExtRefWrongParameterType.java renamed to liquidjava-example/src/main/java/testSuite/WarningExtRefWrongParameterType.java liquidjava-example/src/main/java/testSuite/ErrorExtRefWrongParameterType.java renamed to 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")

…a/testSuite/ErrorExtRefWrongRetType.java …testSuite/WarningExtRefWrongRetType.javaliquidjava-example/src/main/java/testSuite/ErrorExtRefWrongRetType.java renamed to liquidjava-example/src/main/java/testSuite/WarningExtRefWrongRetType.java liquidjava-example/src/main/java/testSuite/ErrorExtRefWrongRetType.java renamed to 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

@@ -6,7 +6,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import liquidjava.diagnostics.ErrorEmitter;
 import liquidjava.diagnostics.errors.CustomError;
 import liquidjava.processor.RefinementProcessor;
 import spoon.Launcher;
@@ -27,7 +26,12 @@ public static void main(String[] args) {
         }
         List<String> paths = Arrays.asList(args);
         launch(paths.toArray(new String[0]));
-        System.out.println(diagnostics.foundError() ? diagnostics.toString() : "Correct! Passed Verification.");
+        if (diagnostics.foundError()) {
+            System.out.println(diagnostics.getErrorOutput());
+        } else {
+            System.out.println(diagnostics.getWarningOutput());
+            System.out.println("Correct! Passed Verification.");
+        }
     }
 
     public static void launch(String... paths) {
@@ -45,6 +49,7 @@ public static void launch(String... paths) {
         launcher.getEnvironment().setNoClasspath(true);
         launcher.getEnvironment().setComplianceLevel(8);
         launcher.run();
+        diagnostics.clear();
 
         final Factory factory = launcher.getFactory();
         final ProcessingManager processingManager = new QueueProcessingManager(factory);

liquidjava-verifier/src/main/java/liquidjava/diagnostics/ErrorEmitter.java

@@ -58,8 +58,7 @@ public void clear() {
         this.warnings.clear();
     }
 
-    @Override
-    public String toString() {
+    public String getErrorOutput() {
         StringBuilder sb = new StringBuilder();
         if (foundError()) {
             for (LJError error : errors) {
@@ -76,4 +75,14 @@ public String toString() {
         }
         return sb.toString();
     }
+
+    public String getWarningOutput() {
+        StringBuilder sb = new StringBuilder();
+        if (foundWarning()) {
+            for (LJWarning warning : warnings) {
+                sb.append(warning.toString()).append("\n");
+            }
+        }
+        return sb.toString();
+    }
 }

liquidjava-verifier/src/main/java/liquidjava/diagnostics/LJDiagnostics.java

@@ -62,8 +62,12 @@ public TranslationTable getTranslationTable() {
 
     public String toString(String extra) {
         StringBuilder sb = new StringBuilder();
-        sb.append(title).append(" at: \n").append(element.toString().replace("@liquidjava.specification.", "@"))
-                .append("\n\n");
+        sb.append(title);
+
+        if (element != null)
+            sb.append(" at: \n").append(element.toString().replace("@liquidjava.specification.", "@"));
+
+        sb.append("\n");
         sb.append(message).append("\n");
         if (extra != null)
             sb.append(extra).append("\n");