26685: CVS View - M3 - Problem with working sets + modules

2 files changed, 27 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
index c65c71192..de9299b98 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
@@ -751,6 +751,15 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return tag1.equals(tag2);
 	}
 	
+	/**
+	 * @see java.lang.Object#hashCode()
+	 */
+	public int hashCode() {
+		CVSTag tag = getTag();
+		if (tag == null) tag = CVSTag.DEFAULT;
+		return super.hashCode() | tag.getName().hashCode();
+	}
+	
 	/*
 	 * The given root must be an ancestor of the receiver (or the receiver)
 	 * and the path of the receiver must be a prefix of the provided path.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index e4a7dde5d..c1998e863 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -355,4 +355,22 @@ public class RemoteModule extends RemoteFolder {
 	public boolean isDefinedModule() {
 		return true;
 	}
+	/**
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object arg0) {
+		if (arg0 instanceof RemoteModule) {
+			RemoteModule module = (RemoteModule) arg0;
+			return (getName().equals(module.getName()) && super.equals(module));
+		}
+		return false;
+	}
+	
+	/**
+	 * @see java.lang.Object#hashCode()
+	 */
+	public int hashCode() {
+		return super.hashCode() | getName().hashCode();
+	}
+
 }