From a2ae7d499d590c4ffae1bf627c3ebd019b201521 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 23 Aug 2004 21:05:04 +0000 Subject: [PATCH] Track more objects! git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3091 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/data/OccupantInfo.java | 6 +++--- src/java/com/threerings/crowd/data/PlaceConfig.java | 6 +++--- src/java/com/threerings/micasa/lobby/Lobby.java | 6 +++--- src/java/com/threerings/miso/data/MisoSceneModel.java | 6 +++--- src/java/com/threerings/miso/data/ObjectInfo.java | 6 +++--- src/java/com/threerings/miso/data/SparseMisoSceneModel.java | 6 +++--- src/java/com/threerings/presents/net/DownstreamMessage.java | 6 +++--- src/java/com/threerings/presents/net/UpstreamMessage.java | 6 +++--- src/java/com/threerings/util/Name.java | 6 +++--- src/java/com/threerings/whirled/data/SceneModel.java | 6 +++--- src/java/com/threerings/whirled/spot/data/Location.java | 6 +++--- src/java/com/threerings/whirled/spot/data/Portal.java | 6 +++--- .../com/threerings/whirled/spot/data/SpotSceneModel.java | 6 +++--- src/java/com/threerings/whirled/zone/data/ZoneSummary.java | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java index debf1fea5..63a24f629 100644 --- a/src/java/com/threerings/crowd/data/OccupantInfo.java +++ b/src/java/com/threerings/crowd/data/OccupantInfo.java @@ -1,9 +1,9 @@ // -// $Id: OccupantInfo.java,v 1.12 2004/03/06 11:29:19 mdb Exp $ +// $Id: OccupantInfo.java,v 1.13 2004/08/23 21:05:03 mdb Exp $ package com.threerings.crowd.data; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.util.Name; import com.threerings.presents.dobj.DSet; @@ -26,7 +26,7 @@ import com.threerings.presents.dobj.DSet; * responsible for adding the code to clone those attributes when a clone * is requested. */ -public class OccupantInfo extends SimpleStreamableObject +public class OccupantInfo extends TrackedStreamableObject implements DSet.Entry, Cloneable { /** Constant value for {@link #status}. */ diff --git a/src/java/com/threerings/crowd/data/PlaceConfig.java b/src/java/com/threerings/crowd/data/PlaceConfig.java index 5e396ed1b..f3c86cf73 100644 --- a/src/java/com/threerings/crowd/data/PlaceConfig.java +++ b/src/java/com/threerings/crowd/data/PlaceConfig.java @@ -1,11 +1,11 @@ // -// $Id: PlaceConfig.java,v 1.6 2004/02/25 14:41:47 mdb Exp $ +// $Id: PlaceConfig.java,v 1.7 2004/08/23 21:05:03 mdb Exp $ package com.threerings.crowd.data; import com.samskivert.util.StringUtil; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; /** * The place config class encapsulates the configuration information for a @@ -20,7 +20,7 @@ import com.threerings.io.SimpleStreamableObject; * #getControllerClass} and {@link #getManagerClassName}, returning the * appropriate place controller and manager class for that place. */ -public abstract class PlaceConfig extends SimpleStreamableObject +public abstract class PlaceConfig extends TrackedStreamableObject { /** * Returns the class that should be used to create a controller for diff --git a/src/java/com/threerings/micasa/lobby/Lobby.java b/src/java/com/threerings/micasa/lobby/Lobby.java index 2c9412574..5a7d116f7 100644 --- a/src/java/com/threerings/micasa/lobby/Lobby.java +++ b/src/java/com/threerings/micasa/lobby/Lobby.java @@ -1,15 +1,15 @@ // -// $Id: Lobby.java,v 1.4 2002/07/23 05:54:52 mdb Exp $ +// $Id: Lobby.java,v 1.5 2004/08/23 21:05:03 mdb Exp $ package com.threerings.micasa.lobby; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; /** * A simple class for keeping track of information for each lobby in * operation on the server. */ -public class Lobby extends SimpleStreamableObject +public class Lobby extends TrackedStreamableObject { /** The object id of the lobby place object. */ public int placeOid; diff --git a/src/java/com/threerings/miso/data/MisoSceneModel.java b/src/java/com/threerings/miso/data/MisoSceneModel.java index 12ec993f8..df8bc580c 100644 --- a/src/java/com/threerings/miso/data/MisoSceneModel.java +++ b/src/java/com/threerings/miso/data/MisoSceneModel.java @@ -1,12 +1,12 @@ // -// $Id: MisoSceneModel.java,v 1.20 2004/08/13 20:48:27 mdb Exp $ +// $Id: MisoSceneModel.java,v 1.21 2004/08/23 21:05:03 mdb Exp $ package com.threerings.miso.data; import java.awt.Rectangle; import java.util.Random; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.miso.util.ObjectSet; @@ -14,7 +14,7 @@ import com.threerings.miso.util.ObjectSet; * Contains basic information for a miso scene model that is shared among * the specialized model implementations. */ -public abstract class MisoSceneModel extends SimpleStreamableObject +public abstract class MisoSceneModel extends TrackedStreamableObject implements Cloneable { /** diff --git a/src/java/com/threerings/miso/data/ObjectInfo.java b/src/java/com/threerings/miso/data/ObjectInfo.java index c23a02dc6..e02142028 100644 --- a/src/java/com/threerings/miso/data/ObjectInfo.java +++ b/src/java/com/threerings/miso/data/ObjectInfo.java @@ -1,16 +1,16 @@ // -// $Id: ObjectInfo.java,v 1.5 2004/02/25 14:43:57 mdb Exp $ +// $Id: ObjectInfo.java,v 1.6 2004/08/23 21:05:03 mdb Exp $ package com.threerings.miso.data; import com.samskivert.util.StringUtil; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.media.tile.TileUtil; /** * Contains information about an object in a Miso scene. */ -public class ObjectInfo extends SimpleStreamableObject +public class ObjectInfo extends TrackedStreamableObject implements Cloneable { /** The fully qualified object tile id. */ diff --git a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java index a6355bf54..050072ad7 100644 --- a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java +++ b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java @@ -1,5 +1,5 @@ // -// $Id: SparseMisoSceneModel.java,v 1.14 2004/08/13 20:48:27 mdb Exp $ +// $Id: SparseMisoSceneModel.java,v 1.15 2004/08/23 21:05:03 mdb Exp $ package com.threerings.miso.data; @@ -11,7 +11,7 @@ import com.samskivert.util.ArrayUtil; import com.samskivert.util.ListUtil; import com.samskivert.util.StringUtil; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.media.util.MathUtil; import com.threerings.util.StreamableHashIntMap; @@ -35,7 +35,7 @@ public class SparseMisoSceneModel extends MisoSceneModel /** Contains information on a section of this scene. This is only * public so that the scene model parser can do its job, so don't go * poking around in here. */ - public static class Section extends SimpleStreamableObject + public static class Section extends TrackedStreamableObject implements Cloneable { /** The tile coordinate of our upper leftmost tile. */ diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/java/com/threerings/presents/net/DownstreamMessage.java index 85ef6530d..9864c4022 100644 --- a/src/java/com/threerings/presents/net/DownstreamMessage.java +++ b/src/java/com/threerings/presents/net/DownstreamMessage.java @@ -1,16 +1,16 @@ // -// $Id: DownstreamMessage.java,v 1.11 2002/12/20 23:41:26 mdb Exp $ +// $Id: DownstreamMessage.java,v 1.12 2004/08/23 21:05:04 mdb Exp $ package com.threerings.presents.net; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; /** * This class encapsulates a message in the distributed object protocol * that flows from the server to the client. Downstream messages include * object subscription, event forwarding and session management. */ -public abstract class DownstreamMessage extends SimpleStreamableObject +public abstract class DownstreamMessage extends TrackedStreamableObject { /** * The message id of the upstream message with which this downstream diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/java/com/threerings/presents/net/UpstreamMessage.java index 5d5d146d0..c00605f82 100644 --- a/src/java/com/threerings/presents/net/UpstreamMessage.java +++ b/src/java/com/threerings/presents/net/UpstreamMessage.java @@ -1,16 +1,16 @@ // -// $Id: UpstreamMessage.java,v 1.12 2004/02/21 00:51:02 mdb Exp $ +// $Id: UpstreamMessage.java,v 1.13 2004/08/23 21:05:04 mdb Exp $ package com.threerings.presents.net; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; /** * This class encapsulates a message in the distributed object protocol * that flows from the client to the server. Upstream messages include * object subscription, event forwarding and session management. */ -public abstract class UpstreamMessage extends SimpleStreamableObject +public abstract class UpstreamMessage extends TrackedStreamableObject { /** * This is a unique (within the context of a reasonable period of diff --git a/src/java/com/threerings/util/Name.java b/src/java/com/threerings/util/Name.java index 82b408f2d..a8c9b854c 100644 --- a/src/java/com/threerings/util/Name.java +++ b/src/java/com/threerings/util/Name.java @@ -1,11 +1,11 @@ // -// $Id: Name.java,v 1.2 2004/04/06 17:42:49 ray Exp $ +// $Id: Name.java,v 1.3 2004/08/23 21:05:04 mdb Exp $ package com.threerings.util; import java.util.regex.Pattern; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; /** * Contains the name of an entity. Provides a means by which names can be @@ -13,7 +13,7 @@ import com.threerings.io.SimpleStreamableObject; * things exactly or the challenge of inserting code to normalize names * everywhere they are compared. */ -public class Name extends SimpleStreamableObject +public class Name extends TrackedStreamableObject implements Comparable { /** A blank name for use in situations where it is needed. diff --git a/src/java/com/threerings/whirled/data/SceneModel.java b/src/java/com/threerings/whirled/data/SceneModel.java index f07b360af..cd9283449 100644 --- a/src/java/com/threerings/whirled/data/SceneModel.java +++ b/src/java/com/threerings/whirled/data/SceneModel.java @@ -1,11 +1,11 @@ // -// $Id: SceneModel.java,v 1.9 2003/02/12 07:23:31 mdb Exp $ +// $Id: SceneModel.java,v 1.10 2004/08/23 21:05:04 mdb Exp $ package com.threerings.whirled.data; import com.samskivert.util.ArrayUtil; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; /** * The scene model is the bare bones representation of the data for a @@ -16,7 +16,7 @@ import com.threerings.io.SimpleStreamableObject; * what is transmitted over the wire when communicating scenes from the * server to the client. */ -public class SceneModel extends SimpleStreamableObject +public class SceneModel extends TrackedStreamableObject implements Cloneable { /** This scene's unique identifier. */ diff --git a/src/java/com/threerings/whirled/spot/data/Location.java b/src/java/com/threerings/whirled/spot/data/Location.java index ccd74e27f..889c9f364 100644 --- a/src/java/com/threerings/whirled/spot/data/Location.java +++ b/src/java/com/threerings/whirled/spot/data/Location.java @@ -1,15 +1,15 @@ // -// $Id: Location.java,v 1.8 2004/02/25 14:50:28 mdb Exp $ +// $Id: Location.java,v 1.9 2004/08/23 21:05:04 mdb Exp $ package com.threerings.whirled.spot.data; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.util.DirectionUtil; /** * Contains information on a scene occupant's position and orientation. */ -public class Location extends SimpleStreamableObject +public class Location extends TrackedStreamableObject implements Cloneable { /** The user's x position (interpreted by the display system). */ diff --git a/src/java/com/threerings/whirled/spot/data/Portal.java b/src/java/com/threerings/whirled/spot/data/Portal.java index bd30cdb00..952603532 100644 --- a/src/java/com/threerings/whirled/spot/data/Portal.java +++ b/src/java/com/threerings/whirled/spot/data/Portal.java @@ -1,9 +1,9 @@ // -// $Id: Portal.java,v 1.5 2003/02/12 07:23:31 mdb Exp $ +// $Id: Portal.java,v 1.6 2004/08/23 21:05:04 mdb Exp $ package com.threerings.whirled.spot.data; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.util.DirectionUtil; /** @@ -15,7 +15,7 @@ import com.threerings.util.DirectionUtil; * when using this portal and the location at which the body sprite should * appear in that target scene. */ -public class Portal extends SimpleStreamableObject +public class Portal extends TrackedStreamableObject implements Cloneable { /** This portal's unique identifier. */ diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java b/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java index 4c4be2bd2..414c1096f 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java +++ b/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java @@ -1,12 +1,12 @@ // -// $Id: SpotSceneModel.java,v 1.10 2004/02/25 14:50:28 mdb Exp $ +// $Id: SpotSceneModel.java,v 1.11 2004/08/23 21:05:04 mdb Exp $ package com.threerings.whirled.spot.data; import com.samskivert.util.ArrayUtil; import com.samskivert.util.ListUtil; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.whirled.data.AuxModel; import com.threerings.whirled.data.SceneModel; @@ -17,7 +17,7 @@ import com.threerings.whirled.data.SceneModel; * scene and unchanging, so that portals can stably reference the target * portal in the scene to which they connect. */ -public class SpotSceneModel extends SimpleStreamableObject +public class SpotSceneModel extends TrackedStreamableObject implements AuxModel { /** An array containing all portals in this scene. */ diff --git a/src/java/com/threerings/whirled/zone/data/ZoneSummary.java b/src/java/com/threerings/whirled/zone/data/ZoneSummary.java index f461c72a2..92dc58a17 100644 --- a/src/java/com/threerings/whirled/zone/data/ZoneSummary.java +++ b/src/java/com/threerings/whirled/zone/data/ZoneSummary.java @@ -1,11 +1,11 @@ // -// $Id: ZoneSummary.java,v 1.5 2004/05/18 11:04:08 mdb Exp $ +// $Id: ZoneSummary.java,v 1.6 2004/08/23 21:05:04 mdb Exp $ package com.threerings.whirled.zone.data; import com.samskivert.util.StringUtil; -import com.threerings.io.SimpleStreamableObject; +import com.threerings.io.TrackedStreamableObject; import com.threerings.util.Name; /** @@ -13,7 +13,7 @@ import com.threerings.util.Name; * summary info on all of the scenes in this zone (which can be used to * generate a map of the zone on the client). */ -public class ZoneSummary extends SimpleStreamableObject +public class ZoneSummary extends TrackedStreamableObject { /** The zone's fully qualified unique identifier. */ public int zoneId;