From 7743a511a170ddbd2b9eb77970a54b35c7408e60 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 26 Sep 2014 11:12:51 +0200 Subject: Switch Collection and Job equals() to Object rather than local. --- src/main/java/com/c2kernel/collection/Collection.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/collection/Collection.java') diff --git a/src/main/java/com/c2kernel/collection/Collection.java b/src/main/java/com/c2kernel/collection/Collection.java index 5cac17c..710420f 100644 --- a/src/main/java/com/c2kernel/collection/Collection.java +++ b/src/main/java/com/c2kernel/collection/Collection.java @@ -126,13 +126,16 @@ abstract public class Collection implements C2KLocal public abstract void removeMember(int memberId) throws MembershipException; - public boolean equals(Collection other) { - boolean same = mName.equals(other.getName()) && mURLInfo.equals(other.getURLInfo()) && size() == other.size(); + @Override + public boolean equals(Object other) { + if (!(other instanceof Collection)) return false; + Collection otherColl = (Collection)other; + boolean same = mName.equals(otherColl.getName()) && mURLInfo.equals(otherColl.getURLInfo()) && size() == otherColl.size(); if (!same) return false; for (Iterator i = getMembers().list.iterator(); i.hasNext();) { try { CollectionMember thisMem = i.next(); - CollectionMember otherMem = other.getMember(thisMem.getID()); + CollectionMember otherMem = otherColl.getMember(thisMem.getID()); if (!thisMem.equals(otherMem)) return false; } catch (ObjectNotFoundException ex) { return false; -- cgit v1.2.3