From ce3538c40936677c41ea94f8a29641320df6f49d Mon Sep 17 00:00:00 2001
From: Dave Hoover <dhoover@threerings.net>
Date: Fri, 15 Oct 2010 20:53:21 +0000
Subject: [PATCH] Boo, Ray's right; I can't do that.

Not all streamable things are Streamable (e.g. String, Integer)

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6211 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/util/StreamableHashIntMap.java | 2 +-
 src/java/com/threerings/util/StreamableHashMap.java    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/util/StreamableHashIntMap.java b/src/java/com/threerings/util/StreamableHashIntMap.java
index fd63f39fe..d287e1282 100644
--- a/src/java/com/threerings/util/StreamableHashIntMap.java
+++ b/src/java/com/threerings/util/StreamableHashIntMap.java
@@ -36,7 +36,7 @@ import com.threerings.io.Streamable;
  * @see Streamable
  * @param <V> the type of value stored in this map.
  */
-public class StreamableHashIntMap<V extends Streamable> extends HashIntMap<V>
+public class StreamableHashIntMap<V> extends HashIntMap<V>
     implements Streamable
 {
     /**
diff --git a/src/java/com/threerings/util/StreamableHashMap.java b/src/java/com/threerings/util/StreamableHashMap.java
index 0860f6917..c97363f81 100644
--- a/src/java/com/threerings/util/StreamableHashMap.java
+++ b/src/java/com/threerings/util/StreamableHashMap.java
@@ -38,13 +38,13 @@ import com.threerings.io.Streamable;
  * @param <K> the type of key stored in this map.
  * @param <V> the type of value stored in this map.
  */
-public class StreamableHashMap<K, V extends Streamable> extends HashMap<K, V>
+public class StreamableHashMap<K, V> extends HashMap<K, V>
     implements Streamable
 {
     /**
      * Creates an empty StreamableHashMap.
      */
-    public static <K, V extends Streamable> StreamableHashMap<K, V> newMap ()
+    public static <K, V> StreamableHashMap<K, V> newMap ()
     {
         return new StreamableHashMap<K, V>();
     }
@@ -52,8 +52,7 @@ public class StreamableHashMap<K, V extends Streamable> extends HashMap<K, V>
     /**
      * Creates StreamableHashMap populated with the same values as the provided Map.
      */
-    public static <K, V extends Streamable> StreamableHashMap<K, V> newMap (
-        Map<? extends K, ? extends V> map)
+    public static <K, V> StreamableHashMap<K, V> newMap (Map<? extends K, ? extends V> map)
     {
         return new StreamableHashMap<K, V>(map);
     }