From 07a426fe9ba63e95f966dba6ffc29fb5402ca1e6 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 27 Mar 2003 15:57:47 +0000
Subject: [PATCH] Make cluster extend Rectangle so that we get all of its
 lovely methods.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2337 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/whirled/spot/data/Cluster.java | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/java/com/threerings/whirled/spot/data/Cluster.java b/src/java/com/threerings/whirled/spot/data/Cluster.java
index a3c956d67..eb50d2de8 100644
--- a/src/java/com/threerings/whirled/spot/data/Cluster.java
+++ b/src/java/com/threerings/whirled/spot/data/Cluster.java
@@ -1,34 +1,27 @@
 //
-// $Id: Cluster.java,v 1.5 2003/03/26 23:42:41 mdb Exp $
+// $Id: Cluster.java,v 1.6 2003/03/27 15:57:47 mdb Exp $
 
 package com.threerings.whirled.spot.data;
 
 import java.awt.Rectangle;
 
+import com.samskivert.util.StringUtil;
+
 import com.threerings.io.SimpleStreamableObject;
+import com.threerings.io.Streamable;
+
 import com.threerings.presents.dobj.DSet;
 
 /**
  * Contains information on clusters.
  */
-public class Cluster extends SimpleStreamableObject
-    implements DSet.Entry
+public class Cluster extends Rectangle
+    implements DSet.Entry, Streamable
 {
     /** A unique identifier for this cluster (also the distributed object
      * id of the cluster chat object). */
     public int clusterOid;
 
-    /** The bounds of the cluster in the scene. */
-    public int x, y, width, height;
-
-    /**
-     * Returns the "footprint" of this cluster in tile coordinates.
-     */
-    public Rectangle getFootprint ()
-    {
-        return new Rectangle(x, y, width, height);
-    }
-
     // documentation inherited
     public Comparable getKey ()
     {
@@ -54,6 +47,14 @@ public class Cluster extends SimpleStreamableObject
         return clusterOid;
     }
 
+    /**
+     * Generates a string representation of this instance.
+     */
+    public String toString ()
+    {
+        return StringUtil.fieldsToString(this);
+    }
+
     /** Used for {@link #geyKey}. */
     protected transient Integer _key;
 }