From 2b298aa3d514d4ddea7feff73a2f7f6bce9b3358 Mon Sep 17 00:00:00 2001
From: Jamie Doornbos <jamie@threerings.net>
Date: Sat, 11 Oct 2008 06:28:50 +0000
Subject: [PATCH] Pass in the expected type to readObject anywhere the code
 would clearly convert the wrong type to null anyway

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5440 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/as/com/threerings/crowd/chat/data/UserMessage.as        | 2 +-
 src/as/com/threerings/crowd/chat/data/UserSystemMessage.as  | 2 +-
 src/as/com/threerings/crowd/data/BodyObject.as              | 2 +-
 src/as/com/threerings/crowd/data/OccupantInfo.as            | 2 +-
 src/as/com/threerings/crowd/data/PlaceObject.as             | 6 +++---
 src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as    | 2 +-
 src/as/com/threerings/presents/client/Communicator.as       | 2 +-
 src/as/com/threerings/presents/data/ClientObject.as         | 6 +++---
 src/as/com/threerings/presents/dobj/CompoundEvent.as        | 2 +-
 src/as/com/threerings/presents/dobj/EntryAddedEvent.as      | 2 +-
 src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as    | 2 +-
 src/as/com/threerings/presents/net/AuthResponse.as          | 2 +-
 src/as/com/threerings/presents/net/BootstrapData.as         | 2 +-
 src/as/com/threerings/presents/net/BootstrapNotification.as | 2 +-
 src/as/com/threerings/presents/net/Credentials.as           | 2 +-
 src/as/com/threerings/presents/net/EventNotification.as     | 2 +-
 src/as/com/threerings/presents/net/ObjectResponse.as        | 2 +-
 src/as/com/threerings/presents/peer/data/ClientInfo.as      | 2 +-
 18 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/as/com/threerings/crowd/chat/data/UserMessage.as b/src/as/com/threerings/crowd/chat/data/UserMessage.as
index 3a2d8d56f..8b296553e 100644
--- a/src/as/com/threerings/crowd/chat/data/UserMessage.as
+++ b/src/as/com/threerings/crowd/chat/data/UserMessage.as
@@ -78,7 +78,7 @@ public class UserMessage extends ChatMessage
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        speaker = (ins.readObject() as Name);
+        speaker = (ins.readObject(Name) as Name);
         mode = ins.readByte();
     }
 
diff --git a/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as b/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as
index a3460654f..6f2f516f4 100644
--- a/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as
+++ b/src/as/com/threerings/crowd/chat/data/UserSystemMessage.as
@@ -51,7 +51,7 @@ public class UserSystemMessage extends SystemMessage
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        speaker = (ins.readObject() as Name);
+        speaker = (ins.readObject(Name) as Name);
     }
 
     // from interface Streamable
diff --git a/src/as/com/threerings/crowd/data/BodyObject.as b/src/as/com/threerings/crowd/data/BodyObject.as
index b3b5da7ba..49e02fe48 100644
--- a/src/as/com/threerings/crowd/data/BodyObject.as
+++ b/src/as/com/threerings/crowd/data/BodyObject.as
@@ -180,7 +180,7 @@ public class BodyObject extends ClientObject
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        location = (ins.readObject() as Place);
+        location = (ins.readObject(Place) as Place);
         status = ins.readByte();
         awayMessage = (ins.readField(String) as String);
     }
diff --git a/src/as/com/threerings/crowd/data/OccupantInfo.as b/src/as/com/threerings/crowd/data/OccupantInfo.as
index b0db08908..406e8c9c2 100644
--- a/src/as/com/threerings/crowd/data/OccupantInfo.as
+++ b/src/as/com/threerings/crowd/data/OccupantInfo.as
@@ -118,7 +118,7 @@ public class OccupantInfo extends SimpleStreamableObject
     {
         super.readObject(ins);
         bodyOid = (ins.readField(Integer) as Integer).value;
-        username = (ins.readObject() as Name);
+        username = (ins.readObject(Name) as Name);
         status = ins.readByte();
     }
 
diff --git a/src/as/com/threerings/crowd/data/PlaceObject.as b/src/as/com/threerings/crowd/data/PlaceObject.as
index a48762098..15e2eecb3 100644
--- a/src/as/com/threerings/crowd/data/PlaceObject.as
+++ b/src/as/com/threerings/crowd/data/PlaceObject.as
@@ -206,9 +206,9 @@ public class PlaceObject extends DObject
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        occupants = (ins.readObject() as OidList);
-        occupantInfo = (ins.readObject() as DSet);
-        speakService = (ins.readObject() as SpeakMarshaller);
+        occupants = (ins.readObject(OidList) as OidList);
+        occupantInfo = (ins.readObject(DSet) as DSet);
+        speakService = (ins.readObject(SpeakMarshaller) as SpeakMarshaller);
     }
 }
 }
diff --git a/src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as b/src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
index 0795c0113..00cdfc71c 100644
--- a/src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
+++ b/src/as/com/threerings/crowd/peer/data/CrowdClientInfo.as
@@ -51,7 +51,7 @@ public class CrowdClientInfo extends ClientInfo
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        visibleName = (ins.readObject() as Name);
+        visibleName = (ins.readObject(Name) as Name);
     }
 
     // from interface Streamable
diff --git a/src/as/com/threerings/presents/client/Communicator.as b/src/as/com/threerings/presents/client/Communicator.as
index f0a006ffb..07d7b8dc7 100644
--- a/src/as/com/threerings/presents/client/Communicator.as
+++ b/src/as/com/threerings/presents/client/Communicator.as
@@ -236,7 +236,7 @@ public class Communicator
         _inStream.setSource(frameData);
         var msg :DownstreamMessage;
         try {
-            msg = (_inStream.readObject() as DownstreamMessage);
+            msg = (_inStream.readObject(DownstreamMessage) as DownstreamMessage);
         } catch (e :Error) {
             log.warning("Error processing downstream message: " + e);
             log.logStackTrace(e);
diff --git a/src/as/com/threerings/presents/data/ClientObject.as b/src/as/com/threerings/presents/data/ClientObject.as
index a6bec3c61..120264bc3 100644
--- a/src/as/com/threerings/presents/data/ClientObject.as
+++ b/src/as/com/threerings/presents/data/ClientObject.as
@@ -108,9 +108,9 @@ public class ClientObject extends DObject
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        username = (ins.readObject() as Name);
-        receivers = (ins.readObject() as DSet);
-        _permPolicy = (ins.readObject() as PermissionPolicy);
+        username = (ins.readObject(Name) as Name);
+        receivers = (ins.readObject(DSet) as DSet);
+        _permPolicy = (ins.readObject(PermissionPolicy) as PermissionPolicy);
     }
 
     protected var _permPolicy :PermissionPolicy;
diff --git a/src/as/com/threerings/presents/dobj/CompoundEvent.as b/src/as/com/threerings/presents/dobj/CompoundEvent.as
index b09ab11c9..f19139bbe 100644
--- a/src/as/com/threerings/presents/dobj/CompoundEvent.as
+++ b/src/as/com/threerings/presents/dobj/CompoundEvent.as
@@ -112,7 +112,7 @@ public class CompoundEvent extends DEvent
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _events = (ins.readObject() as StreamableArrayList);
+        _events = (ins.readObject(StreamableArrayList) as StreamableArrayList);
     }
 
     /** A list of the events associated with this compound event. */
diff --git a/src/as/com/threerings/presents/dobj/EntryAddedEvent.as b/src/as/com/threerings/presents/dobj/EntryAddedEvent.as
index f2edec189..2389763aa 100644
--- a/src/as/com/threerings/presents/dobj/EntryAddedEvent.as
+++ b/src/as/com/threerings/presents/dobj/EntryAddedEvent.as
@@ -104,7 +104,7 @@ public class EntryAddedEvent extends NamedEvent
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _entry = (ins.readObject() as DSet_Entry);
+        _entry = (ins.readObject(DSet_Entry) as DSet_Entry);
     }
 
     protected var _entry :DSet_Entry;
diff --git a/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as b/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
index 746f1d18d..66e8b37ae 100644
--- a/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
+++ b/src/as/com/threerings/presents/dobj/EntryUpdatedEvent.as
@@ -122,7 +122,7 @@ public class EntryUpdatedEvent extends NamedEvent
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _entry = (ins.readObject() as DSet_Entry);
+        _entry = (ins.readObject(DSet_Entry) as DSet_Entry);
     }
 
     protected var _entry :DSet_Entry;
diff --git a/src/as/com/threerings/presents/net/AuthResponse.as b/src/as/com/threerings/presents/net/AuthResponse.as
index 1f0909bb0..894886511 100644
--- a/src/as/com/threerings/presents/net/AuthResponse.as
+++ b/src/as/com/threerings/presents/net/AuthResponse.as
@@ -34,7 +34,7 @@ public class AuthResponse extends DownstreamMessage
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _data = (ins.readObject() as AuthResponseData);
+        _data = (ins.readObject(AuthResponseData) as AuthResponseData);
     }
 
     protected var _data :AuthResponseData;
diff --git a/src/as/com/threerings/presents/net/BootstrapData.as b/src/as/com/threerings/presents/net/BootstrapData.as
index cdcce6c86..2d7a2ceb0 100644
--- a/src/as/com/threerings/presents/net/BootstrapData.as
+++ b/src/as/com/threerings/presents/net/BootstrapData.as
@@ -55,7 +55,7 @@ public class BootstrapData
     {
         connectionId = ins.readInt();
         clientOid = ins.readInt();
-        services = (ins.readObject() as Array);
+        services = (ins.readObject(Array) as Array);
     }
 }
 }
diff --git a/src/as/com/threerings/presents/net/BootstrapNotification.as b/src/as/com/threerings/presents/net/BootstrapNotification.as
index 2655f3f49..e85f2d3c2 100644
--- a/src/as/com/threerings/presents/net/BootstrapNotification.as
+++ b/src/as/com/threerings/presents/net/BootstrapNotification.as
@@ -33,7 +33,7 @@ public class BootstrapNotification extends DownstreamMessage
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _data = (ins.readObject() as BootstrapData);
+        _data = (ins.readObject(BootstrapData) as BootstrapData);
     }
 
     /** The data associated with this notification. */
diff --git a/src/as/com/threerings/presents/net/Credentials.as b/src/as/com/threerings/presents/net/Credentials.as
index 5483bb9a2..611160b74 100644
--- a/src/as/com/threerings/presents/net/Credentials.as
+++ b/src/as/com/threerings/presents/net/Credentials.as
@@ -57,7 +57,7 @@ public /* abstract */ class Credentials
     public function readObject (ins :ObjectInputStream) :void
         //throws IOError
     {
-    	_username = (ins.readObject() as Name);
+    	_username = (ins.readObject(Name) as Name);
     }
 
     public function toString () :String
diff --git a/src/as/com/threerings/presents/net/EventNotification.as b/src/as/com/threerings/presents/net/EventNotification.as
index 9fe17e335..1c0dfde74 100644
--- a/src/as/com/threerings/presents/net/EventNotification.as
+++ b/src/as/com/threerings/presents/net/EventNotification.as
@@ -40,7 +40,7 @@ public class EventNotification extends DownstreamMessage
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _event = (ins.readObject() as DEvent);
+        _event = (ins.readObject(DEvent) as DEvent);
     }
 
     /** The event which we are forwarding. */
diff --git a/src/as/com/threerings/presents/net/ObjectResponse.as b/src/as/com/threerings/presents/net/ObjectResponse.as
index e37399253..874ecbc04 100644
--- a/src/as/com/threerings/presents/net/ObjectResponse.as
+++ b/src/as/com/threerings/presents/net/ObjectResponse.as
@@ -40,7 +40,7 @@ public class ObjectResponse extends DownstreamMessage
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        _dobj = (ins.readObject() as DObject);
+        _dobj = (ins.readObject(DObject) as DObject);
     }
 
     /** The object which is associated with this response. */
diff --git a/src/as/com/threerings/presents/peer/data/ClientInfo.as b/src/as/com/threerings/presents/peer/data/ClientInfo.as
index a06840b40..2378e82b8 100644
--- a/src/as/com/threerings/presents/peer/data/ClientInfo.as
+++ b/src/as/com/threerings/presents/peer/data/ClientInfo.as
@@ -53,7 +53,7 @@ public class ClientInfo extends SimpleStreamableObject
     override public function readObject (ins :ObjectInputStream) :void
     {
         super.readObject(ins);
-        username = (ins.readObject() as Name);
+        username = (ins.readObject(Name) as Name);
     }
 
     // from interface Streamable