### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java,v retrieving revision 1.166.2.1 diff -u -r1.166.2.1 AbstractJavaModelTests.java --- src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java 2 Jul 2006 10:06:40 -0000 1.166.2.1 +++ src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java 20 Oct 2006 20:49:31 -0000 @@ -124,6 +124,13 @@ } }; org.eclipse.jdt.internal.core.util.Util.sort(elementDeltas, comparer); + for (int i = 0, max = elementDeltas.length; i < max; i++) { + IJavaElementDelta delta = elementDeltas[i]; + IJavaElementDelta[] children = delta.getAffectedChildren(); + if (children != null) { + sortDeltas(children); + } + } } public String toString() { StringBuffer buffer = new StringBuffer(); Index: src/org/eclipse/jdt/core/tests/model/DeleteTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/DeleteTests.java,v retrieving revision 1.17.4.3 diff -u -r1.17.4.3 DeleteTests.java --- src/org/eclipse/jdt/core/tests/model/DeleteTests.java 6 Oct 2006 09:18:35 -0000 1.17.4.3 +++ src/org/eclipse/jdt/core/tests/model/DeleteTests.java 20 Oct 2006 20:49:31 -0000 @@ -616,17 +616,17 @@ "Unexpected delta", "P[*]: {CHILDREN}\n" + " [*]: {CHILDREN}\n" + + " a.b[*]: {CHILDREN}\n" + + " Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + + " Y[*]: {CHILDREN | FINE GRAINED}\n" + + " foo[-]: {}\n" + + " main(String[])[-]: {}\n" + " a.b.c[*]: {CHILDREN}\n" + " X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + " [*]: {CHILDREN | FINE GRAINED}\n" + " import java.util.Vector[-]: {}\n" + " X[*]: {CHILDREN | FINE GRAINED}\n" + - " main(String[])[-]: {}\n" + " Bar[-]: {}\n" + - " a.b[*]: {CHILDREN}\n" + - " Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + - " Y[*]: {CHILDREN | FINE GRAINED}\n" + - " foo[-]: {}\n" + " main(String[])[-]: {}" ); } finally { Index: src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java,v retrieving revision 1.26 diff -u -r1.26 ExternalJarDeltaTests.java --- src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java 29 Mar 2006 04:03:06 -0000 1.26 +++ src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java 20 Oct 2006 20:49:31 -0000 @@ -522,8 +522,8 @@ assertDeltas( "Unexpected delta", "P[*]: {CHILDREN | CLASSPATH CHANGED}\n"+ - " foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+ " "+externalFooPathString+"[+]: {}\n"+ + " foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+ " ResourceDelta(/P/.classpath)[*]\n"+ "\n"+ "P[*]: {CHILDREN}\n"+ Index: src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java,v retrieving revision 1.68.4.1 diff -u -r1.68.4.1 JavaElementDeltaTests.java --- src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java 6 Sep 2006 10:18:08 -0000 1.68.4.1 +++ src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java 20 Oct 2006 20:49:31 -0000 @@ -503,13 +503,13 @@ null); assertDeltas( "Unexpected delta", - "P[*]: {CHILDREN}\n" + - " src[*]: {CHILDREN}\n" + - " x[*]: {CHILDREN}\n" + - " A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + - " B[+]: {}\n" + - " A[*]: {CHILDREN | FINE GRAINED}\n" + - " i[+]: {}" + "P[*]: {CHILDREN}\n" + + " src[*]: {CHILDREN}\n" + + " x[*]: {CHILDREN}\n" + + " A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + + " A[*]: {CHILDREN | FINE GRAINED}\n" + + " i[+]: {}\n" + + " B[+]: {}" ); } finally { stopDeltas(); @@ -949,8 +949,8 @@ assertDeltas( "Unexpected deltas", "P1[*]: {CHILDREN | CLASSPATH CHANGED}\n" + - " src[*]: {REMOVED FROM CLASSPATH}\n" + " [*]: {ADDED TO CLASSPATH}\n" + + " src[*]: {REMOVED FROM CLASSPATH}\n" + " ResourceDelta(/P1/.classpath)[*]\n" + "P2[-]: {}" ); @@ -1431,12 +1431,12 @@ cu.move(pkg, null, null, true, null); assertDeltas( "Unexpected delta", - "P[*]: {CHILDREN}\n" + - " [*]: {CHILDREN}\n" + - " x.y[*]: {CHILDREN}\n" + - " A.java[-]: {MOVED_TO(A.java [in x [in [in P]]])}\n" + - " x[*]: {CHILDREN}\n" + - " A.java[+]: {MOVED_FROM(A.java [in x.y [in [in P]]])}" + "P[*]: {CHILDREN}\n" + + " [*]: {CHILDREN}\n" + + " x[*]: {CHILDREN}\n" + + " A.java[+]: {MOVED_FROM(A.java [in x.y [in [in P]]])}\n" + + " x.y[*]: {CHILDREN}\n" + + " A.java[-]: {MOVED_TO(A.java [in x [in [in P]]])}" ); assertElementDescendants( "Unexpected children for package x", @@ -1528,8 +1528,8 @@ assertDeltas( "Unexpected delta", "P[*]: {CHILDREN | CONTENT}\n" + - " nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" + " nested2/src[+]: {MOVED_FROM(nested/src [in P])}\n" + + " nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" + " ResourceDelta(/P/nested)[*]\n" + " ResourceDelta(/P/nested2)[*]" ); @@ -1758,8 +1758,8 @@ assertDeltas( "Unexpected delta", "P[*]: {CHILDREN | CLASSPATH CHANGED}\n" + - " lib.jar[-]: {}\n" + " [*]: {ADDED TO CLASSPATH}\n" + + " lib.jar[-]: {}\n" + " ResourceDelta(/P/.classpath)[*]\n" + " ResourceDelta(/P/.project)[*]" ); @@ -2075,8 +2075,8 @@ " x.y[*]: {CHILDREN}\n" + " A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + " A[*]: {CHILDREN | FINE GRAINED}\n" + - " foo2()[+]: {}\n" + - " foo1()[-]: {}" + " foo1()[-]: {}\n" + + " foo2()[+]: {}" ); } finally { stopDeltas(); @@ -2197,8 +2197,8 @@ "Should notice src2 and myLib additions to the classpath", "P1[*]: {CHILDREN | CLASSPATH CHANGED}\n" + " [*]: {REMOVED FROM CLASSPATH}\n" + - " src2[*]: {ADDED TO CLASSPATH}\n" + " /LibProj/mylib.jar[*]: {ADDED TO CLASSPATH}\n" + + " src2[*]: {ADDED TO CLASSPATH}\n" + " ResourceDelta(/P1/.classpath)[*]" ); } finally { Index: src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java,v retrieving revision 1.98.4.4 diff -u -r1.98.4.4 ReconcilerTests.java --- src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java 1 Sep 2006 08:39:49 -0000 1.98.4.4 +++ src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java 20 Oct 2006 20:49:31 -0000 @@ -437,8 +437,8 @@ assertDeltas( "Unexpected delta", "X[*]: {CHILDREN | FINE GRAINED}\n" + - " i[+]: {}\n" + - " X(int)[+]: {}" + " X(int)[+]: {}\n" + + " i[+]: {}" ); } /** @@ -1266,9 +1266,9 @@ this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null); assertDeltas( "Unexpected delta", - "[*]: {CHILDREN | FINE GRAINED}\n" + - " import p2[+]: {}\n" + - " import p[-]: {}" + "[*]: {CHILDREN | FINE GRAINED}\n" + + " import p[-]: {}\n" + + " import p2[+]: {}" ); } /* Index: src/org/eclipse/jdt/core/tests/model/RenameTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java,v retrieving revision 1.23 diff -u -r1.23 RenameTests.java --- src/org/eclipse/jdt/core/tests/model/RenameTests.java 29 Mar 2006 04:03:08 -0000 1.23 +++ src/org/eclipse/jdt/core/tests/model/RenameTests.java 20 Oct 2006 20:49:31 -0000 @@ -278,10 +278,10 @@ "P[*]: {CHILDREN}\n" + " src[*]: {CHILDREN}\n" + " [*]: {CHILDREN}\n" + - " X.java[-]: {MOVED_TO(NewX.java [in [in src [in P]]])}\n" + " NewX.java[+]: {MOVED_FROM(X.java [in [in src [in P]]])}\n" + - " Y.java[-]: {MOVED_TO(NewY.java [in [in src [in P]]])}\n" + - " NewY.java[+]: {MOVED_FROM(Y.java [in [in src [in P]]])}" + " NewY.java[+]: {MOVED_FROM(Y.java [in [in src [in P]]])}\n" + + " X.java[-]: {MOVED_TO(NewX.java [in [in src [in P]]])}\n" + + " Y.java[-]: {MOVED_TO(NewY.java [in [in src [in P]]])}" ); } /** @@ -333,8 +333,8 @@ "P[*]: {CHILDREN}\n" + " src[*]: {CHILDREN}\n" + " [*]: {CHILDREN}\n" + - " X.java[-]: {MOVED_TO(NewX.java [in [in src [in P]]])}\n" + - " NewX.java[+]: {MOVED_FROM(X.java [in [in src [in P]]])}" + " NewX.java[+]: {MOVED_FROM(X.java [in [in src [in P]]])}\n" + + " X.java[-]: {MOVED_TO(NewX.java [in [in src [in P]]])}" ); } public void testRenameCUForce() throws CoreException { @@ -386,8 +386,8 @@ "Unexpected deltas", "P[*]: {CHILDREN}\n" + " src[*]: {CHILDREN}\n" + - " x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}\n" + - " x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}" + " x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" + + " x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}" ); } /* @@ -468,8 +468,8 @@ " [*]: {CHILDREN}\n" + " X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + " X[*]: {CHILDREN | FINE GRAINED}\n" + - " fred[+]: {}\n" + - " bar[-]: {}" + " bar[-]: {}\n" + + " fred[+]: {}" ); ensureCorrectPositioning(type, type.getField("fred"), type.getField("other")); } @@ -730,8 +730,8 @@ "Unexpected deltas", "P[*]: {CHILDREN}\n" + " src[*]: {CHILDREN}\n" + - " x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}\n" + - " x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}" + " x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" + + " x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}" ); } /* Index: src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java,v retrieving revision 1.32 diff -u -r1.32 RootManipulationsTests.java --- src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java 29 Mar 2006 04:03:07 -0000 1.32 +++ src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java 20 Oct 2006 20:49:31 -0000 @@ -248,9 +248,9 @@ assertDeltas( "Unexpected delta (1)", "P2[*]: {CHILDREN | CLASSPATH CHANGED}\n" + + " src[+]: {}\n" + " src1[*]: {REORDERED}\n" + " src2[*]: {REORDERED}\n" + - " src[+]: {}\n" + " ResourceDelta(/P2/.classpath)[*]" ); assertElementsEqual( @@ -806,9 +806,9 @@ " src[-]: {MOVED_TO(src [in P2])}\n" + " ResourceDelta(/P1/.classpath)[*]\n" + "P2[*]: {CHILDREN | CLASSPATH CHANGED}\n" + + " src[+]: {MOVED_FROM(src [in P1])}\n" + " src1[*]: {REORDERED}\n" + " src2[*]: {REORDERED}\n" + - " src[+]: {MOVED_FROM(src [in P1])}\n" + " ResourceDelta(/P2/.classpath)[*]" ); assertJavaProject( @@ -853,8 +853,8 @@ " src[-]: {MOVED_TO(src [in P2])}\n" + " ResourceDelta(/P1/.classpath)[*]\n" + "P2[*]: {CHILDREN | CLASSPATH CHANGED}\n" + - " src2[*]: {REORDERED}\n" + " src[+]: {MOVED_FROM(src [in P1])}\n" + + " src2[*]: {REORDERED}\n" + " ResourceDelta(/P2/.classpath)[*]" ); assertJavaProject( @@ -1015,9 +1015,9 @@ assertDeltas( "Unexpected delta", "P[*]: {CHILDREN}\n" + - " src1[-]: {MOVED_TO(src2 [in [in P]])}\n" + " [*]: {CHILDREN}\n" + - " src2[+]: {MOVED_FROM( [in src1 [in P]])}" + " src2[+]: {MOVED_FROM( [in src1 [in P]])}\n" + + " src1[-]: {MOVED_TO(src2 [in [in P]])}" ); } finally { stopDeltas();