Actually these had been generated. Bruno must have regenerated them with an old

version of Narya.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@710 c613c5cb-e716-0410-b11b-feb51c14d237

src/java/com/threerings/whirled/spot/data/SpotMarshaller.java

@@ -24,7 +24,6 @@ package com.threerings.whirled.spot.data;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneMarshaller;
 import com.threerings.whirled.spot.client.SpotService;

src/java/com/threerings/whirled/spot/server/SpotDispatcher.java

@@ -23,7 +23,6 @@ package com.threerings.whirled.spot.server;
 
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.whirled.client.SceneService;
@@ -50,7 +49,6 @@ public class SpotDispatcher extends InvocationDispatcher<SpotMarshaller>
         return new SpotMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
@@ -59,29 +57,25 @@ public class SpotDispatcher extends InvocationDispatcher<SpotMarshaller>
         switch (methodId) {
         case SpotMarshaller.CHANGE_LOCATION:
             ((SpotProvider)provider).changeLocation(
-                source,
-                ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
+                source, ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
             );
             return;
 
         case SpotMarshaller.CLUSTER_SPEAK:
             ((SpotProvider)provider).clusterSpeak(
-                source,
-                (String)args[0], ((Byte)args[1]).byteValue()
+                source, (String)args[0], ((Byte)args[1]).byteValue()
             );
             return;
 
         case SpotMarshaller.JOIN_CLUSTER:
             ((SpotProvider)provider).joinCluster(
-                source,
-                ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
+                source, ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
             );
             return;
 
         case SpotMarshaller.TRAVERSE_PORTAL:
             ((SpotProvider)provider).traversePortal(
-                source,
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3]
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3]
             );
             return;
 

src/java/com/threerings/whirled/spot/server/SpotProvider.java

@@ -26,6 +26,7 @@ import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 import com.threerings.whirled.client.SceneService;
+import com.threerings.whirled.spot.client.SpotService;
 import com.threerings.whirled.spot.data.Location;
 
 /**
@@ -36,23 +37,23 @@ public interface SpotProvider extends InvocationProvider
     /**
      * Handles a {@link SpotService#changeLocation} request.
      */
-    public void changeLocation (ClientObject caller, int arg1, Location arg2, InvocationService.ConfirmListener arg3)
+    void changeLocation (ClientObject caller, int arg1, Location arg2, InvocationService.ConfirmListener arg3)
         throws InvocationException;
 
     /**
      * Handles a {@link SpotService#clusterSpeak} request.
      */
-    public void clusterSpeak (ClientObject caller, String arg1, byte arg2);
+    void clusterSpeak (ClientObject caller, String arg1, byte arg2);
 
     /**
      * Handles a {@link SpotService#joinCluster} request.
      */
-    public void joinCluster (ClientObject caller, int arg1, InvocationService.ConfirmListener arg2)
+    void joinCluster (ClientObject caller, int arg1, InvocationService.ConfirmListener arg2)
         throws InvocationException;
 
     /**
      * Handles a {@link SpotService#traversePortal} request.
      */
-    public void traversePortal (ClientObject caller, int arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
+    void traversePortal (ClientObject caller, int arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
         throws InvocationException;
 }