diff options
| author | Manoj Palat | 2019-07-16 23:28:35 +0000 |
|---|---|---|
| committer | Manoj Palat | 2019-07-16 23:28:35 +0000 |
| commit | 7a6094ea835d0dfd034d8054fa30b58d1eb99502 (patch) | |
| tree | c70e5c81ad5a02fc4fc4336e13416acb3b6a7dae | |
| parent | 5cae2bc4507d466b23a63b26e6dbcba0a97c2b1b (diff) | |
| download | eclipse.jdt.core-7a6094ea835d0dfd034d8054fa30b58d1eb99502.tar.gz eclipse.jdt.core-7a6094ea835d0dfd034d8054fa30b58d1eb99502.tar.xz eclipse.jdt.core-7a6094ea835d0dfd034d8054fa30b58d1eb99502.zip | |
Change-Id: Ie414c4ac1b5949f35a057c8ac07ed3db7da49dc1
3 files changed, 6 insertions, 7 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java index 3716354e63..c4147f8a3c 100644 --- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java +++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java @@ -1183,7 +1183,7 @@ public void test011_problem_categories() { expectedProblemAttributes.put("PreviewFeatureDisabled", new ProblemAttributes(CategorizedProblem.CAT_COMPLIANCE)); expectedProblemAttributes.put("PreviewFeatureUsed", new ProblemAttributes(CategorizedProblem.CAT_COMPLIANCE)); expectedProblemAttributes.put("PreviewFeatureNotSupported", new ProblemAttributes(CategorizedProblem.CAT_COMPLIANCE)); - expectedProblemAttributes.put("PreviewEnablingNotAllowed", new ProblemAttributes(CategorizedProblem.CAT_PREVIEW_RELATED)); + expectedProblemAttributes.put("PreviewFeaturesNotAllowed", new ProblemAttributes(CategorizedProblem.CAT_PREVIEW_RELATED)); expectedProblemAttributes.put("SwitchExpressionsYieldIncompatibleResultExpressionTypes", new ProblemAttributes(CategorizedProblem.CAT_PREVIEW_RELATED)); expectedProblemAttributes.put("SwitchExpressionsYieldEmptySwitchBlock", new ProblemAttributes(CategorizedProblem.CAT_PREVIEW_RELATED)); expectedProblemAttributes.put("SwitchExpressionsYieldNoResultExpression", new ProblemAttributes(CategorizedProblem.CAT_PREVIEW_RELATED)); @@ -2152,7 +2152,7 @@ public void test012_compiler_problems_tuning() { expectedProblemAttributes.put("PreviewFeatureDisabled", SKIP); expectedProblemAttributes.put("PreviewFeatureUsed", SKIP); expectedProblemAttributes.put("PreviewFeatureNotSupported", SKIP); - expectedProblemAttributes.put("PreviewEnablingNotAllowed", SKIP); + expectedProblemAttributes.put("PreviewFeaturesNotAllowed", SKIP); expectedProblemAttributes.put("SwitchExpressionsYieldIncompatibleResultExpressionTypes", SKIP); expectedProblemAttributes.put("SwitchExpressionsYieldEmptySwitchBlock", SKIP); expectedProblemAttributes.put("SwitchExpressionsYieldNoResultExpression", SKIP); 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 ca1de61b77..78762b233a 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 @@ -2067,10 +2067,9 @@ void setSourceStart(int sourceStart); int PreviewFeatureUsed = Compliance + 1104; /** @since 3.18 */ int PreviewFeatureNotSupported = Compliance + 1105; - /** @since 3.18 BETA_JAVA13 - * @noreference standard preview related error */ - int PreviewEnablingNotAllowed = PreviewRelated + 1106; - + /** @since 3.18 BETA_JAVA13 */ + int PreviewFeaturesNotAllowed = PreviewRelated + 1106; + /** @since 3.13 */ int UnlikelyCollectionMethodArgumentType = 1200; /** @since 3.13 */ 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 4cabca6a07..24b19c3008 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 @@ -837,7 +837,7 @@ public void abortDueToInternalError(String errorMessage, ASTNode location) { public void abortDueToPreviewEnablingNotAllowed(String sourceLevel, String expectedSourceLevel) { String[] args = new String[] {sourceLevel, expectedSourceLevel}; this.handle( - IProblem.PreviewEnablingNotAllowed, + IProblem.PreviewFeaturesNotAllowed, args, args, ProblemSeverities.Error | ProblemSeverities.Abort | ProblemSeverities.Fatal, |