From 20c0f0ff3d2efdf814bb5e6402ed59a0aafcf6d0 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 4 Oct 2006 18:13:34 +0000 Subject: [PATCH] Regenerated with updated Marshaller and Dispatcher templates. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4398 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/admin/data/AdminMarshaller.java | 11 ++++++----- .../threerings/admin/server/AdminDispatcher.java | 4 ++-- .../crowd/chat/data/ChatMarshaller.java | 15 ++++++++------- .../crowd/chat/data/SpeakMarshaller.java | 3 +-- .../crowd/chat/server/ChatDispatcher.java | 4 ++-- .../crowd/chat/server/SpeakDispatcher.java | 4 ++-- .../com/threerings/crowd/data/BodyMarshaller.java | 3 +-- .../threerings/crowd/data/LocationMarshaller.java | 13 +++++++------ .../crowd/peer/data/CrowdPeerMarshaller.java | 3 +-- .../crowd/peer/server/CrowdPeerDispatcher.java | 4 ++-- .../threerings/crowd/server/BodyDispatcher.java | 4 ++-- .../crowd/server/LocationDispatcher.java | 4 ++-- .../presents/data/TimeBaseMarshaller.java | 11 ++++++----- .../presents/server/TimeBaseDispatcher.java | 4 ++-- 14 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java index 5a0dfa7a1..947228183 100644 --- a/src/java/com/threerings/admin/data/AdminMarshaller.java +++ b/src/java/com/threerings/admin/data/AdminMarshaller.java @@ -36,7 +36,9 @@ import com.threerings.presents.dobj.InvocationResponseEvent; public class AdminMarshaller extends InvocationMarshaller implements AdminService { - // documentation inherited + /** + * Marshalls results to implementations of {@link ConfigInfoListener}. + */ public static class ConfigInfoMarshaller extends ListenerMarshaller implements ConfigInfoListener { @@ -44,7 +46,7 @@ public class AdminMarshaller extends InvocationMarshaller * responses. */ public static final int GOT_CONFIG_INFO = 1; - // documentation inherited from interface + // from interface ConfigInfoMarshaller public void gotConfigInfo (String[] arg1, int[] arg2) { _invId = null; @@ -53,7 +55,7 @@ public class AdminMarshaller extends InvocationMarshaller new Object[] { arg1, arg2 })); } - // documentation inherited + @Override // from InvocationMarshaller public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { @@ -72,7 +74,7 @@ public class AdminMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #getConfigInfo} requests. */ public static final int GET_CONFIG_INFO = 1; - // documentation inherited from interface + // from interface AdminService public void getConfigInfo (Client arg1, AdminService.ConfigInfoListener arg2) { AdminMarshaller.ConfigInfoMarshaller listener2 = new AdminMarshaller.ConfigInfoMarshaller(); @@ -81,5 +83,4 @@ public class AdminMarshaller extends InvocationMarshaller listener2 }); } - } diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java index a5d6a31cd..92eeb40fe 100644 --- a/src/java/com/threerings/admin/server/AdminDispatcher.java +++ b/src/java/com/threerings/admin/server/AdminDispatcher.java @@ -43,13 +43,13 @@ public class AdminDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new AdminMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java index 3e82feca4..c57532be0 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java @@ -38,7 +38,9 @@ import com.threerings.util.Name; public class ChatMarshaller extends InvocationMarshaller implements ChatService { - // documentation inherited + /** + * Marshalls results to implementations of {@link TellListener}. + */ public static class TellMarshaller extends ListenerMarshaller implements TellListener { @@ -46,7 +48,7 @@ public class ChatMarshaller extends InvocationMarshaller * responses. */ public static final int TELL_SUCCEEDED = 1; - // documentation inherited from interface + // from interface TellMarshaller public void tellSucceeded (long arg1, String arg2) { _invId = null; @@ -55,7 +57,7 @@ public class ChatMarshaller extends InvocationMarshaller new Object[] { Long.valueOf(arg1), arg2 })); } - // documentation inherited + @Override // from InvocationMarshaller public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { @@ -74,7 +76,7 @@ public class ChatMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #away} requests. */ public static final int AWAY = 1; - // documentation inherited from interface + // from interface ChatService public void away (Client arg1, String arg2) { sendRequest(arg1, AWAY, new Object[] { @@ -85,7 +87,7 @@ public class ChatMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #broadcast} requests. */ public static final int BROADCAST = 2; - // documentation inherited from interface + // from interface ChatService public void broadcast (Client arg1, String arg2, InvocationService.InvocationListener arg3) { ListenerMarshaller listener3 = new ListenerMarshaller(); @@ -98,7 +100,7 @@ public class ChatMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #tell} requests. */ public static final int TELL = 3; - // documentation inherited from interface + // from interface ChatService public void tell (Client arg1, Name arg2, String arg3, ChatService.TellListener arg4) { ChatMarshaller.TellMarshaller listener4 = new ChatMarshaller.TellMarshaller(); @@ -107,5 +109,4 @@ public class ChatMarshaller extends InvocationMarshaller arg2, arg3, listener4 }); } - } diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java index a27fcd139..002a2f619 100644 --- a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java @@ -39,12 +39,11 @@ public class SpeakMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #speak} requests. */ public static final int SPEAK = 1; - // documentation inherited from interface + // from interface SpeakService public void speak (Client arg1, String arg2, byte arg3) { sendRequest(arg1, SPEAK, new Object[] { arg2, Byte.valueOf(arg3) }); } - } diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java index 53dd40a83..b88217397 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java @@ -45,13 +45,13 @@ public class ChatDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new ChatMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java index a68607624..fc1ef40f4 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java @@ -43,13 +43,13 @@ public class SpeakDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new SpeakMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/java/com/threerings/crowd/data/BodyMarshaller.java index 1d374f24a..c49909461 100644 --- a/src/java/com/threerings/crowd/data/BodyMarshaller.java +++ b/src/java/com/threerings/crowd/data/BodyMarshaller.java @@ -39,12 +39,11 @@ public class BodyMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #setIdle} requests. */ public static final int SET_IDLE = 1; - // documentation inherited from interface + // from interface BodyService public void setIdle (Client arg1, boolean arg2) { sendRequest(arg1, SET_IDLE, new Object[] { Boolean.valueOf(arg2) }); } - } diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/java/com/threerings/crowd/data/LocationMarshaller.java index 08d6aff52..7830a754c 100644 --- a/src/java/com/threerings/crowd/data/LocationMarshaller.java +++ b/src/java/com/threerings/crowd/data/LocationMarshaller.java @@ -37,7 +37,9 @@ import com.threerings.presents.dobj.InvocationResponseEvent; public class LocationMarshaller extends InvocationMarshaller implements LocationService { - // documentation inherited + /** + * Marshalls results to implementations of {@link MoveListener}. + */ public static class MoveMarshaller extends ListenerMarshaller implements MoveListener { @@ -45,7 +47,7 @@ public class LocationMarshaller extends InvocationMarshaller * responses. */ public static final int MOVE_SUCCEEDED = 1; - // documentation inherited from interface + // from interface MoveMarshaller public void moveSucceeded (PlaceConfig arg1) { _invId = null; @@ -54,7 +56,7 @@ public class LocationMarshaller extends InvocationMarshaller new Object[] { arg1 })); } - // documentation inherited + @Override // from InvocationMarshaller public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { @@ -73,7 +75,7 @@ public class LocationMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #leavePlace} requests. */ public static final int LEAVE_PLACE = 1; - // documentation inherited from interface + // from interface LocationService public void leavePlace (Client arg1) { sendRequest(arg1, LEAVE_PLACE, new Object[] { @@ -84,7 +86,7 @@ public class LocationMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #moveTo} requests. */ public static final int MOVE_TO = 2; - // documentation inherited from interface + // from interface LocationService public void moveTo (Client arg1, int arg2, LocationService.MoveListener arg3) { LocationMarshaller.MoveMarshaller listener3 = new LocationMarshaller.MoveMarshaller(); @@ -93,5 +95,4 @@ public class LocationMarshaller extends InvocationMarshaller Integer.valueOf(arg2), listener3 }); } - } diff --git a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java index 7d9815215..2ca65f5ce 100644 --- a/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java +++ b/src/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java @@ -43,7 +43,7 @@ public class CrowdPeerMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #deliverTell} requests. */ public static final int DELIVER_TELL = 1; - // documentation inherited from interface + // from interface CrowdPeerService public void deliverTell (Client arg1, UserMessage arg2, Name arg3, ChatService.TellListener arg4) { ChatMarshaller.TellMarshaller listener4 = new ChatMarshaller.TellMarshaller(); @@ -52,5 +52,4 @@ public class CrowdPeerMarshaller extends InvocationMarshaller arg2, arg3, listener4 }); } - } diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java index 583a570dd..ff82e5c6a 100644 --- a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java +++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java @@ -47,13 +47,13 @@ public class CrowdPeerDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new CrowdPeerMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/java/com/threerings/crowd/server/BodyDispatcher.java index 3b5f49fd5..4944da00b 100644 --- a/src/java/com/threerings/crowd/server/BodyDispatcher.java +++ b/src/java/com/threerings/crowd/server/BodyDispatcher.java @@ -43,13 +43,13 @@ public class BodyDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new BodyMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java index cedf5e90f..3a5f22bde 100644 --- a/src/java/com/threerings/crowd/server/LocationDispatcher.java +++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java @@ -44,13 +44,13 @@ public class LocationDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new LocationMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java index 405b81299..64efa279f 100644 --- a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java +++ b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java @@ -36,7 +36,9 @@ import com.threerings.presents.dobj.InvocationResponseEvent; public class TimeBaseMarshaller extends InvocationMarshaller implements TimeBaseService { - // documentation inherited + /** + * Marshalls results to implementations of {@link GotTimeBaseListener}. + */ public static class GotTimeBaseMarshaller extends ListenerMarshaller implements GotTimeBaseListener { @@ -44,7 +46,7 @@ public class TimeBaseMarshaller extends InvocationMarshaller * responses. */ public static final int GOT_TIME_OID = 1; - // documentation inherited from interface + // from interface GotTimeBaseMarshaller public void gotTimeOid (int arg1) { _invId = null; @@ -53,7 +55,7 @@ public class TimeBaseMarshaller extends InvocationMarshaller new Object[] { Integer.valueOf(arg1) })); } - // documentation inherited + @Override // from InvocationMarshaller public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { @@ -72,7 +74,7 @@ public class TimeBaseMarshaller extends InvocationMarshaller /** The method id used to dispatch {@link #getTimeOid} requests. */ public static final int GET_TIME_OID = 1; - // documentation inherited from interface + // from interface TimeBaseService public void getTimeOid (Client arg1, String arg2, TimeBaseService.GotTimeBaseListener arg3) { TimeBaseMarshaller.GotTimeBaseMarshaller listener3 = new TimeBaseMarshaller.GotTimeBaseMarshaller(); @@ -81,5 +83,4 @@ public class TimeBaseMarshaller extends InvocationMarshaller arg2, listener3 }); } - } diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java index 5bf81daed..ea0bfca26 100644 --- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java +++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java @@ -42,13 +42,13 @@ public class TimeBaseDispatcher extends InvocationDispatcher this.provider = provider; } - // documentation inherited + // from InvocationDispatcher public InvocationMarshaller createMarshaller () { return new TimeBaseMarshaller(); } - // documentation inherited + @SuppressWarnings("unchecked") // from InvocationDispatcher public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException