Attachment 65907 Details for Bug 185310 – Proposed fix and regression test

[patch] Proposed fix and regression test

185310.txt (text/plain), 2.69 KB, created by Jerome Lanneluc

on 2007-05-04 07:30:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Lanneluc

Created: 2007-05-04 07:30:30 EDT

Size: 2.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/DeltaProcessor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java,v
>retrieving revision 1.299
>diff -u -r1.299 DeltaProcessor.java
>--- model/org/eclipse/jdt/internal/core/DeltaProcessor.java	26 Apr 2007 15:05:51 -0000	1.299
>+++ model/org/eclipse/jdt/internal/core/DeltaProcessor.java	4 May 2007 11:31:19 -0000
>@@ -1263,7 +1263,8 @@
> 					return IJavaElement.COMPILATION_UNIT;
> 				} else if (Util.isValidClassFileName(fileName, sourceLevel, complianceLevel)) {
> 					return IJavaElement.CLASS_FILE;
>-				} else if (this.rootInfo(res.getFullPath(), kind) != null) {
>+				} else if ((rootInfo = this.rootInfo(res.getFullPath(), kind)) != null 
>+						&& 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) */) {
> 					// case of proj=src=bin and resource is a jar file on the classpath
> 					return IJavaElement.PACKAGE_FRAGMENT_ROOT;
> 				} else {
>#P org.eclipse.jdt.core.tests.model
>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.76
>diff -u -r1.76 JavaElementDeltaTests.java
>--- src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java	10 Apr 2007 17:01:52 -0000	1.76
>+++ src/org/eclipse/jdt/core/tests/model/JavaElementDeltaTests.java	4 May 2007 11:31:20 -0000
>@@ -2141,6 +2141,31 @@
> 	}
> }
> /*
>+ * 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)
>  */

Actions: View | Diff

Attachments on bug 185310: 65907