Refactor LJDiagnostics

Author: rcosta358

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

@@ -1,67 +1,34 @@
 package liquidjava.diagnostics;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-
 import liquidjava.diagnostics.errors.LJError;
 import liquidjava.diagnostics.warnings.LJWarning;
-import liquidjava.processor.context.PlacementInCode;
 
 /**
- * Singleton class to store diagnostics information (errors, warnings, translation map) during the verification process
+ * Singleton class to store diagnostics (errors and warnings) during the verification process
  * 
  * @see LJError
  * @see LJWarning
  */
 public class LJDiagnostics {
-    private static LJDiagnostics instance;
+    public static final LJDiagnostics diagnostics = new LJDiagnostics();
 
     private ArrayList<LJError> errors;
     private ArrayList<LJWarning> warnings;
-    private HashMap<String, PlacementInCode> translationMap;
 
     private LJDiagnostics() {
         this.errors = new ArrayList<>();
         this.warnings = new ArrayList<>();
-        this.translationMap = new HashMap<>();
-    }
-
-    public static LJDiagnostics getInstance() {
-        if (instance == null)
-            instance = new LJDiagnostics();
-        return instance;
-    }
-
-    public static LJDiagnostics add(LJError error) {
-        LJDiagnostics instance = getInstance();
-        instance.addError(error);
-        return instance;
-    }
-
-    public static LJDiagnostics add(LJWarning warning) {
-        LJDiagnostics instance = getInstance();
-        instance.addWarning(warning);
-        return instance;
     }
 
-    public static LJDiagnostics add(HashMap<String, PlacementInCode> map) {
-        LJDiagnostics instance = getInstance();
-        instance.setTranslationMap(map);
-        return instance;
-    }
-
-    public void addError(LJError error) {
+    public void add(LJError error) {
         this.errors.add(error);
     }
 
-    public void addWarning(LJWarning warning) {
+    public void add(LJWarning warning) {
         this.warnings.add(warning);
     }
 
-    public void setTranslationMap(HashMap<String, PlacementInCode> map) {
-        this.translationMap = map;
-    }
-
     public boolean foundError() {
         return !this.errors.isEmpty();
     }
@@ -78,10 +45,6 @@ public ArrayList<LJWarning> getWarnings() {
         return this.warnings;
     }
 
-    public HashMap<String, PlacementInCode> getTranslationMap() {
-        return this.translationMap;
-    }
-
     public LJError getError() {
         return foundError() ? this.errors.get(0) : null;
     }
@@ -93,7 +56,6 @@ public LJWarning getWarning() {
     public void clear() {
         this.errors.clear();
         this.warnings.clear();
-        this.translationMap.clear();
     }
 
     @Override

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/LJError.java

@@ -1,6 +1,9 @@
 package liquidjava.diagnostics.errors;
 
+import java.util.HashMap;
+
 import liquidjava.diagnostics.ErrorPosition;
+import liquidjava.processor.context.PlacementInCode;
 import liquidjava.utils.Utils;
 import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtElement;
@@ -15,12 +18,14 @@ public abstract class LJError extends Exception {
     private CtElement element;
     private ErrorPosition position;
     private SourcePosition location;
+    private HashMap<String, PlacementInCode> translationTable;
 
     public LJError(String title, String message, CtElement element) {
         super(message);
         this.title = title;
         this.message = message;
         this.element = element;
+        this.translationTable = new HashMap<>();
         try {
             this.location = element.getPosition();
             this.position = ErrorPosition.fromSpoonPosition(element.getPosition());
@@ -50,6 +55,14 @@ public SourcePosition getLocation() {
         return location;
     }
 
+    public HashMap<String, PlacementInCode> getTranslationTable() {
+        return translationTable;
+    }
+
+    public void setTranslationTable(HashMap<String, PlacementInCode> translationTable) {
+        this.translationTable = translationTable;
+    }
+
     @Override
     public abstract String toString();