From e8f51cca8c204ffa687e10933f35b0dbbfdd9ef9 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 12 May 2015 10:49:54 -0400 Subject: [PATCH] fix open/close message consistency, missing error message (fixes #3253 --- build/shared/lib/languages/PDE.properties | 14 +++++++------- .../mode/java/pdex/ErrorMessageSimplifier.java | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties index 15ae8cdd4..8ec7db958 100644 --- a/build/shared/lib/languages/PDE.properties +++ b/build/shared/lib/languages/PDE.properties @@ -333,13 +333,13 @@ editor.status.warning = Warning editor.status.error = Error editor.status.error_on = Error on "%s" editor.status.missing.default = Missing "%c" -editor.status.missing.semi_colon = Missing a semi-colon ";" -editor.status.missing.open_sq_bracket = Missing opening square bracket "[" -editor.status.missing.closing_sq_bracket = Missing closing square bracket "]" -editor.status.missing.open_paren = Missing opening parentheses "(" -editor.status.missing.closing_paren = Missing closing parentheses ")" -editor.status.missing.open_curly_bracket = Missing opening curly bracket "{" -editor.status.missing.closing_curly_bracket = Missing closing curly bracket "}" +editor.status.missing.semicolon = Missing a semicolon ";" +editor.status.missing.left_sq_bracket = Missing left square bracket "[" +editor.status.missing.right_sq_bracket = Missing right square bracket "]" +editor.status.missing.left_paren = Missing left parenthesis "(" +editor.status.missing.right_paren = Missing right parenthesis ")" +editor.status.missing.left_curly_bracket = Missing left curly bracket "{" +editor.status.missing.right_curly_bracket = Missing right curly bracket "}" editor.status.missing.add = Consider adding "%s" editor.status.reserved_words = "color" and "int" are reserved words & cannot be used as variable names # methoddef, varname, classname, namefield, typeA, typeB will be replaced with the correct value during runtime (don't translate) diff --git a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java index 79ce70cdf..fe0827fe8 100644 --- a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java +++ b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java @@ -274,13 +274,13 @@ public class ErrorMessageSimplifier { static private String getErrorMessageForBracket(char c) { switch (c) { - case ';': return Language.text("editor.status.missing.semi_colon"); - case '[': return Language.text("editor.status.missing.open_sq_bracket"); - case ']': return Language.text("editor.status.missing.closing_sq_bracket"); - case '(': return Language.text("editor.status.missing.open_paren"); - case ')': return Language.text("editor.status.missing.close_paren"); - case '{': return Language.text("editor.status.missing.open_curly_bracket"); - case '}': return Language.text("editor.status.missing.closing_curly_bracket"); + case ';': return Language.text("editor.status.missing.semicolon"); + case '[': return Language.text("editor.status.missing.left_sq_bracket"); + case ']': return Language.text("editor.status.missing.right_sq_bracket"); + case '(': return Language.text("editor.status.missing.left_paren"); + case ')': return Language.text("editor.status.missing.right_paren"); + case '{': return Language.text("editor.status.missing.left_curly_bracket"); + case '}': return Language.text("editor.status.missing.right_curly_bracket"); } // This seems to be unreachable and wasn't in PDE.properties. // I've added it for 3.0a8, but that seems gross. [fry]