- Some deflexing of the low-level narya stuff. More to come, as we're

going to want the minimum client to be flex-free.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4507 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/as/com/threerings/presents/client/Client.as

@@ -174,7 +174,7 @@ public class Client extends EventDispatcher
     public function getService (clazz :Class) :InvocationService
     {
         if (_bstrap != null) {
-            for each (var isvc :InvocationService in _bstrap.services.source) {
+            for each (var isvc :InvocationService in _bstrap.services.asArray()) {
                 if (isvc is clazz) {
                     return isvc;
                 }

src/as/com/threerings/presents/client/ClientDObjectMgr.as

@@ -26,8 +26,6 @@ import flash.events.TimerEvent;
 import flash.utils.Timer;
 import flash.utils.getTimer; // function import
 
-import mx.collections.IList;
-
 import com.threerings.util.ClassUtil;
 import com.threerings.util.HashMap;
 
@@ -227,10 +225,10 @@ public class ClientDObjectMgr
         // if this is a compound event, we need to process its contained
         // events in order
         if (event is CompoundEvent) {
-            var events :IList = (event as CompoundEvent).getEvents();
+            var events :Array = (event as CompoundEvent).getEvents();
             var ecount :int = events.length;
             for (var ii :int = 0; ii < ecount; ii++) {
-                dispatchEvent(events.getItemAt(ii) as DEvent);
+                dispatchEvent(events[ii] as DEvent);
             }
             return;
         }

src/as/com/threerings/presents/client/InvocationDirector.as

@@ -2,10 +2,7 @@ package com.threerings.presents.client {
 
 import flash.utils.getTimer; // function import
 
-import mx.collections.IViewCursor;
-import mx.collections.ArrayCollection;
-
-import com.threerings.util.HashMap;
+import com.threerings.util.Hashtable;
 
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 
@@ -60,7 +57,7 @@ public class InvocationDirector
      */
     public function registerReceiver (decoder :InvocationDecoder) :void
     {
-        _reclist.addItem(decoder);
+        _reclist.push(decoder);
 
         // if we're already online, assign a recevier id now
         if (_clobj != null) {
@@ -74,12 +71,11 @@ public class InvocationDirector
     public function unregisterReceiver (receiverCode :String) :void
     {
         // remove the receiver from the list
-        for (var iter :IViewCursor = _reclist.createCursor();
-                iter.moveNext(); ) {
+        for (var ii :int = _reclist.length - 1; ii >= 0; ii--) {
             var decoder :InvocationDecoder =
-                (iter.current as InvocationDecoder);
+                (_reclist[ii] as InvocationDecoder);
             if (decoder.getReceiverCode() === receiverCode) {
-                iter.remove();
+                _reclist.splice(ii, 1);
             }
         }
 
@@ -122,10 +118,7 @@ public class InvocationDirector
     {
         _clobj.startTransaction();
         try {
-            for (var itr :IViewCursor = _reclist.createCursor();
-                    itr.moveNext(); ) {
-                var decoder :InvocationDecoder =
-                    (itr.current as InvocationDecoder);
+            for each (var decoder :InvocationDecoder in _reclist) {
                 assignReceiverId(decoder);
             }
         } finally {
@@ -354,14 +347,14 @@ public class InvocationDirector
 
     /** Used to keep track of invocation service listeners which will
      * receive responses from invocation service requests. */
-    protected var _listeners :HashMap = new HashMap();
+    protected var _listeners :Hashtable = new Hashtable();
 
     /** Used to keep track of invocation notification receivers. */
-    protected var _receivers :HashMap = new HashMap();
+    protected var _receivers :Hashtable = new Hashtable();
 
     /** All registered receivers are maintained in a list so that we can
      * assign receiver ids to them when we go online. */
-    internal var _reclist :ArrayCollection = new ArrayCollection();
+    internal var _reclist :Array = [];
 
     /** The last time we flushed our listeners. */
     protected var _lastFlushTime :Number;

src/as/com/threerings/presents/dobj/CompoundEvent.as

@@ -21,8 +21,6 @@
 
 package com.threerings.presents.dobj {
 
-import mx.collections.IList;
-
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
@@ -65,16 +63,16 @@ public class CompoundEvent extends DEvent
      */
     public function postEvent (event :DEvent) :void
     {
-        _events.addItem(event);
+        _events.add(event);
     }
 
     /**
      * Returns the list of events contained within this compound event.
      * Don't mess with it.
      */
-    public function getEvents () :IList
+    public function getEvents () :Array
     {
-        return _events;
+        return _events.asArray();
     }
 
     /**
@@ -90,11 +88,11 @@ public class CompoundEvent extends DEvent
 
         // then post this event onto the queue (but only if we actually
         // accumulated some events)
-        switch (_events.length) {
+        switch (_events.size()) {
         case 0: // nothing doing
             break;
         case 1: // no point in being compound
-            _omgr.postEvent(_events.getItemAt(0) as DEvent);
+            _omgr.postEvent(_events.get(0) as DEvent);
             break;
         default: // now we're talking
             _omgr.postEvent(this);
@@ -111,7 +109,7 @@ public class CompoundEvent extends DEvent
         // clear our target
         clearTarget();
         // clear our event queue in case someone holds onto us
-        _events.removeAll();
+        _events.clear();
     }
 
     /**
@@ -140,8 +138,9 @@ public class CompoundEvent extends DEvent
         buf.append("COMPOUND:");
         super.toStringBuf(buf);
 
-        for (var ii :int = 0; ii < _events.length; ii++) {
-            buf.append(", ", _events.getItemAt(ii));
+        var nn :int = _events.size();
+        for (var ii :int = 0; ii < nn; ii++) {
+            buf.append(", ", _events.get(ii));
         }
     }
 

src/as/com/threerings/presents/dobj/DSet.as

@@ -1,7 +1,5 @@
 package com.threerings.presents.dobj {
 
-import mx.utils.ObjectUtil;
-
 import com.threerings.util.ArrayIterator;
 import com.threerings.util.Cloneable;
 import com.threerings.util.Equalable;
@@ -117,7 +115,7 @@ public class DSet
         if (_entries.length == 0) {
             // there is nothing in the map yet, check the key validity
             var key :Object = elem.getKey();
-            if (!(key is Equalable) && !ObjectUtil.isSimple(key)) {
+            if (!(key is Equalable) && !Util.isSimple(key)) {
                 throw new Error("Element key is not 'simple' or Equalable");
             }