* When this flag is set, only {@link TypeReferenceMatch} matches will be * returned. @@ -259,17 +259,6 @@ int SUPERTYPE_TYPE_REFERENCE = 0x200; /** - * Return only type references used as a super interface. - *
- * When this flag is set, only {@link TypeReferenceMatch} matches will be - * returned. - *
- * @since 3.4 - * @category limitTo - */ - int SUPERINTERFACE_TYPE_REFERENCE = 0x400; - - /** * Return only type references used in a throws clause. ** When this flag is set, only {@link TypeReferenceMatch} matches will be @@ -278,7 +267,7 @@ * @since 3.4 * @category limitTo */ - int THROWS_CLAUSE_TYPE_REFERENCE = 0x800; + int THROWS_CLAUSE_TYPE_REFERENCE = 0x400; /** * Return only type references used in a cast expression. @@ -289,7 +278,7 @@ * @since 3.4 * @category limitTo */ - int CAST_TYPE_REFERENCE = 0x1000; + int CAST_TYPE_REFERENCE = 0x800; /** * Return only type references used in a catch header. @@ -300,18 +289,32 @@ * @since 3.4 * @category limitTo */ - int CATCH_TYPE_REFERENCE = 0x2000; + int CATCH_TYPE_REFERENCE = 0x1000; /** - * Return only type references used in an allocation expression. + * Return only type references used in class instance creation. *
* When this flag is set, only {@link TypeReferenceMatch} matches will be * returned. - *
+ *+ * Example: + *
+ * public class Test {
+ * Test() {}
+ * static Test bar() {
+ * return new Test();
+ * }
+ * }
+ *
+ * Searching references to the type Test using this flag in the
+ * above snippet will match only the reference in italic.
+ * + * Note that array creations are not returned when using this flag. + *
* @since 3.4 * @category limitTo */ - int ALLOCATION_EXPRESSION_TYPE_REFERENCE = 0x4000; + int CLASS_INSTANCE_CREATION_TYPE_REFERENCE = 0x2000; /** * Return only type references used as a method return type. @@ -322,7 +325,7 @@ * @since 3.4 * @category limitTo */ - int RETURN_TYPE_REFERENCE = 0x8000; + int RETURN_TYPE_REFERENCE = 0x4000; /** * Return only type references used in an import declaration. @@ -333,7 +336,7 @@ * @since 3.4 * @category limitTo */ - int IMPORT_DECLARATION_TYPE_REFERENCE = 0x10000; + int IMPORT_DECLARATION_TYPE_REFERENCE = 0x8000; /** * Return only type references used as an annotation. @@ -344,7 +347,7 @@ * @since 3.4 * @category limitTo */ - int ANNOTATION_TYPE_REFERENCE = 0x20000; + int ANNOTATION_TYPE_REFERENCE = 0x10000; /** * Return only type references used as a type argument in a parameterized @@ -356,7 +359,7 @@ * @since 3.4 * @category limitTo */ - int TYPE_ARGUMENT_TYPE_REFERENCE = 0x40000; + int TYPE_ARGUMENT_TYPE_REFERENCE = 0x20000; /** * Return only type references used as a type variable bound. @@ -367,7 +370,7 @@ * @since 3.4 * @category limitTo */ - int TYPE_VARIABLE_BOUND_TYPE_REFERENCE = 0x80000; + int TYPE_VARIABLE_BOUND_TYPE_REFERENCE = 0x40000; /** * Return only type references used as a wildcard bound. @@ -378,7 +381,7 @@ * @since 3.4 * @category limitTo */ - int WILDCARD_BOUND_TYPE_REFERENCE = 0x100000; + int WILDCARD_BOUND_TYPE_REFERENCE = 0x80000; /** * Return only super field accesses or super method invocations (e.g. using the #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/model/SearchTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/SearchTests.java,v retrieving revision 1.47 diff -u -r1.47 SearchTests.java --- src/org/eclipse/jdt/core/tests/model/SearchTests.java 3 Dec 2007 12:02:07 -0000 1.47 +++ src/org/eclipse/jdt/core/tests/model/SearchTests.java 4 Dec 2007 22:31:23 -0000 @@ -125,9 +125,6 @@ return "SearchTests.Waiting"; } } -static { - TESTS_PREFIX = "testSearchPatternValidateMatchRule"; -} public static Test suite() { return buildModelTestSuite(SearchTests.class); } @@ -1005,7 +1002,7 @@ * Fine grain patterns */ public void testSearchPatternCreation37() { - int allFlags = 0x0F1FFFF0; + int allFlags = 0xFFFFFFF0; SearchPattern searchPattern = createPattern("*", TYPE, allFlags, true); assertPattern( "TypeReferencePattern: qualification<*>, type<*>, pattern match, case sensitive, generic full match, " + @@ -1013,21 +1010,27 @@ "LOCAL_VARIABLE_DECLARATION_TYPE_REFERENCE | " + "PARAMETER_DECLARATION_TYPE_REFERENCE | " + "SUPERTYPE_TYPE_REFERENCE | " + - "SUPERINTERFACE_TYPE_REFERENCE | " + "THROWS_CLAUSE_TYPE_REFERENCE | " + "CAST_TYPE_REFERENCE | " + "CATCH_TYPE_REFERENCE | " + - "ALLOCATION_EXPRESSION_TYPE_REFERENCE | " + + "CLASS_INSTANCE_CREATION_TYPE_REFERENCE | " + "RETURN_TYPE_REFERENCE | " + "IMPORT_DECLARATION_TYPE_REFERENCE | " + "ANNOTATION_TYPE_REFERENCE | " + "TYPE_ARGUMENT_TYPE_REFERENCE | " + "TYPE_VARIABLE_BOUND_TYPE_REFERENCE | " + "WILDCARD_BOUND_TYPE_REFERENCE | " + + " | " + // unused slots + " | " + + " | " + + " | " + "SUPER_REFERENCE | " + "QUALIFIED_REFERENCE | " + "THIS_REFERENCE | " + - "IMPLICIT_THIS_REFERENCE", + "IMPLICIT_THIS_REFERENCE | " + + " | " + // unused slots + " | " + + " | ", searchPattern); } Index: src/org/eclipse/jdt/core/tests/model/JavaSearchFineGrainTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchFineGrainTests.java,v retrieving revision 1.3 diff -u -r1.3 JavaSearchFineGrainTests.java --- src/org/eclipse/jdt/core/tests/model/JavaSearchFineGrainTests.java 3 Dec 2007 12:02:07 -0000 1.3 +++ src/org/eclipse/jdt/core/tests/model/JavaSearchFineGrainTests.java 4 Dec 2007 22:31:22 -0000 @@ -245,11 +245,10 @@ LOCAL_VARIABLE_DECLARATION_TYPE_REFERENCE | PARAMETER_DECLARATION_TYPE_REFERENCE | SUPERTYPE_TYPE_REFERENCE | - SUPERINTERFACE_TYPE_REFERENCE | THROWS_CLAUSE_TYPE_REFERENCE | CAST_TYPE_REFERENCE | CATCH_TYPE_REFERENCE | - ALLOCATION_EXPRESSION_TYPE_REFERENCE | + CLASS_INSTANCE_CREATION_TYPE_REFERENCE | RETURN_TYPE_REFERENCE | IMPORT_DECLARATION_TYPE_REFERENCE | ANNOTATION_TYPE_REFERENCE | @@ -357,7 +356,7 @@ ); } public void testTypeRef_Allocation() throws CoreException { - search(setUpTypeRef(0), ALLOCATION_EXPRESSION_TYPE_REFERENCE); + search(setUpTypeRef(0), CLASS_INSTANCE_CREATION_TYPE_REFERENCE); assertSearchResults( "src/type/ref/TestTypes.java Types type.ref.TestTypes.method(Types) [ Object obj = new §|Types|§();@253] EXACT_MATCH" ); @@ -412,7 +411,7 @@ } public void testTypeRef_Superinterface() throws CoreException { IType type = setUpTypeRef(0); - search(((ICompilationUnit) type.getParent()).getType("ITest1"), SUPERINTERFACE_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); + search(((ICompilationUnit) type.getParent()).getType("ITest1"), SUPERTYPE_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); assertSearchResults( "src/type/def/Types.java type.def.Types [public class Types extends Exception implements §|ITest1|§, ITest2 {@78] EXACT_MATCH\n" + "src/type/def/Types.java type.def.ITest2 [interface ITest2 extends §|ITest1|§ {}@184] EXACT_MATCH" @@ -535,7 +534,7 @@ } public void testTypeRefAll_Allocation() throws CoreException { setUpTypeRefAll(); - search("*", TYPE, ALLOCATION_EXPRESSION_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); + search("*", TYPE, CLASS_INSTANCE_CREATION_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); assertSearchResults( "src/all/types/ref/TestTypes.java all.types.ref.TestTypes.field [ Types field = new §|Types|§(), local, other = new Types();@167] EXACT_MATCH\n" + "src/all/types/ref/TestTypes.java all.types.ref.TestTypes.other [ Types field = new Types(), local, other = new §|Types|§();@195] EXACT_MATCH\n" + @@ -617,21 +616,15 @@ "src/type/def/Bug.java String type.def.Bug.comment() [ §|String|§ comment() default \"\";@65] EXACT_MATCH" ); } -public void testTypeRefAll_Superinterface() throws CoreException { - setUpTypeRefAll(); - search("*", TYPE, SUPERINTERFACE_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); - assertSearchResults( - "src/type/def/Types.java type.def.Types [public class Types extends Exception implements §|ITest1|§, ITest2 {@78] EXACT_MATCH\n" + - "src/type/def/Types.java type.def.Types [public class Types extends Exception implements ITest1, §|ITest2|§ {@86] EXACT_MATCH\n" + - "src/type/def/Types.java type.def.ITest2 [interface ITest2 extends §|ITest1|§ {}@184] EXACT_MATCH" - ); -} public void testTypeRefAll_Supertype() throws CoreException { setUpTypeRefAll(); search("*", TYPE, SUPERTYPE_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); assertSearchResults( "src/all/types/ref/TestTypes.java all.types.ref.TestTypes [public class TestTypes extends §|Types|§ {@117] EXACT_MATCH\n" + - "src/type/def/Types.java type.def.Types [public class Types extends §|Exception|§ implements ITest1, ITest2 {@57] EXACT_MATCH" + "src/type/def/Types.java type.def.Types [public class Types extends §|Exception|§ implements ITest1, ITest2 {@57] EXACT_MATCH\n" + + "src/type/def/Types.java type.def.Types [public class Types extends Exception implements §|ITest1|§, ITest2 {@78] EXACT_MATCH\n" + + "src/type/def/Types.java type.def.Types [public class Types extends Exception implements ITest1, §|ITest2|§ {@86] EXACT_MATCH\n" + + "src/type/def/Types.java type.def.ITest2 [interface ITest2 extends §|ITest1|§ {}@184] EXACT_MATCH" ); } public void testTypeRefAll_Throws() throws CoreException { @@ -1246,7 +1239,7 @@ } public void testTypeRefQualifiedAll_Allocation() throws CoreException { setUpTypeRefQualifiedAll(); - search("*", TYPE, ALLOCATION_EXPRESSION_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); + search("*", TYPE, CLASS_INSTANCE_CREATION_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); assertSearchResults( "src/all/types/ref/TestTypes.java all.types.ref.TestTypes.field [ type.def.Types field = new §|type.def.Types|§(), local, other = new type.def.Types();@158] EXACT_MATCH\n" + "src/all/types/ref/TestTypes.java all.types.ref.TestTypes.other [ type.def.Types field = new type.def.Types(), local, other = new §|type.def.Types|§();@195] EXACT_MATCH\n" + @@ -1325,21 +1318,15 @@ "src/type/def/Bug.java String type.def.Bug.comment() [ §|String|§ comment() default \"\";@65] EXACT_MATCH" ); } -public void testTypeRefQualifiedAll_Superinterface() throws CoreException { - setUpTypeRefQualifiedAll(); - search("*", TYPE, SUPERINTERFACE_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); - assertSearchResults( - "src/type/def/Types.java type.def.Types [public class Types extends Exception implements §|ITest1|§, ITest2 {@78] EXACT_MATCH\n" + - "src/type/def/Types.java type.def.Types [public class Types extends Exception implements ITest1, §|ITest2|§ {@86] EXACT_MATCH\n" + - "src/type/def/Types.java type.def.ITest2 [interface ITest2 extends §|ITest1|§ {}@184] EXACT_MATCH" - ); -} public void testTypeRefQualifiedAll_Supertype() throws CoreException { setUpTypeRefQualifiedAll(); search("*", TYPE, SUPERTYPE_TYPE_REFERENCE, getJavaSearchWorkingCopiesScope()); assertSearchResults( "src/all/types/ref/TestTypes.java all.types.ref.TestTypes [public class TestTypes extends §|type.def.Types|§ {@81] EXACT_MATCH\n" + - "src/type/def/Types.java type.def.Types [public class Types extends §|Exception|§ implements ITest1, ITest2 {@57] EXACT_MATCH" + "src/type/def/Types.java type.def.Types [public class Types extends §|Exception|§ implements ITest1, ITest2 {@57] EXACT_MATCH\n" + + "src/type/def/Types.java type.def.Types [public class Types extends Exception implements §|ITest1|§, ITest2 {@78] EXACT_MATCH\n" + + "src/type/def/Types.java type.def.Types [public class Types extends Exception implements ITest1, §|ITest2|§ {@86] EXACT_MATCH\n" + + "src/type/def/Types.java type.def.ITest2 [interface ITest2 extends §|ITest1|§ {}@184] EXACT_MATCH" ); } public void testTypeRefQualifiedAll_Throws() throws CoreException { @@ -2016,4 +2003,27 @@ "src/test13/Test.java void test13.S.bar(S) [