Attachment 72778 Details for Bug 106460 – Fix

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

[patch] Fix

106460_patch.txt (text/plain), 6.90 KB, created by Markus Keller

on 2007-06-29 10:11:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2007-06-29 10:11:39 EDT

Size: 6.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ui
>Index: src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java,v
>retrieving revision 1.9
>diff -u -r1.9 TagSource.java
>--- src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java	10 May 2006 17:48:06 -0000	1.9
>+++ src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java	29 Jun 2007 13:53:22 -0000
>@@ -10,11 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.team.internal.ccvs.ui.tags;
> 
>-import java.util.ArrayList;
>-import java.util.Arrays;
>-import java.util.HashSet;
>-import java.util.List;
>-import java.util.Set;
>+import java.util.*;
> 
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.mapping.ResourceMapping;
>@@ -110,7 +106,11 @@
>     }
> 
>     private static ICVSFolder[] getFolders(ICVSResource[] resources) {
>-        return new ICVSFolder[] { getFirstFolder(resources) } ;
>+    	HashSet result= new HashSet();
>+    	for (int i= 0; i < resources.length; i++) {
>+    		result.add(getFirstFolder(resources[i]));
>+		}
>+    	return (ICVSFolder[]) result.toArray(new ICVSFolder[result.size()]);
>     }
> 
>     /**
>@@ -167,11 +167,11 @@
>         return (ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]);
>     }
> 
>-    private static ICVSFolder getFirstFolder(ICVSResource[] resources) {
>-		if (resources[0].isFolder()) {
>-			return (ICVSFolder)resources[0];
>+    private static ICVSFolder getFirstFolder(ICVSResource resource) {
>+		if (resource.isFolder()) {
>+			return (ICVSFolder)resource;
> 		} else {
>-			return resources[0].getParent();
>+			return resource.getParent();
> 		}
> 	}
> 	
>Index: src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java,v
>retrieving revision 1.8
>diff -u -r1.8 MultiFolderTagSource.java
>--- src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java	10 May 2006 17:48:06 -0000	1.8
>+++ src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java	29 Jun 2007 13:53:22 -0000
>@@ -10,10 +10,14 @@
>  *******************************************************************************/
> package org.eclipse.team.internal.ccvs.ui.tags;
> 
>+import java.util.*;
>+
>+import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.osgi.util.NLS;
>-import org.eclipse.team.internal.ccvs.core.ICVSFolder;
>-import org.eclipse.team.internal.ccvs.core.ICVSResource;
>+import org.eclipse.team.core.TeamException;
>+import org.eclipse.team.internal.ccvs.core.*;
> import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
>+import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
> 
> /**
>  * A tag source for multiple folders.
>@@ -38,6 +42,36 @@
>     }
>     
>     /* (non-Javadoc)
>+     * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#getTags(int)
>+     */
>+    public CVSTag[] getTags(int type) {
>+        if (type == CVSTag.HEAD || type == BASE) {
>+            return super.getTags(type);
>+        }
>+        Set tags= new HashSet();
>+        for (int i= 0; i < folders.length; i++) {
>+			tags.addAll(Arrays.asList(getTags(folders[i], type)));
>+		}
>+        return (CVSTag[]) tags.toArray(new CVSTag[tags.size()]);
>+    }
>+    
>+    /* (non-Javadoc)
>+     * @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#refresh(boolean, org.eclipse.core.runtime.IProgressMonitor)
>+     */
>+    public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException {
>+		monitor.beginTask("", folders.length);  //$NON-NLS-1$
>+        Set result= new HashSet();
>+    	for (int i= 0; i < folders.length; i++) {
>+			ICVSFolder folder= folders[i];
>+			CVSTag[] tags = CVSUIPlugin.getPlugin().getRepositoryManager().refreshDefinedTags(folder, bestEffort /* recurse */, true /* notify */, Policy.subMonitorFor(monitor, 1));
>+			result.addAll(Arrays.asList(tags));
>+		}
>+    	monitor.done();
>+        fireChange();
>+        return (CVSTag[]) result.toArray(new CVSTag[result.size()]);
>+    }
>+    
>+    /* (non-Javadoc)
>      * @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#getCVSResources()
>      */
>     public ICVSResource[] getCVSResources() {
>Index: src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java,v
>retrieving revision 1.24
>diff -u -r1.24 ReplaceOperation.java
>--- src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java	18 Apr 2007 17:55:51 -0000	1.24
>+++ src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java	29 Jun 2007 13:53:22 -0000
>@@ -11,9 +11,7 @@
>  *******************************************************************************/
> package org.eclipse.team.internal.ccvs.ui.operations;
> 
>-import java.util.ArrayList;
>-import java.util.List;
>-import java.util.Set;
>+import java.util.*;
> 
> import org.eclipse.core.resources.*;
> import org.eclipse.core.resources.mapping.ResourceMapping;
>@@ -27,6 +25,8 @@
> import org.eclipse.team.internal.ccvs.core.util.PrepareForReplaceVisitor;
> import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
> import org.eclipse.team.internal.ccvs.ui.Policy;
>+import org.eclipse.team.internal.ccvs.ui.tags.TagSource;
>+import org.eclipse.team.internal.ccvs.ui.tags.TagSourceWorkbenchAdapter;
> import org.eclipse.ui.IWorkbenchPart;
> 
> /**
>@@ -126,16 +126,23 @@
> 		for (int i = 0; i < resources.length; i++) {
> 			ICVSResource resource = resources[i];
> 			if ((resource.isFolder() && ((ICVSFolder)resource).isCVSFolder())) {
>-				managedResources.add(resource);
>+				addResourceIfTagExists(managedResources, resource);
> 			} else if (!resource.isFolder()){
> 				byte[] syncBytes = ((ICVSFile)resource).getSyncBytes();
> 				if (syncBytes != null && !ResourceSyncInfo.isAddition(syncBytes)) {
>-					managedResources.add(resource);
>+					addResourceIfTagExists(managedResources, resource);
> 				}
> 			}
> 		}
> 		return (ICVSResource[]) managedResources.toArray(new ICVSResource[managedResources.size()]);
> 	}
>+
>+	private void addResourceIfTagExists(List managedResources, ICVSResource resource) {
>+		TagSource tagSource= TagSource.create(new ICVSResource[] { resource });
>+		CVSTag[] tags= tagSource.getTags(TagSource.convertIncludeFlaqsToTagTypes(TagSourceWorkbenchAdapter.INCLUDE_ALL_TAGS));
>+		if (Arrays.asList(tags).contains(getTag()))
>+			managedResources.add(resource);
>+	}
> 	
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation#getUpdateCommand()

Actions: View | Diff

Attachments on bug 106460: 72778