Attachment 125950 Details for Bug 251370 – Patch 2 for this & bug 251408

[patch] Patch 2 for this & bug 251408

bug251370.txt (text/plain), 2.07 KB, created by James Blackburn

on 2009-02-17 16:58:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: James Blackburn

Created: 2009-02-17 16:58:37 EST

Size: 2.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/resources/Project.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java,v
>retrieving revision 1.153
>diff -u -r1.153 Project.java
>--- src/org/eclipse/core/internal/resources/Project.java	31 Oct 2008 13:08:17 -0000	1.153
>+++ src/org/eclipse/core/internal/resources/Project.java	17 Feb 2009 21:56:09 -0000
>@@ -798,7 +798,7 @@
> 	 * Returns true if this resource represents the project description file, and
> 	 * false otherwise.
> 	 */
>-	protected boolean isProjectDescriptionFile(IResource resource) {
>+	public static boolean isProjectDescriptionFile(IResource resource) {
> 		return resource.getType() == IResource.FILE && resource.getFullPath().segmentCount() == 2 && resource.getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME);
> 	}
> 
>Index: src/org/eclipse/core/internal/resources/AliasManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java,v
>retrieving revision 1.43
>diff -u -r1.43 AliasManager.java
>--- src/org/eclipse/core/internal/resources/AliasManager.java	12 Feb 2009 11:01:44 -0000	1.43
>+++ src/org/eclipse/core/internal/resources/AliasManager.java	17 Feb 2009 21:56:08 -0000
>@@ -681,7 +681,13 @@
> 			if (alias.getType() == IResource.PROJECT) {
> 				if (checkDeletion((Project) alias, location))
> 					continue;
>-				//project did not require deletion, so fall through below and refresh it
>+			}
>+
>+			if (alias.getType() == IResource.PROJECT || Project.isProjectDescriptionFile(alias)) {
>+				// BUG251408/251370 If we need to refresh the project, then we may not currently hold the correct
>+				// scheduling rules to modify existing linked resources (for example) so get the refreshManager to do it
>+				workspace.refreshManager.refresh(alias);
>+				continue;
> 			}
> 			localManager.refresh(alias, IResource.DEPTH_INFINITE, false, null);
> 		}

Actions: View | Diff

Attachments on bug 251370: 115550 | 115557 | 119602 | 125950 | 125951