Bug 550518 - [13] Remove JCP disclaimers from code, UI and marketplaceP20190918-0150

Also correcting the constant reused in ASTNode

Change-Id: I23975d302c8c98d974daa9bd50cedee10392b6e5
Signed-off-by: Jay Arthanareeswaran <jarthana@in.ibm.com>

9 files changed, 45 insertions, 45 deletions

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 ee5d011577..0dcab5d38e 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
@@ -108,7 +108,7 @@ public abstract class CategorizedProblem implements IProblem {
 	 */
 	public static final int CAT_COMPLIANCE = 170;
 	/** Category for problems related to preview features 
-	 * @since 3.19.50*/
+	 * @since 3.19*/
 	public static final int CAT_PREVIEW_RELATED = 180;
 
 /**
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 995744f22d..49cb2253d8 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
@@ -375,7 +375,7 @@ void setSourceStart(int sourceStart);
 	int ModuleRelated = 0x00800000;
 	/** @since 3.18 */
 	int Compliance = 0x00400000;
-	/** @since 3.19.50 */
+	/** @since 3.19 */
 	int PreviewRelated = 0x00200000; 
 
 	/**
@@ -776,7 +776,7 @@ void setSourceStart(int sourceStart);
 
 	/** @since 3.10 */
 	int MissingTypeInLambda = MethodRelated + 271;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int UnterminatedTextBlock = PreviewRelated + 272;
 	// type related problems
@@ -2065,7 +2065,7 @@ void setSourceStart(int sourceStart);
 	int PreviewFeatureUsed = Compliance + 1104;
 	/** @since 3.18 */
 	int PreviewFeatureNotSupported = Compliance + 1105;
-	/** @since 3.19.50*/
+	/** @since 3.19*/
 	int PreviewFeaturesNotAllowed = PreviewRelated + 1106;
 
 	/** @since 3.13 */
@@ -2144,61 +2144,61 @@ void setSourceStart(int sourceStart);
 	 * @deprecated preview related error - will be removed
 	 * @noreference preview related error */
 	int SwitchExpressionIllegalLastStatement = Internal + 1612;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldIncompatibleResultExpressionTypes = PreviewRelated + 1700;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldEmptySwitchBlock = PreviewRelated + 1701;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldNoResultExpression = PreviewRelated + 1702;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionaYieldSwitchLabeledBlockCompletesNormally = PreviewRelated + 1703;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldLastStatementCompletesNormally = PreviewRelated + 1704;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldTrailingSwitchLabels = PreviewRelated + 1705;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchPreviewMixedCase = PreviewRelated + 1706;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldMissingDefaultCase = PreviewRelated + 1707;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldMissingValue = PreviewRelated + 1708;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldMissingEnumConstantCase = PreviewRelated + 1709;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldIllegalLastStatement = PreviewRelated + 1710;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldBreakNotAllowed = PreviewRelated + 1711;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldUnqualifiedMethodWarning = PreviewRelated + 1712;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldUnqualifiedMethodError = PreviewRelated + 1713;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldOutsideSwitchExpression = PreviewRelated + 1714;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldRestrictedGeneralWarning = PreviewRelated + 1715;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldIllegalStatement = PreviewRelated + 1716;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldTypeDeclarationWarning = PreviewRelated + 1717;
-	/** @since 3.19.50
+	/** @since 3.19
 	 * @noreference preview related error */
 	int SwitchExpressionsYieldTypeDeclarationError = PreviewRelated + 1718;
 	}
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 e70275c61f..0933c58c83 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
@@ -310,14 +310,14 @@ public final class AST {
 	 * up to and including Java SE 13 (aka JDK 13).
 	 * </p>
 	 *
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public static final int JLS13 = 13;
 	
 	/**
 	 * Internal synonym for {@link #JLS13}. Use to alleviate
 	 * deprecation warnings once JLS13 is deprecated
-	 * @since 3.19.50 
+	 * @since 3.19 
 	 */
 	static final int JLS13_INTERNAL = JLS13;
 
@@ -500,7 +500,7 @@ public final class AST {
 	 *
 	 * @param options the table of options
 	 * @see JavaCore#getDefaultOptions()
-     * @since 3.19.50
+     * @since 3.19
 	 */
 	public static AST newAST(Map<String, String> options) {
 		return new AST(options);
@@ -2787,7 +2787,7 @@ public final class AST {
 	 * label/identifier/expression and is not implicit.
 	 *
 	 * @return a new unparented yield statement node
-	 * @since 3.19.50
+	 * @since 3.19
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	public TextBlock newTextBlock() {
@@ -3099,7 +3099,7 @@ public final class AST {
 	 * label/identifier/expression and is not implicit.
 	 *
 	 * @return a new unparented yield statement node
-	 * @since 3.19.50
+	 * @since 3.19
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	public YieldStatement newYieldStatement() {
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 945016450b..7d9733e2b7 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
@@ -2394,7 +2394,7 @@ public class ASTMatcher {
 	 *   different node type or is <code>null</code>
 	 * @noreference This method is not intended to be referenced by clients as it is a part of Java preview feature.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients as it is a part of Java preview feature.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public boolean match(TextBlock node, Object other) {
 		if (!(other instanceof TextBlock)) {
@@ -2855,7 +2855,7 @@ public class ASTMatcher {
 	 *   different node type or is <code>null</code>
 	 * @noreference This method is not intended to be referenced by clients as it is a part of Java preview feature.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients as it is a part of Java preview feature.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public boolean match(YieldStatement node, Object other) {
 		if (!(other instanceof YieldStatement)) {
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 17ee733d99..6f20faa973 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
@@ -966,17 +966,17 @@ public abstract class ASTNode {
 	 * Node type constant indicating a node of type
 	 * <code>YieldStatement</code>.
 	 * @see YieldStatement
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
-	public static final int YIELD_STATEMENT = 10;
+	public static final int YIELD_STATEMENT = 101;
 	
 	/**
 	 * Node type constant indicating a node of type
 	 * <code>TextBlock</code>.
 	 * @see TextBlock
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
-	public static final int TEXT_BLOCK = 101;
+	public static final int TEXT_BLOCK = 102;
 
 	/**
 	 * Returns the node class for the corresponding node type.
@@ -2193,7 +2193,7 @@ public abstract class ASTNode {
      * </p>
      *
 	 * @exception UnsupportedOperationException if this operation is is not used in JLS12
-	 * @since 3.19.50
+	 * @since 3.19
      */
 	// In API Javadocs, add: * @deprecated In the JLS13 API, this method is replaced by {@link #replacement()}.
 	final void supportedOnlyIn12() {
@@ -2210,7 +2210,7 @@ public abstract class ASTNode {
      * </p>
      *
 	 * @exception UnsupportedOperationException if this operation is not used in JLS13
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	final void supportedOnlyIn13() {
 		if (this.ast.apiLevel != AST.JLS13_INTERNAL) {
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 b2a6cd32b7..5c2af61236 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
@@ -1605,7 +1605,7 @@ public abstract class ASTVisitor {
 	 * be skipped
 	 * @noreference This method is not intended to be referenced by clients as it is a part of Java preview feature.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients as it is a part of Java preview feature.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public boolean visit(TextBlock node) {
 		return true;
@@ -1887,7 +1887,7 @@ public abstract class ASTVisitor {
 	 * be skipped
 	 * @noreference This method is not intended to be referenced by clients as it is a part of Java preview feature.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients as it is a part of Java preview feature.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public boolean visit(YieldStatement node) {
 		return true;
@@ -2939,7 +2939,7 @@ public abstract class ASTVisitor {
 	 * @param node the node to visit
 	 * @noreference This method is not intended to be referenced by clients as it is a part of Java preview feature.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients as it is a part of Java preview feature.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public void endVisit(TextBlock node) {
 		// default implementation: do nothing
@@ -3165,7 +3165,7 @@ public abstract class ASTVisitor {
 	 * @param node the node to visit
 	 * @noreference This method is not intended to be referenced by clients as it is a part of Java preview feature.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients as it is a part of Java preview feature.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public void endVisit(YieldStatement node) {
 		// default implementation: do nothing
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java
index 7b996024b7..b5055b69ac 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/TextBlock.java
@@ -27,7 +27,7 @@ import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
  *
  * These are block of String literal nodes. 
  *
- * @since 3.19.50
+ * @since 3.19
  * @noinstantiate This class is not intended to be instantiated by clients.
  * @noreference This class is not intended to be referenced by clients as it is a part of Java preview feature.
  */
@@ -80,7 +80,7 @@ public class TextBlock extends Expression {
 	 * @return a list of property descriptors (element type:
 	 * {@link StructuralPropertyDescriptor})
 	 * @noreference This method is not intended to be referenced by clients.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public static List propertyDescriptors(int apiLevel, boolean previewEnabled) {
 		if (apiLevel == AST.JLS13_INTERNAL && previewEnabled) {
diff --git a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/YieldStatement.java b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/YieldStatement.java
index bbd2a2e683..c04e073ec1 100644
--- a/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/YieldStatement.java
+++ b/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/YieldStatement.java
@@ -25,7 +25,7 @@ import java.util.List;
  *		<b>Yield</b> <b>{ Identifier/Expression }</b>
  * </pre>
  *
- * @since 3.19.50
+ * @since 3.19
  * @noinstantiate This class is not intended to be instantiated by clients.
  * @noreference This class is not intended to be referenced by clients as it is a part of Java preview feature.
  */
@@ -81,7 +81,7 @@ public class YieldStatement extends Statement {
 	 * @return a list of property descriptors (element type:
 	 * {@link StructuralPropertyDescriptor})
 	 * @noreference This method is not intended to be referenced by clients.
-	 * @since 3.19.50
+	 * @since 3.19
 	 */
 	public static List propertyDescriptors(int apiLevel, boolean previewEnabled) {
 		if (apiLevel == AST.JLS13_INTERNAL && previewEnabled) {
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 7846d1abe2..3530152d18 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
@@ -3059,7 +3059,7 @@ public final class JavaCore extends Plugin {
 	public static final String VERSION_12 = "12"; //$NON-NLS-1$
 	/**
 	 * Configurable option value: {@value}.
-	 * @since 3.19.50
+	 * @since 3.19
 	 * @category OptionValue
 	 */
 	public static final String VERSION_13 = "13"; //$NON-NLS-1$