Bug 575299 - ASTNode constant duplicated inI20210809-1800

org.eclipse.jdt.core.dom.ASTNode

Change-Id: I8e43f3f028b39d732ee21aa78067f6aa6a349456
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.core/+/183813
Tested-by: JDT Bot <jdt-bot@eclipse.org>
Reviewed-by: Sarika Sinha <sarika.sinha@in.ibm.com>

4 files changed, 22 insertions, 11 deletions

diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java
index 67735de884..76c4fe3348 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTStructuralPropertyTest.java
@@ -372,7 +372,7 @@ public class ASTStructuralPropertyTest extends org.eclipse.jdt.core.tests.junit.
 				// oops - guess that's not valid
 			}
 		}
-		assertEquals("Wrong last known type", 104, hi); // last known one
+		assertEquals("Wrong last known type", 105, hi); // last known one
 		assertEquals("Wrong number of distinct types",  hi, classes.size()); // all classes are distinct
 	}
 }
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java
index 63c8bef019..71aca09856 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java
@@ -9490,7 +9490,8 @@ public class ASTTest extends org.eclipse.jdt.core.tests.junit.extension.TestCase
 			ASTNode.YIELD_STATEMENT,
 			ASTNode.TEXT_BLOCK,
 			ASTNode.RECORD_DECLARATION,
-			ASTNode.PATTERN_INSTANCEOF_EXPRESSION
+			ASTNode.PATTERN_INSTANCEOF_EXPRESSION,
+			ASTNode.MODULE_QUALIFIED_NAME
 
 		};
 
diff --git a/org.eclipse.jdt.core/.settings/.api_filters b/org.eclipse.jdt.core/.settings/.api_filters
index eb740a6508..8b98c17003 100644
--- a/org.eclipse.jdt.core/.settings/.api_filters
+++ b/org.eclipse.jdt.core/.settings/.api_filters
@@ -8,6 +8,15 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="dom/org/eclipse/jdt/core/dom/ASTNode.java" type="org.eclipse.jdt.core.dom.ASTNode">
+        <filter comment="To fix the mistake and considering nodes added till 107 in BETA Branch" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.jdt.core.dom.ASTNode"/>
+                <message_argument value="MODULE_QUALIFIED_NAME"/>
+                <message_argument value="103"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="dom/org/eclipse/jdt/core/dom/Annotation.java" type="org.eclipse.jdt.core.dom.Annotation">
         <filter id="576725006">
             <message_arguments>
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 7c30e69e92..24f2ba75aa 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
@@ -987,15 +987,6 @@ public abstract class ASTNode {
 	 */
 	public static final int RECORD_DECLARATION = 103;
 
-
-	/**
-	 * Node type constant indicating a node of type
-	 * <code>ModuleQualifiedName</code>.
-	 * @see ModuleQualifiedName
-	 * @since 3.24
-	 */
-	public static final int MODULE_QUALIFIED_NAME = 103;
-
 	/**
 	 * Node type constant indicating a node of type
 	 * <code>PatternInstanceofExpression</code>.
@@ -1005,6 +996,14 @@ public abstract class ASTNode {
 	public static final int PATTERN_INSTANCEOF_EXPRESSION = 104;
 
 	/**
+	 * Node type constant indicating a node of type
+	 * <code>ModuleQualifiedName</code>.
+	 * @see ModuleQualifiedName
+	 * @since 3.24
+	 */
+	public static final int MODULE_QUALIFIED_NAME = 105;
+
+	/**
 	 * Returns the node class for the corresponding node type.
 	 *
 	 * @param nodeType AST node type
@@ -1124,6 +1123,8 @@ public abstract class ASTNode {
 				return ModuleDeclaration.class;
 			case MODULE_MODIFIER :
 				return ModuleModifier.class;
+			case MODULE_QUALIFIED_NAME :
+				return ModuleQualifiedName.class;
 			case NAME_QUALIFIED_TYPE :
 				return NameQualifiedType.class;
 			case NORMAL_ANNOTATION :