Attachment #72778 for bug #106460

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

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




 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.tags;

import java.util.*;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.mapping.ResourceMapping;

    }

    private static ICVSFolder[] getFolders(ICVSResource[] 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()]);
    }

    /**

        return (ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]);
    }

    private static ICVSFolder getFirstFolder(ICVSResource resource) {
		if (resource.isFolder()) {
			return (ICVSFolder)resource;
		} else {
			return resource.getParent();
		}
	}
	

Lines 10-19 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java (-2 / +36 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.tags;	11	package org.eclipse.team.internal.ccvs.ui.tags;
12		12
		13	import java.util.*;
		14
		15	import org.eclipse.core.runtime.IProgressMonitor;
13	import org.eclipse.osgi.util.NLS;	16	import org.eclipse.osgi.util.NLS;
14	import org.eclipse.team.internal.ccvs.core.ICVSFolder;	17	import org.eclipse.team.core.TeamException;
15	import org.eclipse.team.internal.ccvs.core.ICVSResource;	18	import org.eclipse.team.internal.ccvs.core.*;
16	import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;	19	import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
		20	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
17		21
18	/**	22	/**
19	* A tag source for multiple folders.	23	* A tag source for multiple folders.
Lines 38-43 Link Here
38	}	42	}
39		43
40	/* (non-Javadoc)	44	/* (non-Javadoc)
		45	* @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#getTags(int)
		46	*/
		47	public CVSTag[] getTags(int type) {
		48	if (type == CVSTag.HEAD \|\| type == BASE) {
		49	return super.getTags(type);
		50	}
		51	Set tags= new HashSet();
		52	for (int i= 0; i < folders.length; i++) {
		53	tags.addAll(Arrays.asList(getTags(folders[i], type)));
		54	}
		55	return (CVSTag[]) tags.toArray(new CVSTag[tags.size()]);
		56	}
		57
		58	/* (non-Javadoc)
		59	* @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#refresh(boolean, org.eclipse.core.runtime.IProgressMonitor)
		60	*/
		61	public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException {
		62	monitor.beginTask("", folders.length); //$NON-NLS-1$
		63	Set result= new HashSet();
		64	for (int i= 0; i < folders.length; i++) {
		65	ICVSFolder folder= folders[i];
		66	CVSTag[] tags = CVSUIPlugin.getPlugin().getRepositoryManager().refreshDefinedTags(folder, bestEffort /* recurse /, true / notify */, Policy.subMonitorFor(monitor, 1));
		67	result.addAll(Arrays.asList(tags));
		68	}
		69	monitor.done();
		70	fireChange();
		71	return (CVSTag[]) result.toArray(new CVSTag[result.size()]);
		72	}
		73
		74	/* (non-Javadoc)
41	* @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#getCVSResources()	75	* @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#getCVSResources()
42	*/	76	*/
43	public ICVSResource[] getCVSResources() {	77	public ICVSResource[] getCVSResources() {




 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;

import java.util.*;
import java.util.List;
import java.util.Set;

import org.eclipse.core.resources.*;
import org.eclipse.core.resources.mapping.ResourceMapping;

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;

/**

		for (int i = 0; i < resources.length; i++) {
			ICVSResource resource = resources[i];
			if ((resource.isFolder() && ((ICVSFolder)resource).isCVSFolder())) {
				addResourceIfTagExists(managedResources, resource);
			} else if (!resource.isFolder()){
				byte[] syncBytes = ((ICVSFile)resource).getSyncBytes();
				if (syncBytes != null && !ResourceSyncInfo.isAddition(syncBytes)) {
					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()

Return to bug 106460

Lines 10-20 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/tags/TagSource.java (-10 / +10 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.tags;	11	package org.eclipse.team.internal.ccvs.ui.tags;
12		12
13	import java.util.ArrayList;	13	import java.util.*;
14	import java.util.Arrays;
15	import java.util.HashSet;
16	import java.util.List;
17	import java.util.Set;
18		14
19	import org.eclipse.core.resources.IResource;	15	import org.eclipse.core.resources.IResource;
20	import org.eclipse.core.resources.mapping.ResourceMapping;	16	import org.eclipse.core.resources.mapping.ResourceMapping;
Lines 110-116 Link Here
110	}	106	}
111		107
112	private static ICVSFolder[] getFolders(ICVSResource[] resources) {	108	private static ICVSFolder[] getFolders(ICVSResource[] resources) {
113	return new ICVSFolder[] { getFirstFolder(resources) } ;	109	HashSet result= new HashSet();
		110	for (int i= 0; i < resources.length; i++) {
		111	result.add(getFirstFolder(resources[i]));
		112	}
		113	return (ICVSFolder[]) result.toArray(new ICVSFolder[result.size()]);
114	}	114	}
115		115
116	/**	116	/**
Lines 167-177 Link Here
167	return (ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]);	167	return (ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]);
168	}	168	}
169		169
170	private static ICVSFolder getFirstFolder(ICVSResource[] resources) {	170	private static ICVSFolder getFirstFolder(ICVSResource resource) {
171	if (resources[0].isFolder()) {	171	if (resource.isFolder()) {
172	return (ICVSFolder)resources[0];	172	return (ICVSFolder)resource;
173	} else {	173	} else {
174	return resources[0].getParent();	174	return resource.getParent();
175	}	175	}
176	}	176	}
177		177