Attachment 209908 Details for Bug 298870 – Proposed bug fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed bug fix

Bug-298870.patch (text/plain), 2.43 KB, created by Grzegorz Abramczyk

on 2012-01-23 08:15:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Abramczyk

Created: 2012-01-23 08:15:31 EST

Size: 2.43 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/CopyVisitor.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/CopyVisitor.java
>index f350e6f..65c3890 100644
>--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/CopyVisitor.java
>+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/CopyVisitor.java
>@@ -11,6 +11,8 @@
> *******************************************************************************/
> package org.eclipse.core.internal.localstore;
> 
>+import org.eclipse.core.resources.IResource;
>+
> import java.net.URI;
> import java.util.LinkedList;
> import org.eclipse.core.filesystem.EFS;
>@@ -77,9 +79,9 @@
> 				((Folder) destination).create(IResource.VIRTUAL, true, null);
> 				return true;
> 			}
>-			if ((!isDeep || source.isUnderVirtual()) && source.isLinked()) {
>+			if ((!isDeep || source.isUnderVirtual()||(!source.getStore().fetchInfo().exists()&&source.getType()==IResource.FOLDER)) && source.isLinked()) {
> 				URI sourceLocationURI = getWorkspace().transferVariableDefinition(source, destination, source.getRawLocationURI());
>-				destination.createLink(sourceLocationURI, updateFlags & IResource.ALLOW_MISSING_LOCAL, null);
>+				destination.createLink(sourceLocationURI, updateFlags | IResource.ALLOW_MISSING_LOCAL, null);
> 				return false;
> 			}
> 			// update filters in project descriptions
>@@ -149,12 +151,15 @@
> 		/* virtual resources are always deemed as being synchronized */
> 		if (node.getResource().isVirtual())
> 			return true;
>+		/* linked resource resources when target is missing or it is not a deep copy are always deemed as being synchronized */
>+		if ((!isDeep|| !node.existsInFileSystem())&&node.getResource().isLinked() )
>+			return true;
> 		/* does the resource exist in workspace and file system? */
> 		if (!node.existsInWorkspace() || !node.existsInFileSystem())
> 			return false;
>-		/* we don't care about folder last modified */
>-		if (node.isFolder() && node.getResource().getType() == IResource.FOLDER)
>-			return true;
>+		/* we don't care about folder last modified if it is not a deep copy */
>+		if (node.isFolder() && node.getResource().getType() == IResource.FOLDER)		
>+			return !isDeep||node.getResource().isSynchronized(IResource.DEPTH_INFINITE);
> 		/* is lastModified different? */
> 		Resource target = (Resource) node.getResource();
> 		long lastModifed = target.getResourceInfo(false, false).getLocalSyncInfo();

Actions: View | Diff

Attachments on bug 298870: 156217 | 209908