Remove ErrorEmitter from CommandLineLauncher

Author: rcosta358

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

@@ -17,51 +17,38 @@
 
 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]));
+        System.out.println(diagnostics.foundError() ? diagnostics.toString() : "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()) {
                 diagnostics.add(new CustomError("The path " + path + " was not found"));
-                return ee;
+                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();
 
         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 {
@@ -74,6 +61,6 @@ public static ErrorEmitter launch(String... paths) {
             throw e;
         }
 
-        return ee;
+        return;
     }
 }

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

@@ -1,89 +1,8 @@
 package liquidjava.diagnostics;
 
-import java.net.URI;
-import spoon.reflect.cu.SourcePosition;
-
 public class ErrorEmitter {
 
-    private String titleMessage;
-    private String fullMessage;
-    private URI filePath;
-    private ErrorPosition position;
-    private int errorStatus;
-    private TranslationTable map;
-
-    public ErrorEmitter() {
-    }
-
-    public void addError(String titleMessage, String msg, SourcePosition p, int errorStatus, TranslationTable map) {
-        this.titleMessage = titleMessage;
-        fullMessage = msg;
-        try {
-            position = new ErrorPosition(p.getLine(), p.getColumn(), p.getEndLine(), p.getEndColumn());
-            filePath = p.getFile().toURI();
-        } catch (Exception ignored) {
-            fullMessage = "Seems like this error is created in generated part of source code, so no precise"
-                    + " position is provided. " + fullMessage;
-            position = null;
-            filePath = null;
-        }
-        this.errorStatus = errorStatus;
-        this.map = map;
-    }
-
-    public void addError(String titleMessage, String msg, SourcePosition p, int errorStatus) {
-        this.titleMessage = titleMessage;
-        fullMessage = msg;
-        try {
-            position = new ErrorPosition(p.getLine(), p.getColumn(), p.getEndLine(), p.getEndColumn());
-            filePath = p.getFile().toURI();
-        } catch (Exception ignored) {
-            fullMessage = "Seems like this error is created in generated part of source code, so no precise"
-                    + " position is provided. " + fullMessage;
-            position = null;
-            filePath = null;
-        }
-        this.errorStatus = errorStatus;
-    }
-
-    public void addError(String titleMessage, String msg, int errorStatus) {
-        this.titleMessage = titleMessage;
-        fullMessage = msg;
-        this.errorStatus = errorStatus;
-    }
-
     public boolean foundError() {
-        return fullMessage != null;
-    }
-
-    public String getTitleMessage() {
-        return titleMessage;
-    }
-
-    public String getFullMessage() {
-        return fullMessage;
-    }
-
-    public URI getFilePath() {
-        return filePath;
-    }
-
-    public void reset() {
-        fullMessage = null;
-        position = null;
-        errorStatus = 0;
-        map = null;
-    }
-
-    public ErrorPosition getPosition() {
-        return position;
-    }
-
-    public int getErrorStatus() {
-        return errorStatus;
-    }
-
-    public TranslationTable getVCMap() {
-        return map;
+        return false;
     }
 }