From be2bc4205b4b87d4fbfaaa09832ff4722e74c350 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Tue, 15 Oct 2002 21:01:39 +0000
Subject: [PATCH] Anally removed Comparator.equals() implementations that
 overrode Object.equals() with equivalent functionality.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1799 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/cast/ComponentClass.java        | 8 +-------
 src/java/com/threerings/media/util/ModeUtil.java        | 6 +-----
 src/java/com/threerings/miso/client/DirtyItemList.java  | 8 +-------
 src/java/com/threerings/miso/client/util/ObjectSet.java | 6 +-----
 src/java/com/threerings/presents/dobj/DSet.java         | 7 +------
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/java/com/threerings/cast/ComponentClass.java b/src/java/com/threerings/cast/ComponentClass.java
index f3bc0c566..301b81763 100644
--- a/src/java/com/threerings/cast/ComponentClass.java
+++ b/src/java/com/threerings/cast/ComponentClass.java
@@ -1,5 +1,5 @@
 //
-// $Id: ComponentClass.java,v 1.4 2002/08/19 22:58:15 mdb Exp $
+// $Id: ComponentClass.java,v 1.5 2002/10/15 21:01:39 ray Exp $
 
 package com.threerings.cast;
 
@@ -72,12 +72,6 @@ public class ComponentClass implements Serializable
             return (ca.componentClass.renderPriority -
                     cb.componentClass.renderPriority);
         }
-
-        // documentation inherited
-        public boolean equals (Object obj)
-        {
-	    return (obj == this);
-        }
     }
 
     /** Increase this value when object's serialized state is impacted by
diff --git a/src/java/com/threerings/media/util/ModeUtil.java b/src/java/com/threerings/media/util/ModeUtil.java
index 2d83438bf..da5fdf460 100644
--- a/src/java/com/threerings/media/util/ModeUtil.java
+++ b/src/java/com/threerings/media/util/ModeUtil.java
@@ -1,5 +1,5 @@
 //
-// $Id: ModeUtil.java,v 1.3 2002/05/09 18:43:56 mdb Exp $
+// $Id: ModeUtil.java,v 1.4 2002/10/15 21:01:39 ray Exp $
 
 package com.threerings.media.util;
 
@@ -52,10 +52,6 @@ public class ModeUtil
                 // for same bitrates, prefer higher refresh rates
                 return rr2 - rr1;
             }
-
-            public boolean equals (Object obj) {
-                return this == obj;
-            }
         };
 
         // but we only add modes that meet our minimum requirements
diff --git a/src/java/com/threerings/miso/client/DirtyItemList.java b/src/java/com/threerings/miso/client/DirtyItemList.java
index a9953248e..98961e7e7 100644
--- a/src/java/com/threerings/miso/client/DirtyItemList.java
+++ b/src/java/com/threerings/miso/client/DirtyItemList.java
@@ -1,5 +1,5 @@
 //
-// $Id: DirtyItemList.java,v 1.15 2002/09/26 23:35:10 mdb Exp $
+// $Id: DirtyItemList.java,v 1.16 2002/10/15 21:01:39 ray Exp $
 
 package com.threerings.miso.scene;
 
@@ -339,12 +339,6 @@ public class DirtyItemList
             return (_axis == X_AXIS) ? (da.ox - db.ox) : (da.oy - db.oy);
         }
 
-        // documentation inherited
-        public boolean equals (Object obj)
-        {
-	    return (obj == this);
-        }
-
         /** The axis this comparator sorts on. */
         protected int _axis;
     }
diff --git a/src/java/com/threerings/miso/client/util/ObjectSet.java b/src/java/com/threerings/miso/client/util/ObjectSet.java
index a2460184f..da3a9cb71 100644
--- a/src/java/com/threerings/miso/client/util/ObjectSet.java
+++ b/src/java/com/threerings/miso/client/util/ObjectSet.java
@@ -1,5 +1,5 @@
 //
-// $Id: ObjectSet.java,v 1.1 2002/09/23 21:53:23 mdb Exp $
+// $Id: ObjectSet.java,v 1.2 2002/10/15 21:01:39 ray Exp $
 
 package com.threerings.miso.scene.util;
 
@@ -120,10 +120,6 @@ public class ObjectSet
         public int compare (Object o1, Object o2) {
             return o1.hashCode() - o2.hashCode();
         }
-
-        public boolean equals (Object other) {
-            return this == other;
-        }
     };
 
     /** We start big because we know these will in general contain at
diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java
index 232f3c944..573635647 100644
--- a/src/java/com/threerings/presents/dobj/DSet.java
+++ b/src/java/com/threerings/presents/dobj/DSet.java
@@ -1,5 +1,5 @@
 //
-// $Id: DSet.java,v 1.20 2002/10/06 20:24:53 mdb Exp $
+// $Id: DSet.java,v 1.21 2002/10/15 21:01:39 ray Exp $
 
 package com.threerings.presents.dobj;
 
@@ -348,10 +348,5 @@ public class DSet
                 ((Entry)o2).getKey() : (Comparable)o2;
             return c1.compareTo(c2);
         }
-
-        public boolean equals (Object obj) {
-            // we don't care about comparing comparators
-            return (obj == this);
-        }
     };
 }