View | Details | Raw Unified | Return to bug 161555 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/model/DeleteTests.java (-5 / +5 lines)
Lines 616-632 Link Here
616 
			"Unexpected delta",
 616 
			"Unexpected delta",
617 
			"P[*]: {CHILDREN}\n" +
617 
			"P[*]: {CHILDREN}\n" +
618 
			"	<project root>[*]: {CHILDREN}\n" +
618 
			"	<project root>[*]: {CHILDREN}\n" +
619 
			"		a.b[*]: {CHILDREN}\n" +
620 
			"			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
621 
			"				Y[*]: {CHILDREN | FINE GRAINED}\n" +
622 
			"					foo[-]: {}\n" +
623 
			"					main(String[])[-]: {}\n" +
619 
			"		a.b.c[*]: {CHILDREN}\n" +
624 
			"		a.b.c[*]: {CHILDREN}\n" +
620 
			"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
625 
			"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
621 
			"				<import container>[*]: {CHILDREN | FINE GRAINED}\n" +
626 
			"				<import container>[*]: {CHILDREN | FINE GRAINED}\n" +
622 
			"					import java.util.Vector[-]: {}\n" +
627 
			"					import java.util.Vector[-]: {}\n" +
623 
			"				X[*]: {CHILDREN | FINE GRAINED}\n" +
628 
			"				X[*]: {CHILDREN | FINE GRAINED}\n" +
624 
			"					main(String[])[-]: {}\n" +
625 
			"					Bar[-]: {}\n" +
629 
			"					Bar[-]: {}\n" +
626 
			"		a.b[*]: {CHILDREN}\n" +
627 
			"			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
628 
			"				Y[*]: {CHILDREN | FINE GRAINED}\n" +
629 
			"					foo[-]: {}\n" +
630 
			"					main(String[])[-]: {}"
 630 
			"					main(String[])[-]: {}"
631 
		);
 631 
		);
632 
	} finally {
 632 
	} finally {
(-)src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java (+7 lines)
Lines 127-132 Link Here
127 
				}
 127 
				}
128 
			};
 128 
			};
129 
			org.eclipse.jdt.internal.core.util.Util.sort(elementDeltas, comparer);
 129 
			org.eclipse.jdt.internal.core.util.Util.sort(elementDeltas, comparer);
130 
			for (int i = 0, max = elementDeltas.length; i < max; i++) {
131 
				IJavaElementDelta delta = elementDeltas[i];
132 
				IJavaElementDelta[] children = delta.getAffectedChildren();
133 
				if (children != null) {
134 
					sortDeltas(children);
135 
				}
136 
			}
130 
		}
 137 
		}
131 
		public String toString() {
 138 
		public String toString() {
132 
			StringBuffer buffer = new StringBuffer();
 139 
			StringBuffer buffer = new StringBuffer();
(-)src/org/eclipse/jdt/core/tests/model/ReconcilerTests.java (-5 / +5 lines)
Lines 441-448 Link Here
441 
	assertDeltas(
 441 
	assertDeltas(
442 
		"Unexpected delta",
442 
		"Unexpected delta",
443 
		"X[*]: {CHILDREN | FINE GRAINED}\n" +
443 
		"X[*]: {CHILDREN | FINE GRAINED}\n" +
444 
		"	i[+]: {}\n" +
444 
		"	X(int)[+]: {}\n" +
445 
		"	X(int)[+]: {}"
 445 
		"	i[+]: {}"
446 
	);
 446 
	);
447 
}
 447 
}
448 
/**
 448 
/**
Lines 1305-1313 Link Here
1305 
	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
 1305 
	this.workingCopy.reconcile(ICompilationUnit.NO_AST, false, null, null);
1306 
	assertDeltas(
 1306 
	assertDeltas(
1307 
		"Unexpected delta",
1307 
		"Unexpected delta",
1308 
		"<import container>[*]: {CHILDREN | FINE GRAINED}\n" +
 1308 
		"<import container>[*]: {CHILDREN | FINE GRAINED}\n" +
1309 
		"	import p2[+]: {}\n" +
 1309 
		"	import p[-]: {}\n" +
1310 
		"	import p[-]: {}"
 1310 
		"	import p2[+]: {}"
1311 
	);
 1311 
	);
1312 
}
 1312 
}
1313 
/*
 1313 
/*
(-)src/org/eclipse/jdt/core/tests/model/ExternalJarDeltaTests.java (-1 / +1 lines)
Lines 522-529 Link Here
522 
		assertDeltas(
 522 
		assertDeltas(
523 
			"Unexpected delta",
523 
			"Unexpected delta",
524 
			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n"+
 524 
			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n"+
525 
			"	foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+
526 
			"	"+externalFooPathString+"[+]: {}\n"+
 525 
			"	"+externalFooPathString+"[+]: {}\n"+
526 
			"	foo.jar[*]: {REMOVED FROM CLASSPATH}\n"+
527 
			"	ResourceDelta(/P/.classpath)[*]\n"+
 527 
			"	ResourceDelta(/P/.classpath)[*]\n"+
528 
			"\n"+
 528 
			"\n"+
529 
			"P[*]: {CHILDREN}\n"+
 529 
			"P[*]: {CHILDREN}\n"+
(-)src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java (-19 / +19 lines)
Lines 517-529 Link Here
517 
			null);
 517 
			null);
518 
		assertDeltas(
 518 
		assertDeltas(
519 
			"Unexpected delta",
519 
			"Unexpected delta",
520 
			"P[*]: {CHILDREN}\n" +
 520 
			"P[*]: {CHILDREN}\n" +
521 
			"	src[*]: {CHILDREN}\n" +
 521 
			"	src[*]: {CHILDREN}\n" +
522 
			"		x[*]: {CHILDREN}\n" +
 522 
			"		x[*]: {CHILDREN}\n" +
523 
			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
 523 
			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
524 
			"				B[+]: {}\n" +
 524 
			"				A[*]: {CHILDREN | FINE GRAINED}\n" +
525 
			"				A[*]: {CHILDREN | FINE GRAINED}\n" +
 525 
			"					i[+]: {}\n" +
526 
			"					i[+]: {}"
 526 
			"				B[+]: {}"
527 
		);
 527 
		);
528 
	} finally {
 528 
	} finally {
529 
		stopDeltas();
 529 
		stopDeltas();
Lines 987-994 Link Here
987 
		assertDeltas(
 987 
		assertDeltas(
988 
			"Unexpected deltas",
 988 
			"Unexpected deltas",
989 
			"P1[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
989 
			"P1[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
990 
			"	src[*]: {REMOVED FROM CLASSPATH}\n" +
991 
			"	<project root>[*]: {ADDED TO CLASSPATH}\n" +
990 
			"	<project root>[*]: {ADDED TO CLASSPATH}\n" +
991 
			"	src[*]: {REMOVED FROM CLASSPATH}\n" +
992 
			"	ResourceDelta(/P1/.classpath)[*]\n" +
992 
			"	ResourceDelta(/P1/.classpath)[*]\n" +
993 
			"P2[-]: {}"
 993 
			"P2[-]: {}"
994 
		);
 994 
		);
Lines 1469-1480 Link Here
1469 
		cu.move(pkg, null, null, true, null);
 1469 
		cu.move(pkg, null, null, true, null);
1470 
		assertDeltas(
 1470 
		assertDeltas(
1471 
			"Unexpected delta",
1471 
			"Unexpected delta",
1472 
			"P[*]: {CHILDREN}\n" +
 1472 
			"P[*]: {CHILDREN}\n" +
1473 
			"	<project root>[*]: {CHILDREN}\n" +
 1473 
			"	<project root>[*]: {CHILDREN}\n" +
1474 
			"		x.y[*]: {CHILDREN}\n" +
 1474 
			"		x[*]: {CHILDREN}\n" +
1475 
			"			A.java[-]: {MOVED_TO(A.java [in x [in <project root> [in P]]])}\n" +
 1475 
			"			A.java[+]: {MOVED_FROM(A.java [in x.y [in <project root> [in P]]])}\n" +
1476 
			"		x[*]: {CHILDREN}\n" +
 1476 
			"		x.y[*]: {CHILDREN}\n" +
1477 
			"			A.java[+]: {MOVED_FROM(A.java [in x.y [in <project root> [in P]]])}"
 1477 
			"			A.java[-]: {MOVED_TO(A.java [in x [in <project root> [in P]]])}"
1478 
		);
 1478 
		);
1479 
		assertElementDescendants(
 1479 
		assertElementDescendants(
1480 
			"Unexpected children for package x",
 1480 
			"Unexpected children for package x",
Lines 1566-1573 Link Here
1566 
		assertDeltas(
 1566 
		assertDeltas(
1567 
			"Unexpected delta",
 1567 
			"Unexpected delta",
1568 
			"P[*]: {CHILDREN | CONTENT}\n" +
1568 
			"P[*]: {CHILDREN | CONTENT}\n" +
1569 
			"	nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" +
1570 
			"	nested2/src[+]: {MOVED_FROM(nested/src [in P])}\n" +
1569 
			"	nested2/src[+]: {MOVED_FROM(nested/src [in P])}\n" +
1570 
			"	nested/src[-]: {MOVED_TO(nested2/src [in P])}\n" +
1571 
			"	ResourceDelta(/P/nested)[*]\n" +
1571 
			"	ResourceDelta(/P/nested)[*]\n" +
1572 
			"	ResourceDelta(/P/nested2)[*]"
 1572 
			"	ResourceDelta(/P/nested2)[*]"
1573 
		);
 1573 
		);
Lines 1796-1803 Link Here
1796 
		assertDeltas(
 1796 
		assertDeltas(
1797 
			"Unexpected delta",
1797 
			"Unexpected delta",
1798 
			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
1798 
			"P[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
1799 
			"	lib.jar[-]: {}\n" +
1800 
			"	<project root>[*]: {ADDED TO CLASSPATH}\n" +
1799 
			"	<project root>[*]: {ADDED TO CLASSPATH}\n" +
1800 
			"	lib.jar[-]: {}\n" +
1801 
			"	ResourceDelta(/P/.classpath)[*]\n" +
1801 
			"	ResourceDelta(/P/.classpath)[*]\n" +
1802 
			"	ResourceDelta(/P/.project)[*]"
 1802 
			"	ResourceDelta(/P/.project)[*]"
1803 
		);
 1803 
		);
Lines 2113-2120 Link Here
2113 
			"		x.y[*]: {CHILDREN}\n" +
2113 
			"		x.y[*]: {CHILDREN}\n" +
2114 
			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
2114 
			"			A.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
2115 
			"				A[*]: {CHILDREN | FINE GRAINED}\n" +
2115 
			"				A[*]: {CHILDREN | FINE GRAINED}\n" +
2116 
			"					foo2()[+]: {}\n" +
2116 
			"					foo1()[-]: {}\n" +
2117 
			"					foo1()[-]: {}"
 2117 
			"					foo2()[+]: {}"
2118 
		);
 2118 
		);
2119 
	} finally {
 2119 
	} finally {
2120 
		stopDeltas();
 2120 
		stopDeltas();
Lines 2235-2242 Link Here
2235 
			"Should notice src2 and myLib additions to the classpath",
2235 
			"Should notice src2 and myLib additions to the classpath",
2236 
			"P1[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
2236 
			"P1[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
2237 
			"	<project root>[*]: {REMOVED FROM CLASSPATH}\n" +
2237 
			"	<project root>[*]: {REMOVED FROM CLASSPATH}\n" +
2238 
			"	src2[*]: {ADDED TO CLASSPATH}\n" +
2239 
			"	/LibProj/mylib.jar[*]: {ADDED TO CLASSPATH}\n" +
2238 
			"	/LibProj/mylib.jar[*]: {ADDED TO CLASSPATH}\n" +
2239 
			"	src2[*]: {ADDED TO CLASSPATH}\n" +
2240 
			"	ResourceDelta(/P1/.classpath)[*]"
 2240 
			"	ResourceDelta(/P1/.classpath)[*]"
2241 
		);
 2241 
		);
2242 
	} finally {
 2242 
	} finally {
(-)src/org/eclipse/jdt/core/tests/model/RenameTests.java (-11 / +11 lines)
Lines 278-287 Link Here
278 
		"P[*]: {CHILDREN}\n" +
278 
		"P[*]: {CHILDREN}\n" +
279 
		"	src[*]: {CHILDREN}\n" +
279 
		"	src[*]: {CHILDREN}\n" +
280 
		"		<default>[*]: {CHILDREN}\n" +
280 
		"		<default>[*]: {CHILDREN}\n" +
281 
		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" +
282 
		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" +
281 
		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" +
283 
		"			Y.java[-]: {MOVED_TO(NewY.java [in <default> [in src [in P]]])}\n" +
282 
		"			NewY.java[+]: {MOVED_FROM(Y.java [in <default> [in src [in P]]])}\n" +
284 
		"			NewY.java[+]: {MOVED_FROM(Y.java [in <default> [in src [in P]]])}"
 283 
		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" +
284 
		"			Y.java[-]: {MOVED_TO(NewY.java [in <default> [in src [in P]]])}"
285 
	);
 285 
	);
286 
}
 286 
}
287 
/**
 287 
/**
Lines 333-340 Link Here
333 
		"P[*]: {CHILDREN}\n" +
333 
		"P[*]: {CHILDREN}\n" +
334 
		"	src[*]: {CHILDREN}\n" +
334 
		"	src[*]: {CHILDREN}\n" +
335 
		"		<default>[*]: {CHILDREN}\n" +
335 
		"		<default>[*]: {CHILDREN}\n" +
336 
		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}\n" +
336 
		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}\n" +
337 
		"			NewX.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}"
 337 
		"			X.java[-]: {MOVED_TO(NewX.java [in <default> [in src [in P]]])}"
338 
	);
 338 
	);
339 
}
 339 
}
340 
public void testRenameCUForce() throws CoreException {
 340 
public void testRenameCUForce() throws CoreException {
Lines 386-393 Link Here
386 
		"Unexpected deltas",
 386 
		"Unexpected deltas",
387 
		"P[*]: {CHILDREN}\n" +
387 
		"P[*]: {CHILDREN}\n" +
388 
		"	src[*]: {CHILDREN}\n" +
388 
		"	src[*]: {CHILDREN}\n" +
389 
		"		x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}\n" +
389 
		"		x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" +
390 
		"		x.y[+]: {MOVED_FROM(x.y.z [in src [in P]])}"
 390 
		"		x.y.z[-]: {MOVED_TO(x.y [in src [in P]])}"
391 
	);
 391 
	);
392 
}
 392 
}
393 
/*
 393 
/*
Lines 468-475 Link Here
468 
		"		<default>[*]: {CHILDREN}\n" +
468 
		"		<default>[*]: {CHILDREN}\n" +
469 
		"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
469 
		"			X.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" +
470 
		"				X[*]: {CHILDREN | FINE GRAINED}\n" +
470 
		"				X[*]: {CHILDREN | FINE GRAINED}\n" +
471 
		"					fred[+]: {}\n" +
471 
		"					bar[-]: {}\n" +
472 
		"					bar[-]: {}"
 472 
		"					fred[+]: {}"
473 
	);
 473 
	);
474 
	ensureCorrectPositioning(type, type.getField("fred"), type.getField("other"));
 474 
	ensureCorrectPositioning(type, type.getField("fred"), type.getField("other"));
475 
}
 475 
}
Lines 730-737 Link Here
730 
		"Unexpected deltas",
 730 
		"Unexpected deltas",
731 
		"P[*]: {CHILDREN}\n" +
731 
		"P[*]: {CHILDREN}\n" +
732 
		"	src[*]: {CHILDREN}\n" +
732 
		"	src[*]: {CHILDREN}\n" +
733 
		"		x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}\n" +
733 
		"		x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}\n" +
734 
		"		x.y.newZ[+]: {MOVED_FROM(x.y.z [in src [in P]])}"
 734 
		"		x.y.z[-]: {MOVED_TO(x.y.newZ [in src [in P]])}"
735 
	);
 735 
	);
736 
}
 736 
}
737 
/*
 737 
/*
(-)src/org/eclipse/jdt/core/tests/model/RootManipulationsTests.java (-5 / +5 lines)
Lines 248-256 Link Here
248 
		assertDeltas(
 248 
		assertDeltas(
249 
			"Unexpected delta (1)",
 249 
			"Unexpected delta (1)",
250 
			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
250 
			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
251 
			"	src[+]: {}\n" +
251 
			"	src1[*]: {REORDERED}\n" +
252 
			"	src1[*]: {REORDERED}\n" +
252 
			"	src2[*]: {REORDERED}\n" +
253 
			"	src2[*]: {REORDERED}\n" +
253 
			"	src[+]: {}\n" +
254 
			"	ResourceDelta(/P2/.classpath)[*]"
 254 
			"	ResourceDelta(/P2/.classpath)[*]"
255 
		);
 255 
		);
256 
		assertElementsEqual(
 256 
		assertElementsEqual(
Lines 806-814 Link Here
806 
			"	src[-]: {MOVED_TO(src [in P2])}\n" +
806 
			"	src[-]: {MOVED_TO(src [in P2])}\n" +
807 
			"	ResourceDelta(/P1/.classpath)[*]\n" +
807 
			"	ResourceDelta(/P1/.classpath)[*]\n" +
808 
			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
808 
			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
809 
			"	src[+]: {MOVED_FROM(src [in P1])}\n" +
809 
			"	src1[*]: {REORDERED}\n" +
810 
			"	src1[*]: {REORDERED}\n" +
810 
			"	src2[*]: {REORDERED}\n" +
811 
			"	src2[*]: {REORDERED}\n" +
811 
			"	src[+]: {MOVED_FROM(src [in P1])}\n" +
812 
			"	ResourceDelta(/P2/.classpath)[*]"
 812 
			"	ResourceDelta(/P2/.classpath)[*]"
813 
		);
 813 
		);
814 
		assertJavaProject(
 814 
		assertJavaProject(
Lines 853-860 Link Here
853 
			"	src[-]: {MOVED_TO(src [in P2])}\n" +
853 
			"	src[-]: {MOVED_TO(src [in P2])}\n" +
854 
			"	ResourceDelta(/P1/.classpath)[*]\n" +
854 
			"	ResourceDelta(/P1/.classpath)[*]\n" +
855 
			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
855 
			"P2[*]: {CHILDREN | CONTENT | CLASSPATH CHANGED}\n" +
856 
			"	src2[*]: {REORDERED}\n" +
857 
			"	src[+]: {MOVED_FROM(src [in P1])}\n" +
856 
			"	src[+]: {MOVED_FROM(src [in P1])}\n" +
857 
			"	src2[*]: {REORDERED}\n" +
858 
			"	ResourceDelta(/P2/.classpath)[*]"
 858 
			"	ResourceDelta(/P2/.classpath)[*]"
859 
		);
 859 
		);
860 
		assertJavaProject(
 860 
		assertJavaProject(
Lines 1015-1023 Link Here
1015 
		assertDeltas(
 1015 
		assertDeltas(
1016 
			"Unexpected delta",
 1016 
			"Unexpected delta",
1017 
			"P[*]: {CHILDREN}\n" +
1017 
			"P[*]: {CHILDREN}\n" +
1018 
			"	src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}\n" +
1019 
			"	<project root>[*]: {CHILDREN}\n" +
1018 
			"	<project root>[*]: {CHILDREN}\n" +
1020 
			"		src2[+]: {MOVED_FROM(<default> [in src1 [in P]])}"
 1019 
			"		src2[+]: {MOVED_FROM(<default> [in src1 [in P]])}\n" +
1020 
			"	src1[-]: {MOVED_TO(src2 [in <project root> [in P]])}"
1021 
		);
 1021 
		);
1022 
	} finally {
 1022 
	} finally {
1023 
		stopDeltas();
 1023 
		stopDeltas();

Return to bug 161555