From 7b7131bf7c996557068c154c445fad6c9500ef7a Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Mon, 23 Jun 2008 23:50:57 +0000
Subject: [PATCH] Need to weak reference the values too if they're going to be
 collectable.  Use Arrays.hashCode to calculate the hash code of a long[]
 thanks to Ray.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@550 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 .../miso/client/MisoScenePanel.java           | 15 ++++++++-------
 .../com/threerings/miso/tile/AutoFringer.java | 19 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/java/com/threerings/miso/client/MisoScenePanel.java b/src/java/com/threerings/miso/client/MisoScenePanel.java
index 21595050..1b384740 100644
--- a/src/java/com/threerings/miso/client/MisoScenePanel.java
+++ b/src/java/com/threerings/miso/client/MisoScenePanel.java
@@ -42,6 +42,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.lang.ref.WeakReference;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -364,12 +365,11 @@ public class MisoScenePanel extends VirtualMediaPanel
         for (SceneBlock block : _blocks.values()) {
             block.computeMemoryUsage(base, fringe, object, usage);
         }
-        log.info("Scene tile memory usage " +
-                 "[scene=" + StringUtil.shortClassName(this) +
-                 ", base=" + base.size() + "->" + (usage[0] / 1024) + "k" +
-                 ", fringe=" + fringe.size() + "->" + (usage[1] / 1024) + "k" +
-                 ", obj=" + object.size() +
-                 "->" + (usage[2] / 1024) + "k" + "].");
+        log.info("Scene tile memory usage", 
+            "scene", StringUtil.shortClassName(this),
+            "base", base.size() + "->" + (usage[0] / 1024) + "k", 
+            "fringe", fringe.size() + "->" + (usage[1] / 1024) + "k",
+            "obj", object.size() + "->" + (usage[2] / 1024) + "k");
     }
 
     @Override
@@ -1561,7 +1561,8 @@ public class MisoScenePanel extends VirtualMediaPanel
      * fully created FringeTile can be extracted from the map using a tile that contains only
      * what's needed for hashCode and equals: id and passability.
      */
-    protected Map<FringeTile, FringeTile> _fringes = new WeakHashMap<FringeTile, FringeTile>();
+    protected Map<FringeTile, WeakReference<FringeTile>> _fringes =
+        new WeakHashMap<FringeTile, WeakReference<FringeTile>>();
 
     /** The dirty sprites and objects that need to be re-painted. */
     protected DirtyItemList _dirtyItems = new DirtyItemList();
diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/java/com/threerings/miso/tile/AutoFringer.java
index 59d77a5a..e15ccc35 100644
--- a/src/java/com/threerings/miso/tile/AutoFringer.java
+++ b/src/java/com/threerings/miso/tile/AutoFringer.java
@@ -26,6 +26,7 @@ import static com.threerings.miso.Log.log;
 import java.awt.Graphics2D;
 import java.awt.Transparency;
 import java.awt.image.BufferedImage;
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -72,10 +73,7 @@ public class AutoFringer
         @Override
         public int hashCode ()
         {
-            int result = 33;
-            for (long key : _fringeId) {
-                result = result * 37 + (int)(key ^ (key >>> 32));
-            }
+            int result = Arrays.hashCode(_fringeId);
             if(_passable) {
                 result++;
             }
@@ -109,7 +107,7 @@ public class AutoFringer
      * Compute and return the fringe tile to be inserted at the specified location.
      */
     public BaseTile getFringeTile (MisoSceneModel scene, int col, int row,
-        Map<FringeTile, FringeTile> fringes)
+        Map<FringeTile, WeakReference<FringeTile>> fringes)
     {
         // get the tileset id of the base tile we are considering
         int underset = adjustTileSetId(scene.getBaseTileId(col, row) >> 16);
@@ -183,7 +181,7 @@ public class AutoFringer
      * Compose a FringeTile out of the various fringe images needed.
      */
     protected FringeTile composeFringeTile (FringerRec[] fringers,
-        Map<FringeTile, FringeTile> fringes, int hashValue, boolean passable)
+        Map<FringeTile, WeakReference<FringeTile>> fringes, int hashValue, boolean passable)
     {
         // sort the array so that higher priority fringers get drawn first
         QuickSort.sort(fringers);
@@ -210,9 +208,12 @@ public class AutoFringer
 
         // If the fringes map contains something with the same fringe identifier, this will pull
         // it out and we can use it instead.
-        FringeTile result = fringes.get(frTile);
+        WeakReference<FringeTile> result = fringes.get(frTile);
         if (result != null) {
-            return result;
+            FringeTile fringe = result.get();
+            if (fringe != null) {
+                return fringe;
+            }
         }
 
         // There's no fringe with he same identifier, so we need to create the tile.
@@ -230,7 +231,7 @@ public class AutoFringer
             }
         }
         frTile.setImage(new BufferedMirage(img));
-        fringes.put(frTile, frTile);
+        fringes.put(frTile, new WeakReference<FringeTile>(frTile));
         return frTile;
     }