diff options
4 files changed, 18 insertions, 259 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 61b7037f7a..2bd8f2d3bc 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 31f0818492..0d93fd3bd1 100644 --- a/org.eclipse.jdt.core/.settings/.api_filters +++ b/org.eclipse.jdt.core/.settings/.api_filters @@ -1,21 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jdt.core" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="931135546"> - <message_arguments> - <message_argument value="3.27.50"/> - <message_argument value="3.26.0"/> - </message_arguments> - </filter> - </resource> - <resource path="compiler/org/eclipse/jdt/core/compiler/CategorizedProblem.java" type="org.eclipse.jdt.core.compiler.CategorizedProblem"> - <filter comment="Java 14" id="576725006"> - <message_arguments> - <message_argument value="IProblem"/> - <message_argument value="CategorizedProblem"/> - </message_arguments> - </filter> - </resource> <resource path="dom/org/eclipse/jdt/core/dom/AST.java" type="org.eclipse.jdt.core.dom.AST"> <filter id="388194388"> <message_arguments> @@ -25,239 +9,12 @@ </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> - <message_argument value="IExtendedModifier"/> - <message_argument value="Annotation"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/AnonymousClassDeclaration.java" type="org.eclipse.jdt.core.dom.AnonymousClassDeclaration"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="AnonymousClassDeclaration"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/BodyDeclaration.java" type="org.eclipse.jdt.core.dom.BodyDeclaration"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="BodyDeclaration"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/CatchClause.java" type="org.eclipse.jdt.core.dom.CatchClause"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="CatchClause"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Comment.java" type="org.eclipse.jdt.core.dom.Comment"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="Comment"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Dimension.java" type="org.eclipse.jdt.core.dom.Dimension"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="Dimension"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Expression.java" type="org.eclipse.jdt.core.dom.Expression"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="Expression"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/ImportDeclaration.java" type="org.eclipse.jdt.core.dom.ImportDeclaration"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="ImportDeclaration"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/MemberRef.java" type="org.eclipse.jdt.core.dom.MemberRef"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IDocElement"/> - <message_argument value="MemberRef"/> - </message_arguments> - </filter> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="MemberRef"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/MemberValuePair.java" type="org.eclipse.jdt.core.dom.MemberValuePair"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="MemberValuePair"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/MethodRef.java" type="org.eclipse.jdt.core.dom.MethodRef"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IDocElement"/> - <message_argument value="MethodRef"/> - </message_arguments> - </filter> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="MethodRef"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/MethodRefParameter.java" type="org.eclipse.jdt.core.dom.MethodRefParameter"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="MethodRefParameter"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Modifier.java" type="org.eclipse.jdt.core.dom.Modifier"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IExtendedModifier"/> - <message_argument value="Modifier"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/ModuleQualifiedName.java" type="org.eclipse.jdt.core.dom.ModuleQualifiedName"> - <filter comment="Java 15 Merge" id="576778288"> - <message_arguments> - <message_argument value="Name"/> - <message_argument value="ModuleQualifiedName"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Name.java" type="org.eclipse.jdt.core.dom.Name"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IDocElement"/> - <message_argument value="Name"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/PackageDeclaration.java" type="org.eclipse.jdt.core.dom.PackageDeclaration"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="PackageDeclaration"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/QualifiedName.java" type="org.eclipse.jdt.core.dom.QualifiedName"> - <filter id="576778288"> - <message_arguments> - <message_argument value="Name"/> - <message_argument value="QualifiedName"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/SimpleName.java" type="org.eclipse.jdt.core.dom.SimpleName"> - <filter id="576778288"> - <message_arguments> - <message_argument value="Name"/> - <message_argument value="SimpleName"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Statement.java" type="org.eclipse.jdt.core.dom.Statement"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="Statement"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/TagElement.java" type="org.eclipse.jdt.core.dom.TagElement"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IDocElement"/> - <message_argument value="TagElement"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/TextElement.java" type="org.eclipse.jdt.core.dom.TextElement"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IDocElement"/> - <message_argument value="TextElement"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/Type.java" type="org.eclipse.jdt.core.dom.Type"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="Type"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/TypeParameter.java" type="org.eclipse.jdt.core.dom.TypeParameter"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="TypeParameter"/> - </message_arguments> - </filter> - </resource> - <resource path="dom/org/eclipse/jdt/core/dom/VariableDeclaration.java" type="org.eclipse.jdt.core.dom.VariableDeclaration"> - <filter id="576778288"> - <message_arguments> - <message_argument value="ASTNode"/> - <message_argument value="VariableDeclaration"/> - </message_arguments> - </filter> - </resource> - <resource path="model/org/eclipse/jdt/core/SourceRange.java" type="org.eclipse.jdt.core.SourceRange"> - <filter id="576725006"> - <message_arguments> - <message_argument value="ISourceRange"/> - <message_argument value="SourceRange"/> - </message_arguments> - </filter> - </resource> - <resource path="model/org/eclipse/jdt/core/jdom/DOMFactory.java" type="org.eclipse.jdt.core.jdom.DOMFactory"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IDOMFactory"/> - <message_argument value="DOMFactory"/> - </message_arguments> - </filter> - </resource> - <resource path="model/org/eclipse/jdt/core/util/ByteCodeVisitorAdapter.java" type="org.eclipse.jdt.core.util.ByteCodeVisitorAdapter"> - <filter id="576725006"> - <message_arguments> - <message_argument value="IBytecodeVisitor"/> - <message_argument value="ByteCodeVisitorAdapter"/> - </message_arguments> - </filter> - </resource> - <resource path="model/org/eclipse/jdt/core/util/OpcodeStringValues.java" type="org.eclipse.jdt.core.util.OpcodeStringValues"> - <filter id="576725006"> + <resource path="dom/org/eclipse/jdt/core/dom/ASTNode.java" type="org.eclipse.jdt.core.dom.ASTNode"> + <filter comment="To fix the mistake" id="388194388"> <message_arguments> - <message_argument value="IOpcodeMnemonics"/> - <message_argument value="OpcodeStringValues"/> + <message_argument value="org.eclipse.jdt.core.dom.ASTNode"/> + <message_argument value="MODULE_QUALIFIED_NAME"/> + <message_argument value="103"/> </message_arguments> </filter> </resource> 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 c4d18179b7..97014673de 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 @@ -990,15 +990,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>. @@ -1009,6 +1000,14 @@ public abstract class ASTNode { /** + * 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 @@ -1128,6 +1127,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 : |