Revert "Bug 531714 - Switch Expressions - Enabling Preview check addition post-merge"

This reverts commit e5cba07ba2408392b25f89bc7df93b24d3f6954c.

4 files changed, 7 insertions, 37 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java
index 93bb92f344..aa75d5bf73 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/IProblem.java
@@ -2093,16 +2093,12 @@ void setSourceStart(int sourceStart);
 	/** @since 3.16 BETA_JAVA_12 */
 	int SwitchExpressionTrailingSwitchLabels = Internal + 1605;
 	/** @since 3.16 BETA_JAVA_12 */
-	int switchMixedCase = Syntax + 1606;
+	int MixedCase = Syntax + 1606;
 	/** @since 3.16 BETA_JAVA_12 */
 	int SwitchExpressionMissingDefaultCase = Internal + 1607;
 	/** @since 3.16 BETA_JAVA_12 */
     int SwitchExpressionNotBelow12 = Internal + Syntax + 1608;
 	/** @since 3.16 BETA_JAVA_12 */
     int SwitchCaseLabelWithArrowNotBelow12 = Internal + Syntax + 1609;
-	/** @since 3.16 BETA_JAVA_12 */
-    int SwitchExpressionPreviewDisabled = Internal + Syntax + 1610;
-	/** @since 3.16 BETA_JAVA_12 */
-    int SwitchCaseLabelWithArrowPreviewDisabled = Internal + Syntax + 1611;
 
 	}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
index ef860fe7ef..52cdb5fe6f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -9493,8 +9493,6 @@ protected void consumeCaseLabelExpr() {
 	CaseStatement caseStatement = (CaseStatement) this.astStack[this.astPtr];
 	if (!this.parsingJava12Plus) {
 		problemReporter().caseStatementWithArrowNotBelow12(caseStatement);
-	} else if (!this.options.enablePreviewFeatures){
-		problemReporter().caseStatementWithArrowIsPreview(caseStatement);		
 	}
 	caseStatement.isExpr = true;
 }
@@ -9504,8 +9502,6 @@ protected void consumeDefaultLabelExpr() {
 	CaseStatement defaultStatement = (CaseStatement) this.astStack[this.astPtr];
 	if (!this.parsingJava12Plus) {
 		problemReporter().caseStatementWithArrowNotBelow12(defaultStatement);
-	} else if (!this.options.enablePreviewFeatures){
-		problemReporter().caseStatementWithArrowIsPreview(defaultStatement);		
 	}
 	defaultStatement.isExpr = true;
 }
@@ -9517,8 +9513,6 @@ protected void consumeSwitchExpression() {
 
 		if (!this.parsingJava12Plus) {
 			problemReporter().switchExpressionsNotBelow12(s);
-		} else if (!this.options.enablePreviewFeatures) {
-			problemReporter().switchExpressionIsPreview(s);
 		}
 
 		pushOnExpressionStack(s);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
index 28b56c044b..366c8f146e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
@@ -11044,7 +11044,7 @@ public void switchExpressionTrailingSwitchLabels(Statement stmt) {
 }
 public void switchExpressionMixedCase(ASTNode statement) {
 	this.handle(
-		IProblem.switchMixedCase,
+		IProblem.MixedCase,
 		NoArgument,
 		NoArgument,
 		statement.sourceStart,
@@ -11052,11 +11052,11 @@ public void switchExpressionMixedCase(ASTNode statement) {
 }
 public void switchExpressionsNotBelow12(SwitchExpression switchExpr) {
 	this.handle(
-		IProblem.SwitchExpressionNotBelow12,
-		NoArgument,
-		NoArgument,
-		switchExpr.sourceStart,
-		switchExpr.sourceEnd);
+			IProblem.SwitchExpressionNotBelow12,
+			NoArgument,
+			NoArgument,
+			switchExpr.sourceStart,
+			switchExpr.sourceEnd);
 }
 public void caseStatementWithArrowNotBelow12(CaseStatement caseStatement) {
 	this.handle(
@@ -11066,20 +11066,4 @@ public void caseStatementWithArrowNotBelow12(CaseStatement caseStatement) {
 		caseStatement.sourceStart,
 		caseStatement.sourceEnd);
 }
-public void switchExpressionIsPreview(SwitchExpression switchExpr) {
-	this.handle(
-		IProblem.SwitchExpressionPreviewDisabled,
-		NoArgument,
-		NoArgument,
-		switchExpr.sourceStart,
-		switchExpr.sourceEnd);
-}
-public void caseStatementWithArrowIsPreview(CaseStatement caseStatement) {
-	this.handle(
-		IProblem.SwitchCaseLabelWithArrowPreviewDisabled,
-		NoArgument,
-		NoArgument,
-		caseStatement.sourceStart,
-		caseStatement.sourceEnd);
-}
 }
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 88dc240fb7..74c9bcb8a8 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
@@ -980,10 +980,6 @@
 1607 = A switch expression should have a default case
 1608 = Switch expressions are allowed only at source level 12 or above
 1609 = Switch Case Labels with '->' are allowed only at source level 12 or above
-1608 = Switch expressions are allowed only at source level 12 or above
-1609 = Switch Case Labels with '->' are allowed only at source level 12 or above
-1610 = Switch expression is a preview feature; use --enable-preview at source level 12 or above to enable
-1611 = Switch Case Label with '->' is a preview feature; use --enable-preview at source level 12 or above to enable
 
 
 ### ELABORATIONS