Clean up ErrorMessageSimplifier

Remove weird unused thread-spawning constructor
Accept IProblem instead of whole JavaProblem
Move fallback process() from JavaProblem to EMSimplifier as a default
case
Add debug switch and move debug logging into if blocks

java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java

@@ -23,11 +23,14 @@ package processing.mode.java.pdex;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.internal.compiler.problem.DefaultProblem;
 
 import processing.app.Language;
+import processing.app.Messages;
 import processing.core.PApplet;
 import processing.data.StringList;
 
@@ -42,25 +45,20 @@ public class ErrorMessageSimplifier {
    */
   private static TreeMap<Integer, String> constantsMap;
 
+  private static final boolean DEBUG = false;
 
-  public ErrorMessageSimplifier() {
-
-    new Thread() {
-      public void run() {
-        prepareConstantsList();
-      }
-    }.start();
-  }
-
+  private static final Pattern tokenRegExp = Pattern.compile("\\b token\\b");
 
   private static void prepareConstantsList() {
-    constantsMap = new TreeMap<Integer, String>();
+    constantsMap = new TreeMap<>();
     Class<DefaultProblem> probClass = DefaultProblem.class;
     Field f[] = probClass.getFields();
     for (Field field : f) {
       if (Modifier.isStatic(field.getModifiers()))
         try {
-          //System.out.println(field.getName() + " :" + field.get(null));
+          if (DEBUG) {
+            Messages.log(field.getName() + " :" + field.get(null));
+          }
           Object val = field.get(null);
           if (val instanceof Integer) {
             constantsMap.put((Integer) (val), field.getName());
@@ -70,7 +68,9 @@ public class ErrorMessageSimplifier {
           break;
         }
     }
-    //System.out.println("Total items: " + constantsMap.size());
+    if (DEBUG) {
+      Messages.log("Total items: " + constantsMap.size());
+    }
   }
 
 
@@ -85,17 +85,19 @@ public class ErrorMessageSimplifier {
   /**
    * Tones down the jargon in the ecj reported errors.
    */
-  public static String getSimplifiedErrorMessage(JavaProblem problem) {
-    if (problem == null) return null;
+  public static String getSimplifiedErrorMessage(IProblem iprob) {
+    if (iprob == null) return null;
 
-    IProblem iprob = problem.getIProblem();
     String args[] = iprob.getArguments();
-//    Base.log("Simplifying message: " + problem.getMessage() + " ID: "
-//        + getIDName(iprob.getID()));
-//    Base.log("Arg count: " + args.length);
-//    for (int i = 0; i < args.length; i++) {
-//      Base.log("Arg " + args[i]);
-//    }
+
+    if (DEBUG) {
+      Messages.log("Simplifying message: " + iprob.getMessage() +
+                       " ID: " + getIDName(iprob.getID()));
+      Messages.log("Arg count: " + args.length);
+      for (String arg : args) {
+        Messages.log("Arg " + arg);
+      }
+    }
 
     String result = null;
 
@@ -259,10 +261,24 @@ public class ErrorMessageSimplifier {
       if (args.length > 0) {
         result = Language.interpolate("editor.status.hiding_enclosing_type", args[0]);
       }
+      break;
+
+    default:
+      String message = iprob.getMessage();
+      if (message != null) {
+        // Remove all instances of token
+        // "Syntax error on token 'blah', delete this token"
+        Matcher matcher = tokenRegExp.matcher(message);
+        message = matcher.replaceAll("");
+        result = message;
+      }
     }
 
-    //log("Simplified Error Msg: " + result);
-    return (result == null) ? problem.getMessage() : result;
+    if (DEBUG) {
+      Messages.log("Simplified Error Msg: " + result);
+    }
+
+    return result;
   }
 
 

java/src/processing/mode/java/pdex/JavaProblem.java

@@ -20,9 +20,6 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 
 package processing.mode.java.pdex;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.eclipse.jdt.core.compiler.IProblem;
 
 import processing.app.Problem;
@@ -83,9 +80,7 @@ public class JavaProblem implements Problem {
     }
     this.tabIndex = tabIndex;
     this.lineNumber = lineNumber;
-    this.message = process(iProblem);
-    this.message = ErrorMessageSimplifier.getSimplifiedErrorMessage(this);
-    //ErrorMessageSimplifier.getSimplifiedErrorMessage(this);
+    this.message = ErrorMessageSimplifier.getSimplifiedErrorMessage(iProblem);
   }
 
   public void setPDEOffsets(int startOffset, int stopOffset){
@@ -157,30 +152,6 @@ public class JavaProblem implements Problem {
     importSuggestions = a;
   }
 
-  private static final Pattern tokenRegExp = Pattern.compile("\\b token\\b");
-
-  public static String process(IProblem problem) {
-    return process(problem.getMessage());
-  }
-
-  /**
-   * Processes error messages and attempts to make them a bit more english like.
-   * Currently performs:
-   * <li>Remove all instances of token. "Syntax error on token 'blah', delete this token"
-   * becomes "Syntax error on 'blah', delete this"
-   * @param message - The message to be processed
-   * @return String - The processed message
-   */
-  public static String process(String message) {
-    // Remove all instances of token
-    // "Syntax error on token 'blah', delete this token"
-	if(message == null) return null;
-    Matcher matcher = tokenRegExp.matcher(message);
-    message = matcher.replaceAll("");
-
-    return message;
-  }
-
   // Split camel case words into separate words.
   // "VaraibleDeclaration" becomes "Variable Declaration"
   // But sadly "PApplet" become "P Applet" and so on.