From 239fec32360cbec25b640cacb2cb7d1226200483 Mon Sep 17 00:00:00 2001
From: Dave Hoover <dhoover@threerings.net>
Date: Mon, 11 May 2009 20:23:19 +0000
Subject: [PATCH] SimpleEntry's a big boy now.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5773 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/presents/dobj/DSet.java    | 25 +---------
 .../threerings/presents/dobj/SimpleEntry.java | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+), 23 deletions(-)
 create mode 100644 src/java/com/threerings/presents/dobj/SimpleEntry.java

diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java
index ecf2ce9a0..8dbeaa5df 100644
--- a/src/java/com/threerings/presents/dobj/DSet.java
+++ b/src/java/com/threerings/presents/dobj/DSet.java
@@ -68,27 +68,6 @@ public class DSet<E extends DSet.Entry>
         Comparable<?> getKey ();
     }
 
-    /**
-     * A quick and easy DSet.Entry that holds some sort of Comparable.
-     *
-     * Remember: this type must also be {@link Streamable}.
-     */
-    public static class KeyWrapper<T extends Comparable<?>> implements DSet.Entry
-    {
-        // Zero arg constructor for unserialization
-        public KeyWrapper () { }
-
-        public KeyWrapper (T key) {
-            _key = key;
-        }
-
-        public T getKey () {
-            return _key;
-        }
-
-        protected T _key;
-    }
-
     /**
      * Creates a new DSet of the appropriate generic type.
      */
@@ -208,7 +187,7 @@ public class DSet<E extends DSet.Entry>
     {
         // determine where we'll be adding the new element
         int eidx = ArrayUtil.binarySearch(
-            _entries, 0, _size, new KeyWrapper<Comparable<?>>(key), ENTRY_COMP);
+            _entries, 0, _size, new SimpleEntry<Comparable<?>>(key), ENTRY_COMP);
         return (eidx < 0) ? null : _entries[eidx];
     }
 
@@ -394,7 +373,7 @@ public class DSet<E extends DSet.Entry>
 
         // look up this entry's position in our set
         int eidx = ArrayUtil.binarySearch(
-            _entries, 0, _size, new KeyWrapper<Comparable<?>>(key), ENTRY_COMP);
+            _entries, 0, _size, new SimpleEntry<Comparable<?>>(key), ENTRY_COMP);
 
         // if we found it, remove it
         if (eidx >= 0) {
diff --git a/src/java/com/threerings/presents/dobj/SimpleEntry.java b/src/java/com/threerings/presents/dobj/SimpleEntry.java
new file mode 100644
index 000000000..b9a643868
--- /dev/null
+++ b/src/java/com/threerings/presents/dobj/SimpleEntry.java
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2009 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.presents.dobj;
+
+import com.threerings.io.Streamable;
+
+/**
+ * A quick and easy DSet.Entry that holds some sort of Comparable.
+ *
+ * Remember: this type must also be {@link Streamable}.
+ */
+public class SimpleEntry<T extends Comparable<?>>
+    implements DSet.Entry
+{
+    // Zero arg constructor for unserialization
+    public SimpleEntry () { }
+
+    public SimpleEntry (T key) {
+        _key = key;
+    }
+
+    public T getKey () {
+        return _key;
+    }
+
+    protected T _key;
+}