Bug 545983: [12] EJC allows switch expression to be concluded without
returning a value
Fixing the error message
Change-Id: I86334dc6025d234c7c8ea66e5f07043e9008c305
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionTest.java
index 31eba3a..a936514 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionTest.java
@@ -2437,7 +2437,7 @@
"1. ERROR in X.java (at line 11)\n" +
" continue;\n" +
" ^^^^^^^^^\n" +
- "Illegal last statement in Switch expression case body - continue, return not allowed\n" +
+ "'continue' or 'return' cannot be the last statement in a Switch expression case body\n" +
"----------\n");
}
public void testBug545983_02() {
@@ -2469,7 +2469,7 @@
"1. ERROR in X.java (at line 11)\n" +
" return 2;\n" +
" ^^^^^^^^^\n" +
- "Illegal last statement in Switch expression case body - continue, return not allowed\n" +
+ "'continue' or 'return' cannot be the last statement in a Switch expression case body\n" +
"----------\n");
}
public void testBug547125_01() {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
index c55d802..15e133d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties
@@ -985,7 +985,7 @@
1609 = Switch Case Labels with '->' are allowed only at source level 12 or above
1610 = Break of a switch expression should have a value
1611 = A Switch expression should cover all possible values
-1612 = Illegal last statement in Switch expression case body - continue, return not allowed
+1612 = 'continue' or 'return' cannot be the last statement in a Switch expression case body
### ELABORATIONS
## Access restrictions
