diff options
14 files changed, 45 insertions, 45 deletions
diff --git a/org.eclipse.jdt.core/.settings/.api_filters b/org.eclipse.jdt.core/.settings/.api_filters index 1c0081b8a6..a0ecc9a940 100644 --- a/org.eclipse.jdt.core/.settings/.api_filters +++ b/org.eclipse.jdt.core/.settings/.api_filters @@ -7,7 +7,7 @@ <message_argument value="3.16.0"/> </message_arguments> </filter> - <filter comment="Address this while merging BETA_JAVA_12" id="924844039"> + <filter comment="Address this while merging 12" id="924844039"> <message_arguments> <message_argument value="3.17.0"/> <message_argument value="3.17.0"/> @@ -15,7 +15,7 @@ </filter> </resource> <resource path="compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java" type="org.eclipse.jdt.core.compiler.CategorizedProblem"> - <filter comment="To be addressed while merging BETA_JAVA_12" id="336658481"> + <filter comment="To be addressed while merging 12" id="336658481"> <message_arguments> <message_argument value="org.eclipse.jdt.core.compiler.CategorizedProblem"/> <message_argument value="CAT_COMPLIANCE"/> diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java index 3bfb7c9f10..93ea8b8dee 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java @@ -104,7 +104,7 @@ public abstract class CategorizedProblem implements IProblem { */ public static final int CAT_MODULE = 160; /** - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final int CAT_COMPLIANCE = 170; 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 5d9da22ba2..50cec157fd 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 @@ -373,7 +373,7 @@ void setSourceStart(int sourceStart); int Javadoc = 0x80000000; /** @since 3.14 */ int ModuleRelated = 0x00800000; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int Compliance = 0x00400000; /** @@ -2047,11 +2047,11 @@ void setSourceStart(int sourceStart); int LambdaShapeComputationError = 1101; /** @since 3.13 */ int ProblemNotAnalysed = 1102; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int PreviewFeatureDisabled = Compliance + 1103; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int PreviewFeatureUsed = Compliance + 1104; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int PreviewFeatureNotSupported = Compliance + 1105; /** @since 3.13 */ @@ -2086,24 +2086,24 @@ void setSourceStart(int sourceStart); int VarIsNotAllowedHere = Syntax + 1511; // ''var'' is not allowed here /** @since 3.16 */ int VarCannotBeMixedWithNonVarParams = Syntax + 1512; // ''var'' cannot be mixed with explicit or implicit parameters - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionsIncompatibleResultExpressionTypes = TypeRelated + 1600; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionsEmptySwitchBlock = Internal + 1601; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionsNoResultExpression = TypeRelated + 1602; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionSwitchLabeledBlockCompletesNormally = Internal + 1603; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionLastStatementCompletesNormally = Internal + 1604; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionTrailingSwitchLabels = Internal + 1605; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int switchMixedCase = Syntax + 1606; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionMissingDefaultCase = Internal + 1607; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionBreakMissingValue = Internal + 1610; - /** @since 3.17 BETA_JAVA_12 */ + /** @since 3.17 */ int SwitchExpressionMissingEnumConstantCase = Internal + 1611; } diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java index 969b878ce5..8993f689ba 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/AST.java @@ -283,7 +283,7 @@ public final class AST { * up to and including Java SE 12 (aka JDK 12). * </p> * - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final int JLS12 = 12; /** @@ -2580,7 +2580,7 @@ public final class AST { * and there are no statements or switch cases. * * @return a new unparented labeled switch expression node - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public SwitchExpression newSwitchExpression() { SwitchExpression result = new SwitchExpression(this); diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTMatcher.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTMatcher.java index b3dc0c63be..d0c6107029 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTMatcher.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTMatcher.java @@ -2297,7 +2297,7 @@ public class ASTMatcher { * @return <code>true</code> if the subtree matches, or * <code>false</code> if they do not match or the other object has a * different node type or is <code>null</code> - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public boolean match(SwitchExpression node, Object other) { if (!(other instanceof SwitchExpression)) { diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java index 6fb9958f05..b4fda201f6 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTNode.java @@ -959,7 +959,7 @@ public abstract class ASTNode { * Node type constant indicating a node of type * <code>SwitchExpression</code>. * @see SwitchExpression - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final int SWITCH_EXPRESSION = 100; diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTVisitor.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTVisitor.java index 71b9ac8fa8..8fca35e446 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTVisitor.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTVisitor.java @@ -1533,7 +1533,7 @@ public abstract class ASTVisitor { * @return <code>true</code> if the children of this node should be * visited, and <code>false</code> if the children of this node should * be skipped - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public boolean visit(SwitchExpression node) { return true; @@ -2847,7 +2847,7 @@ public abstract class ASTVisitor { * </p> * * @param node the node to visit - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public void endVisit(SwitchExpression node) { // default implementation: do nothing diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BreakStatement.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BreakStatement.java index 2e4cdbc58d..83ad302fcc 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BreakStatement.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/BreakStatement.java @@ -43,7 +43,7 @@ public class BreakStatement extends Statement { /** * The "expression" structural property of this node type (child type: {@link Expression}). (added in JEP 325). - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final ChildPropertyDescriptor EXPRESSION_PROPERTY = new ChildPropertyDescriptor(BreakStatement.class, "expression", Expression.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$); @@ -217,7 +217,7 @@ public class BreakStatement extends Statement { * * @return the expression, or <code>null</code> if there is none * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public Expression getExpression() { // optionalExpression can be null @@ -236,7 +236,7 @@ public class BreakStatement extends Statement { * <li>the node already has a parent</li> * </ul> * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public void setExpression(Expression expression) { unsupportedBelow12(); @@ -252,7 +252,7 @@ public class BreakStatement extends Statement { * * @return isImplicit <code>true</code> or <code>false</code> * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public boolean isImplicit() { unsupportedBelow12(); @@ -266,7 +266,7 @@ public class BreakStatement extends Statement { * @param isImplicit <code>true</code> or <code>false</code> * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ void setImplicit(boolean isImplicit) { unsupportedBelow12(); diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchCase.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchCase.java index 99d9eae0a1..9d10a597b7 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchCase.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchCase.java @@ -48,14 +48,14 @@ public class SwitchCase extends Statement { /** * The "expression" structural property of this node type (child type: {@link Expression}). (added in JEP 325). - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final ChildListPropertyDescriptor EXPRESSIONS2_PROPERTY = new ChildListPropertyDescriptor(SwitchCase.class, "expression", Expression.class, CYCLE_RISK); //$NON-NLS-1$); /** * The "switchLabeledRule" structural property of this node type (type: {@link Boolean}). - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final SimplePropertyDescriptor SWITCH_LABELED_RULE_PROPERTY = new SimplePropertyDescriptor(SwitchCase.class, "switchLabeledRule", boolean.class, MANDATORY); //$NON-NLS-1$ @@ -252,7 +252,7 @@ public class SwitchCase extends Statement { * @return the list of expression nodes * (element type: {@link Expression}) * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public List expressions() { if (this.expressions == null) { @@ -289,7 +289,7 @@ public class SwitchCase extends Statement { * @param switchLabeledRule <code>true</code> or <code>false</code> * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public void setSwitchLabeledRule(boolean switchLabeledRule) { unsupportedBelow12(); @@ -304,7 +304,7 @@ public class SwitchCase extends Statement { * * @return switchLabeledRule <code>true</code> or <code>false</code> * @exception UnsupportedOperationException if this operation is used below JLS12 - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public boolean isSwitchLabeledRule() { unsupportedBelow12(); diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchExpression.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchExpression.java index 3b889c3a86..241ca60a12 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchExpression.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/SwitchExpression.java @@ -32,7 +32,7 @@ import java.util.List; * <code>Statement</code>. * </p> * - * @since 3.17 BETA_JAVA_12 + * @since 3.17 * @noinstantiate This class is not intended to be instantiated by clients. */ @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java index 066ce9cb76..6dbf8bec92 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/NaiveASTFlattener.java @@ -85,7 +85,7 @@ public class NaiveASTFlattener extends ASTVisitor { /** * Internal synonym for {@link AST#JLS12}. Use to alleviate * deprecation warnings. - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ private static final int JLS12 = AST.JLS12; diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFlattener.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFlattener.java index 64f9e6a64a..c079980529 100644 --- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFlattener.java +++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFlattener.java @@ -97,7 +97,7 @@ public class ASTRewriteFlattener extends ASTVisitor { /** * Internal synonym for {@link AST#JLS12}. Use to alleviate * deprecation warnings. - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ private static final int JLS12 = AST.JLS12; diff --git a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java index 2c8b3bbd6e..6169c2d758 100644 --- a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java +++ b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java @@ -2128,7 +2128,7 @@ public class DefaultCodeFormatterConstants { * </pre> * @see JavaCore#INSERT * @see JavaCore#DO_NOT_INSERT - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String FORMATTER_INSERT_SPACE_AFTER_ARROW_IN_SWITCH_CASE = JavaCore.PLUGIN_ID + ".formatter.insert_space_after_arrow_in_switch_case"; //$NON-NLS-1$ /** @@ -2139,7 +2139,7 @@ public class DefaultCodeFormatterConstants { * </pre> * @see JavaCore#INSERT * @see JavaCore#DO_NOT_INSERT - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String FORMATTER_INSERT_SPACE_AFTER_ARROW_IN_SWITCH_DEFAULT = JavaCore.PLUGIN_ID + ".formatter.insert_space_after_arrow_in_switch_default"; //$NON-NLS-1$ /** @@ -2599,7 +2599,7 @@ public class DefaultCodeFormatterConstants { * </pre> * @see JavaCore#INSERT * @see JavaCore#DO_NOT_INSERT - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_SWITCH_CASE_EXPRESSIONS = JavaCore.PLUGIN_ID + ".formatter.insert_space_after_comma_in_switch_case_expressions"; //$NON-NLS-1$ /** @@ -2995,7 +2995,7 @@ public class DefaultCodeFormatterConstants { * </pre> * @see JavaCore#INSERT * @see JavaCore#DO_NOT_INSERT - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String FORMATTER_INSERT_SPACE_BEFORE_ARROW_IN_SWITCH_CASE = JavaCore.PLUGIN_ID + ".formatter.insert_space_before_arrow_in_switch_case"; //$NON-NLS-1$ /** @@ -3006,7 +3006,7 @@ public class DefaultCodeFormatterConstants { * </pre> * @see JavaCore#INSERT * @see JavaCore#DO_NOT_INSERT - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String FORMATTER_INSERT_SPACE_BEFORE_ARROW_IN_SWITCH_DEFAULT = JavaCore.PLUGIN_ID + ".formatter.insert_space_before_arrow_in_switch_default"; //$NON-NLS-1$ /** @@ -3658,7 +3658,7 @@ public class DefaultCodeFormatterConstants { * </pre> * @see JavaCore#INSERT * @see JavaCore#DO_NOT_INSERT - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String FORMATTER_INSERT_SPACE_BEFORE_COMMA_IN_SWITCH_CASE_EXPRESSIONS = JavaCore.PLUGIN_ID + ".formatter.insert_space_before_comma_in_switch_case_expressions"; //$NON-NLS-1$ /** diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java index 9fb4021895..0291a0d772 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java @@ -2580,7 +2580,7 @@ public final class JavaCore extends Plugin { * <dt>Default:</dt><dd><code>"disabled"</code></dd> * </dl> * @category CompilerOptionID - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String COMPILER_PB_ENABLE_PREVIEW_FEATURES = PLUGIN_ID + ".compiler.problem.enablePreviewFeatures"; //$NON-NLS-1$ /** @@ -2592,7 +2592,7 @@ public final class JavaCore extends Plugin { * <dt>Default:</dt><dd><code>"warning"</code></dd> * </dl> * @category CompilerOptionID - * @since 3.17 BETA_JAVA_12 + * @since 3.17 */ public static final String COMPILER_PB_REPORT_PREVIEW_FEATURES = PLUGIN_ID + ".compiler.problem.reportPreviewFeatures"; //$NON-NLS-1$ /** @@ -3053,7 +3053,7 @@ public final class JavaCore extends Plugin { public static final String VERSION_11 = "11"; //$NON-NLS-1$ /** * Configurable option value: {@value}. - * @since 3.17 BETA_JAVA_12 + * @since 3.17 * @category OptionValue */ public static final String VERSION_12 = "12"; //$NON-NLS-1$ |