Fixes processing#3103

Manindra29 · Manindra29 · commit 5a1165868a0b · 2015-02-11T00:42:05.000-08:00
diff --git a/java/.externalToolBuilders/AutoBuild.launch b/java/.externalToolBuilders/AutoBuild.launch
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="processing-java"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/processing-java/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value=""/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/java/.project b/java/.project
@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/AutoBuild.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java
@@ -28,6 +28,8 @@
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.internal.compiler.problem.DefaultProblem;
 
+import processing.app.Base;
+
 public class ErrorMessageSimplifier {
   /**
    * Mapping between ProblemID constant and the constant name. Holds about 650
@@ -85,12 +87,12 @@ public static String getSimplifiedErrorMessage(Problem problem) {
       return null;
     IProblem iprob = problem.getIProblem();
     String args[] = iprob.getArguments();
-//    log("Simplifying message: " + problem.getMessage() + " ID: "
-//        + getIDName(iprob.getID()));
-//    log("Arg count: " + args.length);
-//    for (int i = 0; i < args.length; i++) {
-//      log("Arg " + args[i]);
-//    }
+    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]);
+    }
 
     String result = null;
     
@@ -114,6 +116,9 @@ public static String getSimplifiedErrorMessage(Problem problem) {
           if(args[0].equals("AssignmentOperator Expression")){
             result = "Consider adding a \"=\"";
           }
+          else if (args[0].equalsIgnoreCase(") Statement")){
+            result = getErrorMessageForBracket(args[0].charAt(0));
+          }
           else {
             result = "Error on \"" + args[0] + "\"";
           }
@@ -141,7 +146,12 @@ public static String getSimplifiedErrorMessage(Problem problem) {
           result = getErrorMessageForBracket(args[1].charAt(0));
         }
         else {
-          result = "Error on \"" + args[0] + "\"Consider adding a \"" + args[1] + "\"";
+          if(args[1].equalsIgnoreCase("Statement")){ // See #3104
+            result = "Error on \"" + args[0] + "\", statement expected after this.";
+          }
+          else {
+            result = "Error on \"" + args[0] + "\"Consider adding a \"" + args[1] + "\"";
+          }
         }
       }
       break;
