Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-03-26 19:55:03 +0000
committerMichael Valenta2004-03-26 19:55:03 +0000
commita2bad9680dbcbd37428796c41871a155adbb5294 (patch)
treedd5a92b98cf65206876f933df3804934e818c81b
parentd357f6c48546130f4d8630473bf799178a2e54a5 (diff)
downloadeclipse.platform.team-a2bad9680dbcbd37428796c41871a155adbb5294.tar.gz
eclipse.platform.team-a2bad9680dbcbd37428796c41871a155adbb5294.tar.xz
eclipse.platform.team-a2bad9680dbcbd37428796c41871a155adbb5294.zip
Changes require for RelEng tools
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java7
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java11
2 files changed, 8 insertions, 10 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java
index 7dedd2980..8f2a3c4ca 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -50,12 +49,12 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs
initialize();
}
- public CVSCompareSubscriber(IProject[] projects, CVSTag[] tags, String name) {
+ public CVSCompareSubscriber(IResource[] resources, CVSTag[] tags, String name) {
super(getUniqueId(), Policy.bind("CVSCompareSubscriber.2", name), Policy.bind("CVSCompareSubscriber.3")); //$NON-NLS-1$ //$NON-NLS-2$
- this.resources = projects;
+ this.resources = resources;
MultiTagResourceVariantTree multiTree = new MultiTagResourceVariantTree(new SessionResourceVariantByteStore(), getCacheFileContentsHint());
for (int i = 0; i < tags.length; i++) {
- multiTree.addProject(projects[i], tags[i]);
+ multiTree.addResource(resources[i], tags[i]);
}
tree = multiTree;
initialize();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java
index d78017c57..9d9444d9d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java
@@ -13,7 +13,6 @@ package org.eclipse.team.internal.ccvs.core.syncinfo;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.team.core.variants.ResourceVariantByteStore;
import org.eclipse.team.internal.ccvs.core.CVSTag;
@@ -24,22 +23,22 @@ import org.eclipse.team.internal.ccvs.core.util.Assert;
*/
public class MultiTagResourceVariantTree extends CVSResourceVariantTree {
- Map projects = new HashMap();
+ Map resources = new HashMap();
public MultiTagResourceVariantTree(ResourceVariantByteStore cache, boolean cacheFileContentsHint) {
super(cache, null, cacheFileContentsHint);
}
- public void addProject(IProject project, CVSTag tag) {
- Assert.isNotNull(project);
+ public void addResource(IResource resource, CVSTag tag) {
+ Assert.isNotNull(resource);
Assert.isNotNull(tag);
- projects.put(project, tag);
+ resources.put(resource, tag);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree#getTag(org.eclipse.core.resources.IResource)
*/
public CVSTag getTag(IResource resource) {
- return (CVSTag)projects.get(resource.getProject());
+ return (CVSTag)resources.get(resource);
}
}

Back to the top