Stop using TrackedObjects.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3726 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2005-10-11 19:17:43 +00:00
parent dd2468b140
commit 5bd90aa797
15 changed files with 37 additions and 38 deletions
@@ -1,5 +1,5 @@
// //
// $Id: OccupantInfo.java,v 1.14 2004/08/27 02:12:33 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
package com.threerings.crowd.data; package com.threerings.crowd.data;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.Name; import com.threerings.util.Name;
import com.threerings.presents.dobj.DSet; import com.threerings.presents.dobj.DSet;
@@ -44,7 +44,7 @@ import com.threerings.presents.dobj.DSet;
* responsible for adding the code to clone those attributes when a clone * responsible for adding the code to clone those attributes when a clone
* is requested. * is requested.
*/ */
public class OccupantInfo extends TrackedStreamableObject public class OccupantInfo extends SimpleStreamableObject
implements DSet.Entry, Cloneable implements DSet.Entry, Cloneable
{ {
/** Constant value for {@link #status}. */ /** Constant value for {@link #status}. */
@@ -23,7 +23,7 @@ package com.threerings.crowd.data;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.crowd.client.LocationDirector; import com.threerings.crowd.client.LocationDirector;
import com.threerings.crowd.client.PlaceController; import com.threerings.crowd.client.PlaceController;
@@ -41,7 +41,7 @@ import com.threerings.crowd.client.PlaceController;
* #getControllerClass} and {@link #getManagerClassName}, returning the * #getControllerClass} and {@link #getManagerClassName}, returning the
* appropriate place controller and manager class for that place. * appropriate place controller and manager class for that place.
*/ */
public abstract class PlaceConfig extends TrackedStreamableObject public abstract class PlaceConfig extends SimpleStreamableObject
{ {
/** /**
* Returns the class that should be used to create a controller for * Returns the class that should be used to create a controller for
@@ -1,5 +1,5 @@
// //
// $Id: Lobby.java,v 1.6 2004/08/27 02:12:50 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,13 +21,13 @@
package com.threerings.micasa.lobby; package com.threerings.micasa.lobby;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
/** /**
* A simple class for keeping track of information for each lobby in * A simple class for keeping track of information for each lobby in
* operation on the server. * operation on the server.
*/ */
public class Lobby extends TrackedStreamableObject public class Lobby extends SimpleStreamableObject
{ {
/** The object id of the lobby place object. */ /** The object id of the lobby place object. */
public int placeOid; public int placeOid;
@@ -1,5 +1,5 @@
// //
// $Id: MisoSceneModel.java,v 1.22 2004/08/27 02:20:06 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -24,7 +24,7 @@ package com.threerings.miso.data;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Random; import java.util.Random;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.miso.util.ObjectSet; import com.threerings.miso.util.ObjectSet;
@@ -32,7 +32,7 @@ import com.threerings.miso.util.ObjectSet;
* Contains basic information for a miso scene model that is shared among * Contains basic information for a miso scene model that is shared among
* the specialized model implementations. * the specialized model implementations.
*/ */
public abstract class MisoSceneModel extends TrackedStreamableObject public abstract class MisoSceneModel extends SimpleStreamableObject
implements Cloneable implements Cloneable
{ {
/** /**
@@ -24,13 +24,12 @@ package com.threerings.miso.data;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.SimpleStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.io.TrackedStreamableObject;
import com.threerings.media.tile.TileUtil; import com.threerings.media.tile.TileUtil;
/** /**
* Contains information about an object in a Miso scene. * Contains information about an object in a Miso scene.
*/ */
public class ObjectInfo extends TrackedStreamableObject public class ObjectInfo extends SimpleStreamableObject
implements Cloneable implements Cloneable
{ {
/** The fully qualified object tile id. */ /** The fully qualified object tile id. */
@@ -29,7 +29,7 @@ import com.samskivert.util.ArrayUtil;
import com.samskivert.util.ListUtil; import com.samskivert.util.ListUtil;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.media.util.MathUtil; import com.threerings.media.util.MathUtil;
import com.threerings.util.StreamableHashIntMap; import com.threerings.util.StreamableHashIntMap;
@@ -53,7 +53,7 @@ public class SparseMisoSceneModel extends MisoSceneModel
/** Contains information on a section of this scene. This is only /** 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 * public so that the scene model parser can do its job, so don't go
* poking around in here. */ * poking around in here. */
public static class Section extends TrackedStreamableObject public static class Section extends SimpleStreamableObject
implements Cloneable implements Cloneable
{ {
/** The tile coordinate of our upper leftmost tile. */ /** The tile coordinate of our upper leftmost tile. */
@@ -122,7 +122,7 @@ import com.threerings.presents.Log;
* *
* Fields of type {@link Streamable} can also be used. * Fields of type {@link Streamable} can also be used.
*/ */
public class DObject extends TrackedObject public class DObject
implements Streamable implements Streamable
{ {
public DObject () public DObject ()
@@ -1,5 +1,5 @@
// //
// $Id: DownstreamMessage.java,v 1.13 2004/08/27 02:20:22 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,14 +21,14 @@
package com.threerings.presents.net; package com.threerings.presents.net;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
/** /**
* This class encapsulates a message in the distributed object protocol * This class encapsulates a message in the distributed object protocol
* that flows from the server to the client. Downstream messages include * that flows from the server to the client. Downstream messages include
* object subscription, event forwarding and session management. * object subscription, event forwarding and session management.
*/ */
public abstract class DownstreamMessage extends TrackedStreamableObject public abstract class DownstreamMessage extends SimpleStreamableObject
{ {
/** /**
* The message id of the upstream message with which this downstream * The message id of the upstream message with which this downstream
@@ -1,5 +1,5 @@
// //
// $Id: UpstreamMessage.java,v 1.14 2004/08/27 02:20:22 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,14 +21,14 @@
package com.threerings.presents.net; package com.threerings.presents.net;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
/** /**
* This class encapsulates a message in the distributed object protocol * This class encapsulates a message in the distributed object protocol
* that flows from the client to the server. Upstream messages include * that flows from the client to the server. Upstream messages include
* object subscription, event forwarding and session management. * object subscription, event forwarding and session management.
*/ */
public abstract class UpstreamMessage extends TrackedStreamableObject public abstract class UpstreamMessage extends SimpleStreamableObject
{ {
/** /**
* This is a unique (within the context of a reasonable period of * This is a unique (within the context of a reasonable period of
@@ -21,7 +21,7 @@
package com.threerings.puzzle.data; package com.threerings.puzzle.data;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
/** /**
* Provides summarized data representing a player's board in a puzzle * Provides summarized data representing a player's board in a puzzle
@@ -34,7 +34,7 @@ import com.threerings.io.TrackedStreamableObject;
* <p> Note all non-transient members of this and derived classes will * <p> Note all non-transient members of this and derived classes will
* automatically be serialized when the summary is sent over the wire. * automatically be serialized when the summary is sent over the wire.
*/ */
public abstract class BoardSummary extends TrackedStreamableObject public abstract class BoardSummary extends SimpleStreamableObject
{ {
/** /**
* Constructs an empty board summary for use when un-serializing. * Constructs an empty board summary for use when un-serializing.
@@ -1,5 +1,5 @@
// //
// $Id: SceneModel.java,v 1.11 2004/08/27 02:20:42 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -23,7 +23,7 @@ package com.threerings.whirled.data;
import com.samskivert.util.ArrayUtil; import com.samskivert.util.ArrayUtil;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
/** /**
* The scene model is the bare bones representation of the data for a * The scene model is the bare bones representation of the data for a
@@ -34,7 +34,7 @@ import com.threerings.io.TrackedStreamableObject;
* what is transmitted over the wire when communicating scenes from the * what is transmitted over the wire when communicating scenes from the
* server to the client. * server to the client.
*/ */
public class SceneModel extends TrackedStreamableObject public class SceneModel extends SimpleStreamableObject
implements Cloneable implements Cloneable
{ {
/** This scene's unique identifier. */ /** This scene's unique identifier. */
@@ -21,14 +21,14 @@
package com.threerings.whirled.spot.data; package com.threerings.whirled.spot.data;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil; import com.threerings.util.DirectionUtil;
/** /**
* Contains information on a scene occupant's position and orientation. * Contains information on a scene occupant's position and orientation.
*/ */
public class Location extends TrackedStreamableObject public class Location extends SimpleStreamableObject
implements Cloneable implements Cloneable
{ {
/** The user's x position (interpreted by the display system). */ /** The user's x position (interpreted by the display system). */
@@ -1,5 +1,5 @@
// //
// $Id: Portal.java,v 1.7 2004/08/27 02:20:45 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
package com.threerings.whirled.spot.data; package com.threerings.whirled.spot.data;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.DirectionUtil; import com.threerings.util.DirectionUtil;
/** /**
@@ -33,7 +33,7 @@ import com.threerings.util.DirectionUtil;
* when using this portal and the location at which the body sprite should * when using this portal and the location at which the body sprite should
* appear in that target scene. * appear in that target scene.
*/ */
public class Portal extends TrackedStreamableObject public class Portal extends SimpleStreamableObject
implements Cloneable implements Cloneable
{ {
/** This portal's unique identifier. */ /** This portal's unique identifier. */
@@ -1,5 +1,5 @@
// //
// $Id: SpotSceneModel.java,v 1.13 2004/10/23 17:36:32 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -24,7 +24,7 @@ package com.threerings.whirled.spot.data;
import com.samskivert.util.ArrayUtil; import com.samskivert.util.ArrayUtil;
import com.samskivert.util.ListUtil; import com.samskivert.util.ListUtil;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.whirled.data.AuxModel; import com.threerings.whirled.data.AuxModel;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
@@ -35,7 +35,7 @@ import com.threerings.whirled.data.SceneModel;
* scene and unchanging, so that portals can stably reference the target * scene and unchanging, so that portals can stably reference the target
* portal in the scene to which they connect. * portal in the scene to which they connect.
*/ */
public class SpotSceneModel extends TrackedStreamableObject public class SpotSceneModel extends SimpleStreamableObject
implements AuxModel implements AuxModel
{ {
/** An array containing all portals in this scene. */ /** An array containing all portals in this scene. */
@@ -1,5 +1,5 @@
// //
// $Id: ZoneSummary.java,v 1.7 2004/08/27 02:20:51 mdb Exp $ // $Id$
// //
// Narya library - tools for developing networked games // Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -23,7 +23,7 @@ package com.threerings.whirled.zone.data;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.TrackedStreamableObject; import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.Name; import com.threerings.util.Name;
/** /**
@@ -31,7 +31,7 @@ import com.threerings.util.Name;
* summary info on all of the scenes in this zone (which can be used to * summary info on all of the scenes in this zone (which can be used to
* generate a map of the zone on the client). * generate a map of the zone on the client).
*/ */
public class ZoneSummary extends TrackedStreamableObject public class ZoneSummary extends SimpleStreamableObject
{ {
/** The zone's fully qualified unique identifier. */ /** The zone's fully qualified unique identifier. */
public int zoneId; public int zoneId;