Attachment #65907 for bug #185310

View | Details | Raw Unified | Return to bug 185310
Collapse All | Expand All

Lines 1263-1269 Link Here

(-)model/org/eclipse/jdt/internal/core/DeltaProcessor.java (-1 / +2 lines)
1263	return IJavaElement.COMPILATION_UNIT;	1263	return IJavaElement.COMPILATION_UNIT;
1264	} else if (Util.isValidClassFileName(fileName, sourceLevel, complianceLevel)) {	1264	} else if (Util.isValidClassFileName(fileName, sourceLevel, complianceLevel)) {
1265	return IJavaElement.CLASS_FILE;	1265	return IJavaElement.CLASS_FILE;
1266	} else if (this.rootInfo(res.getFullPath(), kind) != null) {	1266	} else if ((rootInfo = this.rootInfo(res.getFullPath(), kind)) != null
		1267	&& rootInfo.project.getProject().getFullPath().isPrefixOf(res.getFullPath()) /ensure root is a root of its project (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=185310) /) {
1267	// case of proj=src=bin and resource is a jar file on the classpath	1268	// case of proj=src=bin and resource is a jar file on the classpath
1268	return IJavaElement.PACKAGE_FRAGMENT_ROOT;	1269	return IJavaElement.PACKAGE_FRAGMENT_ROOT;
1269	} else {	1270	} else {




	}
}
/*
 * Remove a non-Java resource .jar from a project, this .jar being on the classpath of another project
 * (regression test for bug 185310 Removing internal jar referenced from another project doesn't update Package Explorer)
 */
public void testRemoveNonJavaResourceJar() throws CoreException {
	try {
		createJavaProject("P1", new String[] {"src"}, "bin");
		createFile("/P1/test.jar", "");
		createJavaProject("P2", new String[0], new String[] {"/P1/test.jar"}, "");
		
		startDeltas();
		deleteFile("/P1/test.jar");
		assertDeltas(
			"Unexpected delta", 
			"P1[*]: {CONTENT}\n" + 
			"	ResourceDelta(/P1/test.jar)[-]\n" + 
			"P2[*]: {CHILDREN}\n" + 
			"	/P1/test.jar[-]: {}"
		);
	} finally {
		stopDeltas();
		deleteProject("P1");
		deleteProject("P2");
	}
}
/*
 * Rename a java project.
 * (regression test for bug 7030 IllegalArgumentException renaming project)
 */

Return to bug 185310

Lines 2141-2146 Link Here

(-)src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java (+25 lines)
2141	}	2141	}
2142	}	2142	}
2143	/*	2143	/*
		2144	* Remove a non-Java resource .jar from a project, this .jar being on the classpath of another project
		2145	* (regression test for bug 185310 Removing internal jar referenced from another project doesn't update Package Explorer)
		2146	*/
		2147	public void testRemoveNonJavaResourceJar() throws CoreException {
		2148	try {
		2149	createJavaProject("P1", new String[] {"src"}, "bin");
		2150	createFile("/P1/test.jar", "");
		2151	createJavaProject("P2", new String[0], new String[] {"/P1/test.jar"}, "");
		2152
		2153	startDeltas();
		2154	deleteFile("/P1/test.jar");
		2155	assertDeltas(
		2156	"Unexpected delta",
		2157	"P1[*]: {CONTENT}\n" +
		2158	" ResourceDelta(/P1/test.jar)[-]\n" +
		2159	"P2[*]: {CHILDREN}\n" +
		2160	" /P1/test.jar[-]: {}"
		2161	);
		2162	} finally {
		2163	stopDeltas();
		2164	deleteProject("P1");
		2165	deleteProject("P2");
		2166	}
		2167	}
		2168	/*
2144	* Rename a java project.	2169	* Rename a java project.
2145	* (regression test for bug 7030 IllegalArgumentException renaming project)	2170	* (regression test for bug 7030 IllegalArgumentException renaming project)
2146	*/	2171	*/