diff --git a/java/.externalToolBuilders/AutoBuild.launch b/java/.externalToolBuilders/AutoBuild.launch new file mode 100644 index 000000000..9bdf4dda0 --- /dev/null +++ b/java/.externalToolBuilders/AutoBuild.launch @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/java/.project b/java/.project index dbf8dddfe..a4d62a2d9 100644 --- a/java/.project +++ b/java/.project @@ -10,6 +10,16 @@ + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/AutoBuild.launch + + + org.eclipse.jdt.core.javanature diff --git a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java index c2a10dff6..4163d1617 100644 --- a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java +++ b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java @@ -28,6 +28,8 @@ import java.util.TreeMap; 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 class ErrorMessageSimplifier { 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 class ErrorMessageSimplifier { 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 class ErrorMessageSimplifier { 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;