### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java,v retrieving revision 1.42 diff -u -r1.42 ASTModelBridgeTests.java --- src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java 13 Jun 2006 13:01:06 -0000 1.42 +++ src/org/eclipse/jdt/core/tests/dom/ASTModelBridgeTests.java 14 Jun 2006 09:02:55 -0000 @@ -215,7 +215,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", element ); assertTrue("Element should exist", element.exists()); @@ -258,7 +258,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "Enum(java.lang.String, int) [in Enum [in Enum.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]]]]", + "Enum(java.lang.String, int) [in Enum [in Enum.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]]", element ); assertTrue("Element should exist", element.exists()); @@ -301,7 +301,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", element ); assertTrue("Element should exist", element.exists()); @@ -374,7 +374,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P1]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", element ); assertTrue("Element should exist", element.exists()); @@ -1200,7 +1200,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]", + "java.lang [in "+ getExternalJCLPathString("1.5") + "]", element ); assertTrue("Element should exist", element.exists()); @@ -1242,7 +1242,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "Comparable [in Comparable.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]]]", + "Comparable [in Comparable.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", element ); assertTrue("Element should exist", element.exists()); @@ -1286,7 +1286,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "Comparable [in Comparable.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]]]", + "Comparable [in Comparable.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", element ); assertTrue("Element should exist", element.exists()); @@ -1355,7 +1355,7 @@ IJavaElement element = binding.getJavaElement(); assertElementEquals( "Unexpected Java element", - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in P]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", element ); assertTrue("Element should exist", element.exists()); Index: src/org/eclipse/jdt/core/tests/model/ResolveTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ResolveTests.java,v retrieving revision 1.66 diff -u -r1.66 ResolveTests.java --- src/org/eclipse/jdt/core/tests/model/ResolveTests.java 29 Mar 2006 04:03:07 -0000 1.66 +++ src/org/eclipse/jdt/core/tests/model/ResolveTests.java 14 Jun 2006 09:02:57 -0000 @@ -302,7 +302,7 @@ IJavaElement[] elements = codeSelect(cu, "ject", ""); assertElementsEqual( "Unexpected elements", - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } @@ -314,7 +314,7 @@ IJavaElement[] elements = codeSelect(cu, "Obj", ""); assertElementsEqual( "Unexpected elements", - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } @@ -413,7 +413,7 @@ IJavaElement[] elements = codeSelect(cf, "Object", "Object"); assertElementsEqual( "Unexpected elements", - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } @@ -1008,7 +1008,7 @@ IJavaElement[] elements = codeSelect(cu, "lang.\\u0053tring", "lang.\\u0053tring"); assertElementsEqual( "Unexpected elements", - "String [in String.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } @@ -1020,7 +1020,7 @@ IJavaElement[] elements = codeSelect(cu, "lang", "lang"); assertElementsEqual( "Unexpected elements", - "java.lang [in " + getExternalJCLPathString() + " [in Resolve]]", + "java.lang [in " + getExternalJCLPathString() + "]", elements ); } @@ -1032,7 +1032,7 @@ IJavaElement[] elements = codeSelect(cu, "lang.Object", "lang.Object"); assertElementsEqual( "Unexpected elements", - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } @@ -1044,7 +1044,7 @@ IJavaElement[] elements = codeSelect(cu, "java.lang.Object", "java.lang.Object"); assertElementsEqual( "Unexpected elements", - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } @@ -1092,7 +1092,7 @@ IJavaElement[] elements = codeSelect(cu, "java.lang.\\u0053tring", "java.lang.\\u0053tring"); assertElementsEqual( "Unexpected elements", - "String [in String.class [in java.lang [in "+ getExternalJCLPathString() + " [in Resolve]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString() + "]]]", elements ); } Index: src/org/eclipse/jdt/core/tests/model/HierarchyOnWorkingCopiesTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/HierarchyOnWorkingCopiesTests.java,v retrieving revision 1.16 diff -u -r1.16 HierarchyOnWorkingCopiesTests.java --- src/org/eclipse/jdt/core/tests/model/HierarchyOnWorkingCopiesTests.java 29 Mar 2006 04:03:07 -0000 1.16 +++ src/org/eclipse/jdt/core/tests/model/HierarchyOnWorkingCopiesTests.java 14 Jun 2006 09:02:55 -0000 @@ -58,7 +58,7 @@ assertHierarchyEquals( "Focus: B [in B.java [in x.y [in src [in P]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in P]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n" + " A [in [Working copy] A.java [in x.y [in src [in P]]]]\n", h); @@ -95,7 +95,7 @@ "Focus: C [in C.java [in x.y [in src [in P]]]]\n" + "Super types:\n" + " B [in [Working copy] A.java [in x.y [in src [in P]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in P]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", h); } finally { Index: src/org/eclipse/jdt/core/tests/model/SelectionJavadocModelTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/SelectionJavadocModelTests.java,v retrieving revision 1.7 diff -u -r1.7 SelectionJavadocModelTests.java --- src/org/eclipse/jdt/core/tests/model/SelectionJavadocModelTests.java 29 Mar 2006 04:03:08 -0000 1.7 +++ src/org/eclipse/jdt/core/tests/model/SelectionJavadocModelTests.java 14 Jun 2006 09:02:58 -0000 @@ -179,10 +179,10 @@ "Test [in [Working copy] Test.java [in [in [in Tests]]]]\n" + "field [in Test [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + "foo(int, String) [in Test [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]\n" + + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Test [in [Working copy] Test.java [in [in [in Tests]]]]\n" + "foo(int, String) [in Test [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } @@ -214,10 +214,10 @@ "Test [in [Working copy] Test.java [in [in [in Tests]]]]\n" + "field [in Test [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + "foo(int, String) [in Test [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]\n" + + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Test [in [Working copy] Test.java [in [in [in Tests]]]]\n" + "foo(int, String) [in Test [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + - "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "String [in String.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } @@ -258,7 +258,7 @@ "field [in Test [in [Working copy] Test.java [in test.junit [in [in Tests]]]]]\n" + "Test [in [Working copy] Test.java [in test.junit [in [in Tests]]]]\n" + "foo(Object[]) [in Test [in [Working copy] Test.java [in test.junit [in [in Tests]]]]]\n" + - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } @@ -298,7 +298,7 @@ "field [in Test [in [Working copy] Test.java [in test.junit [in [in Tests]]]]]\n" + "Test [in [Working copy] Test.java [in test.junit [in [in Tests]]]]\n" + "foo(Object[]) [in Test [in [Working copy] Test.java [in test.junit [in [in Tests]]]]]\n" + - "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } @@ -317,8 +317,8 @@ elements[0] = selectType(this.workingCopies[0], "RuntimeException"); elements[1] = selectType(this.workingCopies[0], "InterruptedException"); assertElementsEqual("Invalid selection(s)", - "RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]\n" + - "InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + + "InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } @@ -337,8 +337,8 @@ elements[0] = selectType(this.workingCopies[0], "RuntimeException"); elements[1] = selectType(this.workingCopies[0], "InterruptedException"); assertElementsEqual("Invalid selection(s)", - "RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]\n" + - "InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + + "InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } @@ -461,8 +461,8 @@ "foo(int, String) [in Method [in [Working copy] Test.java [in [in [in Tests]]]]]\n" + "xxx [in foo(int, String) [in Method [in [Working copy] Test.java [in [in [in Tests]]]]]]\n" + "str [in foo(int, String) [in Method [in [Working copy] Test.java [in [in [in Tests]]]]]]\n" + - "RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]\n" + - "InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in Tests]]]]", + "RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + + "InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]", elements ); } Index: src/org/eclipse/jdt/core/tests/model/TypeHierarchyTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/TypeHierarchyTests.java,v retrieving revision 1.58 diff -u -r1.58 TypeHierarchyTests.java --- src/org/eclipse/jdt/core/tests/model/TypeHierarchyTests.java 13 Jun 2006 09:28:54 -0000 1.58 +++ src/org/eclipse/jdt/core/tests/model/TypeHierarchyTests.java 14 Jun 2006 09:02:58 -0000 @@ -172,7 +172,7 @@ "Focus: [in [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -187,7 +187,7 @@ "Focus: [in [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -202,7 +202,7 @@ "Focus: [in field1 [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -217,7 +217,7 @@ "Focus: [in field2 [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); type = typeA.getField("field2").getType("", 2); @@ -226,7 +226,7 @@ "Focus: [in field2 [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -241,7 +241,7 @@ "Focus: [in foo() [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -257,7 +257,7 @@ "Focus: [in foo() [in X [in X.java [in p8 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p8 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -332,7 +332,7 @@ assertHierarchyEquals( "Focus: X48459 [in X48459.java [in p48459.p1 [in src [in TypeHierarchy]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n" + " [in foo [in Z48459 [in Z48459.java [in p48459.p1 [in src [in TypeHierarchy]]]]]]\n" + " Y48459 [in Y48459.class [in p48459.p2 [in lib48459 [in TypeHierarchy]]]]\n", @@ -430,10 +430,10 @@ IJavaProject project = createJavaProject("P", new String[] {}, new String[] {"JCL_LIB", externalJar1, externalJar2}, ""); IType focus = project.getPackageFragmentRoot(externalJar2).getPackageFragment("p").getClassFile("Y.class").getType(); assertHierarchyEquals( - "Focus: Y [in Y.class [in p [in " + externalJar2 + " [in P]]]]\n" + + "Focus: Y [in Y.class [in p [in " + externalJar2 + "]]]\n" + "Super types:\n" + - " X [in X.class [in p [in " + externalJar1 + " [in P]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in P]]]]\n" + + " X [in X.class [in p [in " + externalJar1 + "]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", focus.newTypeHierarchy(null) ); @@ -499,7 +499,7 @@ "Focus: CycleParent [in CycleParent.java [in [in src [in TypeHierarchy15]]]]\n" + "Super types:\n" + " CycleBase [in CycleBase.java [in [in src [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n", hierarchy ); @@ -521,7 +521,7 @@ assertHierarchyEquals( "Focus: X [in X.java [in q4 [in src [in TypeHierarchy]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } finally { @@ -538,7 +538,7 @@ assertHierarchyEquals( "Focus: X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n" + " [in [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + " Y2 [in foo() [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + @@ -565,7 +565,7 @@ " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " AbstractList [in AbstractList.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n", hierarchy ); @@ -581,7 +581,7 @@ "Super types:\n" + " AbstractList [in AbstractList.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n" + " X [in X.java [in [in src [in TypeHierarchy15]]]]\n" + " Y [in Y.java [in [in src [in TypeHierarchy15]]]]\n", @@ -601,7 +601,7 @@ " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " AbstractList [in AbstractList.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n", hierarchy ); @@ -620,7 +620,7 @@ " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " AbstractList [in AbstractList.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + " List [in List.class [in util [in lib15.jar [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n", hierarchy ); @@ -661,7 +661,7 @@ assertHierarchyEquals( "Focus: Y99606 [in Y99606.java [in [in src [in TypeHierarchy15]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n" + " X99606 [in X99606.java [in [in src [in TypeHierarchy15]]]]\n", hierarchy @@ -676,7 +676,7 @@ "Super types:\n" + " B108740 [in B108740.java [in [in src [in TypeHierarchy15]]]]\n" + " A108740 [in A108740.java [in [in src [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n", hierarchy ); @@ -710,7 +710,7 @@ " I1_136095 [in I1_136095.java [in [in src [in TypeHierarchy15]]]]\n" + " I2_136095 [in I2_136095.java [in [in src [in TypeHierarchy15]]]]\n" + " I1_136095 [in I1_136095.java [in [in src [in TypeHierarchy15]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + " [in TypeHierarchy15]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString("1.5") + "]]]\n" + "Sub types:\n", hierarchy ); @@ -1119,7 +1119,7 @@ "Focus: Y [in Y.class [in p58440 [in test58440.jar [in TypeHierarchy]]]]\n" + "Super types:\n" + " Inner [in X$Inner.class [in p58440 [in test58440.jar [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -1137,7 +1137,7 @@ assertHierarchyEquals( "Focus: Inner [in X [in X.java [in p5 [in src [in TypeHierarchy]]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -1158,7 +1158,7 @@ assertHierarchyEquals( "Focus: Inner [in A [in A.java [in p6 [in src [in TypeHierarchy]]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n" + " B [in A.java [in p6 [in src [in TypeHierarchy]]]]\n", hierarchy); @@ -1174,7 +1174,7 @@ "Focus: Y1 [in [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n" + " Y2 [in [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n", hierarchy); @@ -1189,7 +1189,7 @@ assertHierarchyEquals( "Focus: Y3 [in [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -1205,7 +1205,7 @@ "Super types:\n" + " Y1 [in foo() [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -1221,7 +1221,7 @@ "Focus: Y1 [in foo() [in A [in A.java [in p7 [in src [in TypeHierarchy]]]]]]\n" + "Super types:\n" + " X [in X.java [in p7 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -1250,7 +1250,7 @@ assertHierarchyEquals( "Focus: Member [in X [in X.java [in [in [in P1]]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in P2]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n" + " Y [in Y.java [in [in [in P2]]]]\n", hierarchy); @@ -1273,7 +1273,7 @@ assertHierarchyEquals( "Focus: X [in X.java [in p4 [in src [in TypeHierarchy]]]]\n" + "Super types:\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy); } @@ -1374,17 +1374,17 @@ assertHierarchyEquals( "Focus: \n" + "Sub types of root classes:\n" + - " Class [in Class.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + + " Class [in Class.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + " Y [in Y.java [in [in [in P2]]]]\n" + " Z [in Z.java [in [in [in P3]]]]\n" + - " String [in String.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " Error [in Error.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " CloneNotSupportedException [in CloneNotSupportedException.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " IllegalMonitorStateException [in IllegalMonitorStateException.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " Exception [in Exception.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + - " Throwable [in Throwable.class [in java.lang [in "+ getExternalJCLPathString() + " [in P1]]]]\n" + + " String [in String.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " Error [in Error.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " CloneNotSupportedException [in CloneNotSupportedException.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " IllegalMonitorStateException [in IllegalMonitorStateException.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " InterruptedException [in InterruptedException.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " RuntimeException [in RuntimeException.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " Exception [in Exception.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + + " Throwable [in Throwable.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + " X [in X.java [in [in [in P1]]]]\n", hierarchy); } finally { @@ -1642,7 +1642,7 @@ "Focus: Y [in Y.java [in q6 [in src [in TypeHierarchy]]]]\n" + "Super types:\n" + " NonVisibleClass [in X.java [in q5 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy ); @@ -1657,7 +1657,7 @@ "Focus: Z [in Z.java [in q6 [in src [in TypeHierarchy]]]]\n" + "Super types:\n" + " NonVisibleInterface [in X.java [in q5 [in src [in TypeHierarchy]]]]\n" + - " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + " [in TypeHierarchy]]]]\n" + + " Object [in Object.class [in java.lang [in "+ getExternalJCLPathString() + "]]]\n" + "Sub types:\n", hierarchy ); Index: src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java,v retrieving revision 1.69 diff -u -r1.69 JavaProjectTests.java --- src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java 13 Jun 2006 13:01:05 -0000 1.69 +++ src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java 14 Jun 2006 09:02:56 -0000 @@ -951,14 +951,14 @@ IPackageFragment[] fragments= project.getPackageFragments(); assertSortedElementsEqual( "unexpected package fragments", - " [in "+ getExternalJCLPathString() + " [in JavaProjectTests]]\n" + + " [in "+ getExternalJCLPathString() + "]\n" + " [in [in JavaProjectTests]]\n" + " [in lib.jar [in JavaProjectTests]]\n" + - "META-INF [in "+ getExternalJCLPathString() + " [in JavaProjectTests]]\n" + + "META-INF [in "+ getExternalJCLPathString() + "]\n" + "META-INF [in lib.jar [in JavaProjectTests]]\n" + - "java [in "+ getExternalJCLPathString() + " [in JavaProjectTests]]\n" + - "java.io [in "+ getExternalJCLPathString() + " [in JavaProjectTests]]\n" + - "java.lang [in "+ getExternalJCLPathString() + " [in JavaProjectTests]]\n" + + "java [in "+ getExternalJCLPathString() + "]\n" + + "java.io [in "+ getExternalJCLPathString() + "]\n" + + "java.lang [in "+ getExternalJCLPathString() + "]\n" + "p [in lib.jar [in JavaProjectTests]]\n" + "q [in [in JavaProjectTests]]\n" + "x [in [in JavaProjectTests]]\n" + #P org.eclipse.jdt.core Index: model/org/eclipse/jdt/internal/core/Region.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Region.java,v retrieving revision 1.19 diff -u -r1.19 Region.java --- model/org/eclipse/jdt/internal/core/Region.java 10 May 2006 18:03:47 -0000 1.19 +++ model/org/eclipse/jdt/internal/core/Region.java 14 Jun 2006 09:03:00 -0000 @@ -13,8 +13,11 @@ import java.util.ArrayList; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.IParent; import org.eclipse.jdt.core.IRegion; +import org.eclipse.jdt.core.JavaModelException; /** @@ -44,6 +47,20 @@ //"new" element added to region removeAllChildren(element); fRootElements.add(element); + if (element.getElementType() == IJavaElement.JAVA_PROJECT) { + // add external roots as well so that external jars don't rely on their parent to know + // if they are contained in the region + // (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=146615) + try { + IPackageFragmentRoot[] roots = ((IJavaProject) element).getPackageFragmentRoots(); + for (int i = 0, length = roots.length; i < length; i++) { + if (roots[i].isExternal() && !fRootElements.contains(roots[i])) + fRootElements.add(roots[i]); + } + } catch (JavaModelException e) { + // project doesn't exist + } + } fRootElements.trimToSize(); } } Index: model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java,v retrieving revision 1.58 diff -u -r1.58 JarPackageFragmentRoot.java --- model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java 10 May 2006 18:03:47 -0000 1.58 +++ model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java 14 Jun 2006 09:03:00 -0000 @@ -285,4 +285,11 @@ return super.resourceExists(); } } +protected void toStringAncestors(StringBuffer buffer) { + if (isExternal()) + // don't show project as it is irrelevant for external jar files. + // also see https://bugs.eclipse.org/bugs/show_bug.cgi?id=146615 + return; + super.toStringAncestors(buffer); +} }