Renamed the InvocationListeners to the standard way I've been naming

inner classes over here on the actionscript side.


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

src/as/com/threerings/crowd/chat/client/ChatService.as

@@ -24,8 +24,8 @@ package com.threerings.crowd.chat.client {
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.Client;
-import com.threerings.presents.client.InvocationListener;
 import com.threerings.presents.client.InvocationService;
+import com.threerings.presents.client.InvocationService_InvocationListener;
 
 /**
  * The chat services provide a mechanism by which the client can broadcast
@@ -58,7 +58,7 @@ public interface ChatService extends InvocationService
      * @param listener the reference that will receive a failure response.
      */
     function broadcast (
-        client :Client, message :String, listener :InvocationListener) :void;
+        client :Client, message :String, listener :InvocationService_InvocationListener) :void;
 
     /**
      * Sets this client's away message. If the message is null or the

src/as/com/threerings/crowd/chat/client/TellListener.as

@@ -2,9 +2,9 @@ package com.threerings.crowd.chat.client {
 
 import com.threerings.util.Long;
 
-import com.threerings.presents.client.InvocationListener
+import com.threerings.presents.client.InvocationService_InvocationListener
 
-public interface TellListener extends InvocationListener
+public interface TellListener extends InvocationService_InvocationListener
 {
     function tellSucceeded (idleTime :Long, awayMessage :String) :void;
 }

src/as/com/threerings/crowd/chat/data/ChatMarshaller.as

@@ -25,7 +25,7 @@ import com.threerings.crowd.chat.client.ChatService;
 import com.threerings.crowd.chat.client.TellListener;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.client.InvocationListener;
+import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -54,7 +54,7 @@ public class ChatMarshaller extends InvocationMarshaller
     public static const BROADCAST :int = 2;
 
     // documentation inherited from interface
-    public function broadcast (arg1 :Client, arg2 :String, arg3 :InvocationListener) :void
+    public function broadcast (arg1 :Client, arg2 :String, arg3 :InvocationService_InvocationListener) :void
     {
         var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
         listener3.listener = arg3;

src/as/com/threerings/crowd/client/MoveListener.as

@@ -1,11 +1,11 @@
 package com.threerings.crowd.client {
 
 import com.threerings.presents.client.ClientEvent;
-import com.threerings.presents.client.InvocationListener;
+import com.threerings.presents.client.InvocationService_InvocationListener;
 
 import com.threerings.crowd.data.PlaceConfig;
 
-public interface MoveListener extends InvocationListener
+public interface MoveListener extends InvocationService_InvocationListener
 {
     function moveSucceeded (config :PlaceConfig) :void;
 }

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

@@ -1,7 +1,7 @@
 package com.threerings.presents.client {
 
 public class ConfirmAdapter
-    implements ConfirmListener
+    implements InvocationService_ConfirmListener
 {
     public function ConfirmAdapter (processed :Function, failed :Function)
     {

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

@@ -1,6 +1,7 @@
 package com.threerings.presents.client {
 
-public interface GotTimeBaseListener extends InvocationListener
+public interface GotTimeBaseListener
+    extends InvocationService_InvocationListener
 {
     function gotTimeOid (timeOid :int) :void;
 }

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

@@ -1,7 +1,7 @@
 package com.threerings.presents.client {
 
 public class InvocationAdapter
-    implements InvocationListener
+    implements InvocationService_InvocationListener
 {
     /**
      * Construct an InvocationAdapter that will call the specified

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

@@ -74,56 +74,6 @@ package com.threerings.presents.client {
  */
 public interface InvocationService
 {
-    /**
+    // nada
-     * Invocation service methods that require a response should take a
-     * listener argument that can be notified of request success or
-     * failure. The listener argument should extend this interface so that
-     * generic failure can be reported in all cases. For example:
-     *
-     * <pre>
-     * // Used to communicate responses to <code>moveTo</code> requests.
-     * public interface MoveListener extends InvocationListener
-     * {
-     *     // Called in response to a successful <code>moveTo</code>
-     *     // request.
-     *     public void moveSucceeded (PlaceConfig config);
-     * }
-     * </pre>
-     */
-//    public static interface InvocationListener
-//    {
-        /**
-         * Called to report request failure. If the invocation services
-         * system detects failure of any kind, it will report it via this
-         * callback. Particular services may also make use of this
-         * callback to report failures of their own, or they may opt to
-         * define more specific failure callbacks.
-         */
-//        public void requestFailed (String cause);
-//    }
-
-    /**
-     * Extends the {@link InvocationListener} with a basic success
-     * callback.
-     */
-//    public static interface ConfirmListener extends InvocationListener
-//    {
-        /**
-         * Indicates that the request was successfully processed.
-         */
-//        public void requestProcessed ();
-//    }
-
-    /**
-     * Extends the {@link InvocationListener} with a basic success
-     * callback that delivers a result object.
-     */
-//    public static interface ResultListener extends InvocationListener
-//    {
-        /**
-         * Indicates that the request was successfully processed.
-         */
-//        public void requestProcessed (Object result);
-//    }
 }
 }

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

@@ -4,7 +4,8 @@ package com.threerings.presents.client {
  * Extends the {@link InvocationListener} with a basic success
  * callback.
  */
-public interface ConfirmListener extends InvocationListener
+public interface InvocationService_ConfirmListener
+    extends InvocationService_InvocationListener
 {
     /**
      * Indicates that the request was successfully processed.

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

@@ -16,7 +16,7 @@ package com.threerings.presents.client {
  * }
  * </pre>
  */
-public interface InvocationListener
+public interface InvocationService_InvocationListener
 {
     /**
      * Called to report request failure. If the invocation services

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

@@ -4,7 +4,8 @@ package com.threerings.presents.client {
  * Extends the {@link InvocationListener} with a basic success
  * callback that delivers a result object.
  */
-public interface ResultListener extends InvocationListener
+public interface InvocationService_ResultListener
+    extends InvocationService_InvocationListener
 {
     /**
      * Indicates that the request was successfully processed.

src/as/com/threerings/presents/data/InvocationMarshaller.as

@@ -28,8 +28,6 @@ import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
 import com.threerings.presents.client.Client;
-import com.threerings.presents.client.ConfirmListener;
-import com.threerings.presents.client.ResultListener;
 import com.threerings.presents.client.InvocationService;
 
 import com.threerings.presents.dobj.DObjectManager;

src/as/com/threerings/presents/data/InvocationMarshaller_ConfirmMarshaller.as

@@ -1,10 +1,10 @@
 package com.threerings.presents.data {
 
-import com.threerings.presents.client.ConfirmListener;
+import com.threerings.presents.client.InvocationService_ConfirmListener;
 
 public class InvocationMarshaller_ConfirmMarshaller
     extends InvocationMarshaller_ListenerMarshaller
-    implements ConfirmListener
+    implements InvocationService_ConfirmListener
 {
     public static const REQUEST_PROCESSED :int = 1;
 
@@ -19,7 +19,7 @@ public class InvocationMarshaller_ConfirmMarshaller
     {
         switch (methodId) {
         case REQUEST_PROCESSED:
-            (listener as ConfirmListener).requestProcessed();
+            (listener as InvocationService_ConfirmListener).requestProcessed();
             return;
 
         default:

src/as/com/threerings/presents/data/InvocationMarshaller_ListenerMarshaller.as

@@ -6,13 +6,13 @@ import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.Streamable;
 
-import com.threerings.presents.client.InvocationListener;
+import com.threerings.presents.client.InvocationService_InvocationListener;
 
 import com.threerings.presents.dobj.DObjectManager;
 import com.threerings.presents.dobj.InvocationResponseEvent;
 
 public class InvocationMarshaller_ListenerMarshaller
-    implements Streamable, InvocationListener
+    implements Streamable, InvocationService_InvocationListener
 {
     /** The method id used to dispatch a requestFailed response. */
     public static const REQUEST_FAILED_RSPID :int = 0;
@@ -25,7 +25,7 @@ public class InvocationMarshaller_ListenerMarshaller
 
     /** The actual invocation listener associated with this
      * marshalling listener. This is only valid on the client. */
-    public var listener :InvocationListener;
+    public var listener :InvocationService_InvocationListener;
 
     /** The time at which this listener marshaller was registered.
      * This is only valid on the client. */