diff --git a/src/main/as/com/threerings/bureau/data/BureauMarshaller.as b/src/main/as/com/threerings/bureau/data/BureauMarshaller.as index cf15fd5df..4cfcc059f 100644 --- a/src/main/as/com/threerings/bureau/data/BureauMarshaller.as +++ b/src/main/as/com/threerings/bureau/data/BureauMarshaller.as @@ -21,12 +21,12 @@ package com.threerings.bureau.data { -import com.threerings.bureau.client.BureauService; - import com.threerings.util.Integer; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.bureau.client.BureauService; + /** * Provides the implementation of the BureauService interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as b/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as index 1253c24f4..211fb8b4d 100644 --- a/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as +++ b/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as @@ -21,10 +21,10 @@ package com.threerings.crowd.chat.client { -import com.threerings.crowd.chat.data.ChatChannel; - import com.threerings.presents.client.InvocationService; +import com.threerings.crowd.chat.data.ChatChannel; + /** * An ActionScript version of the Java ChannelSpeakService interface. */ diff --git a/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as index e57a7b8a1..b0520d82c 100644 --- a/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as +++ b/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as @@ -21,12 +21,12 @@ package com.threerings.crowd.chat.data { -import com.threerings.crowd.chat.client.ChannelSpeakService; - import com.threerings.util.Byte; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.ChannelSpeakService; + /** * Provides the implementation of the ChannelSpeakService interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as index a11199da4..914b6a3f4 100644 --- a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as +++ b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as @@ -21,15 +21,15 @@ package com.threerings.crowd.chat.data { -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.client.ChatService_TellListener; - import com.threerings.util.Name; import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.client.ChatService_TellListener; + /** * Provides the implementation of the ChatService interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as index 956546f3f..06a493032 100644 --- a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as +++ b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller_TellMarshaller.as @@ -21,12 +21,12 @@ package com.threerings.crowd.chat.data { -import com.threerings.crowd.chat.client.ChatService_TellListener; - import com.threerings.util.Long; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.crowd.chat.client.ChatService_TellListener; + /** * Marshalls instances of the ChatService_TellMarshaller interface. */ diff --git a/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as index dec4a15c1..5fc1c35c4 100644 --- a/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as +++ b/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as @@ -21,12 +21,12 @@ package com.threerings.crowd.chat.data { -import com.threerings.crowd.chat.client.SpeakService; - import com.threerings.util.Byte; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.SpeakService; + /** * Provides the implementation of the SpeakService interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as b/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as index 8498cca8d..dee311b4e 100644 --- a/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as +++ b/src/main/as/com/threerings/crowd/client/LocationService_MoveListener.as @@ -21,10 +21,10 @@ package com.threerings.crowd.client { -import com.threerings.crowd.data.PlaceConfig; - import com.threerings.presents.client.InvocationService_InvocationListener; +import com.threerings.crowd.data.PlaceConfig; + /** * An ActionScript version of the Java LocationService_MoveListener interface. */ diff --git a/src/main/as/com/threerings/crowd/data/BodyMarshaller.as b/src/main/as/com/threerings/crowd/data/BodyMarshaller.as index eea71078b..17c3970a2 100644 --- a/src/main/as/com/threerings/crowd/data/BodyMarshaller.as +++ b/src/main/as/com/threerings/crowd/data/BodyMarshaller.as @@ -21,12 +21,12 @@ package com.threerings.crowd.data { -import com.threerings.crowd.client.BodyService; - import com.threerings.util.langBoolean; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.client.BodyService; + /** * Provides the implementation of the BodyService interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/as/com/threerings/crowd/data/LocationMarshaller.as b/src/main/as/com/threerings/crowd/data/LocationMarshaller.as index de8fbf971..339cea5fb 100644 --- a/src/main/as/com/threerings/crowd/data/LocationMarshaller.as +++ b/src/main/as/com/threerings/crowd/data/LocationMarshaller.as @@ -21,13 +21,13 @@ package com.threerings.crowd.data { -import com.threerings.crowd.client.LocationService; -import com.threerings.crowd.client.LocationService_MoveListener; - import com.threerings.util.Integer; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.client.LocationService; +import com.threerings.crowd.client.LocationService_MoveListener; + /** * Provides the implementation of the LocationService interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as b/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as index de4e06ac3..860d118ce 100644 --- a/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as +++ b/src/main/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as @@ -21,10 +21,10 @@ package com.threerings.crowd.data { -import com.threerings.crowd.client.LocationService_MoveListener; - import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.crowd.client.LocationService_MoveListener; + /** * Marshalls instances of the LocationService_MoveMarshaller interface. */ diff --git a/src/main/java/com/threerings/admin/data/AdminMarshaller.java b/src/main/java/com/threerings/admin/data/AdminMarshaller.java index fa93570cb..b5a2af671 100644 --- a/src/main/java/com/threerings/admin/data/AdminMarshaller.java +++ b/src/main/java/com/threerings/admin/data/AdminMarshaller.java @@ -23,11 +23,11 @@ package com.threerings.admin.data; import javax.annotation.Generated; -import com.threerings.admin.client.AdminService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.admin.client.AdminService; + /** * Provides the implementation of the {@link AdminService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/admin/server/AdminProvider.java b/src/main/java/com/threerings/admin/server/AdminProvider.java index 345c3390c..66535de8b 100644 --- a/src/main/java/com/threerings/admin/server/AdminProvider.java +++ b/src/main/java/com/threerings/admin/server/AdminProvider.java @@ -23,12 +23,12 @@ package com.threerings.admin.server; import javax.annotation.Generated; -import com.threerings.admin.client.AdminService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; +import com.threerings.admin.client.AdminService; + /** * Defines the server-side of the {@link AdminService}. */ diff --git a/src/main/java/com/threerings/bureau/data/BureauMarshaller.java b/src/main/java/com/threerings/bureau/data/BureauMarshaller.java index ab789919e..e29dcfe88 100644 --- a/src/main/java/com/threerings/bureau/data/BureauMarshaller.java +++ b/src/main/java/com/threerings/bureau/data/BureauMarshaller.java @@ -23,11 +23,11 @@ package com.threerings.bureau.data; import javax.annotation.Generated; -import com.threerings.bureau.client.BureauService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.bureau.client.BureauService; + /** * Provides the implementation of the {@link BureauService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/bureau/server/BureauProvider.java b/src/main/java/com/threerings/bureau/server/BureauProvider.java index 20702b0e2..058f5aff8 100644 --- a/src/main/java/com/threerings/bureau/server/BureauProvider.java +++ b/src/main/java/com/threerings/bureau/server/BureauProvider.java @@ -23,11 +23,11 @@ package com.threerings.bureau.server; import javax.annotation.Generated; -import com.threerings.bureau.client.BureauService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.bureau.client.BureauService; + /** * Defines the server-side of the {@link BureauService}. */ diff --git a/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java index 4c01fc361..e499f4771 100644 --- a/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java +++ b/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java @@ -23,11 +23,11 @@ package com.threerings.crowd.chat.data; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.ChannelSpeakService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.ChannelSpeakService; + /** * Provides the implementation of the {@link ChannelSpeakService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java index a6a4ce58c..569ff15c0 100644 --- a/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java +++ b/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java @@ -23,14 +23,14 @@ package com.threerings.crowd.chat.data; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.ChatService; - import com.threerings.util.Name; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.ChatService; + /** * Provides the implementation of the {@link ChatService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java index afdbdf832..f6487b2fc 100644 --- a/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java +++ b/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java @@ -23,11 +23,11 @@ package com.threerings.crowd.chat.data; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.SpeakService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.SpeakService; + /** * Provides the implementation of the {@link SpeakService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java b/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java index fc0b971c5..a74b95cf7 100644 --- a/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java +++ b/src/main/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java @@ -23,12 +23,12 @@ package com.threerings.crowd.chat.server; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.ChannelSpeakService; -import com.threerings.crowd.chat.data.ChatChannel; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.chat.client.ChannelSpeakService; +import com.threerings.crowd.chat.data.ChatChannel; + /** * Defines the server-side of the {@link ChannelSpeakService}. */ diff --git a/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java index 564872e86..e195dc099 100644 --- a/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java +++ b/src/main/java/com/threerings/crowd/chat/server/SpeakProvider.java @@ -23,11 +23,11 @@ package com.threerings.crowd.chat.server; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.SpeakService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.chat.client.SpeakService; + /** * Defines the server-side of the {@link SpeakService}. */ diff --git a/src/main/java/com/threerings/crowd/data/BodyMarshaller.java b/src/main/java/com/threerings/crowd/data/BodyMarshaller.java index 7f5a10208..56f0140dc 100644 --- a/src/main/java/com/threerings/crowd/data/BodyMarshaller.java +++ b/src/main/java/com/threerings/crowd/data/BodyMarshaller.java @@ -23,11 +23,11 @@ package com.threerings.crowd.data; import javax.annotation.Generated; -import com.threerings.crowd.client.BodyService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.client.BodyService; + /** * Provides the implementation of the {@link BodyService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/crowd/data/LocationMarshaller.java b/src/main/java/com/threerings/crowd/data/LocationMarshaller.java index a66f3b33b..99234e6e9 100644 --- a/src/main/java/com/threerings/crowd/data/LocationMarshaller.java +++ b/src/main/java/com/threerings/crowd/data/LocationMarshaller.java @@ -23,11 +23,11 @@ package com.threerings.crowd.data; import javax.annotation.Generated; -import com.threerings.crowd.client.LocationService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.client.LocationService; + /** * Provides the implementation of the {@link LocationService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java index 049ff012f..a23b767ae 100644 --- a/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java +++ b/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java @@ -23,16 +23,16 @@ package com.threerings.crowd.peer.data; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.data.ChatMarshaller; -import com.threerings.crowd.chat.data.UserMessage; -import com.threerings.crowd.peer.client.CrowdPeerService; - import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; +import com.threerings.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.data.ChatMarshaller; +import com.threerings.crowd.chat.data.UserMessage; +import com.threerings.crowd.peer.client.CrowdPeerService; + /** * Provides the implementation of the {@link CrowdPeerService} interface * that marshalls the arguments and delivers the request to the provider diff --git a/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java index 89938acfb..ddb22de45 100644 --- a/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java +++ b/src/main/java/com/threerings/crowd/peer/server/CrowdPeerProvider.java @@ -23,16 +23,16 @@ package com.threerings.crowd.peer.server; import javax.annotation.Generated; -import com.threerings.crowd.chat.client.ChatService; -import com.threerings.crowd.chat.data.UserMessage; -import com.threerings.crowd.peer.client.CrowdPeerService; - import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.chat.client.ChatService; +import com.threerings.crowd.chat.data.UserMessage; +import com.threerings.crowd.peer.client.CrowdPeerService; + /** * Defines the server-side of the {@link CrowdPeerService}. */ diff --git a/src/main/java/com/threerings/crowd/server/BodyProvider.java b/src/main/java/com/threerings/crowd/server/BodyProvider.java index dc1ee35eb..7ed5cf221 100644 --- a/src/main/java/com/threerings/crowd/server/BodyProvider.java +++ b/src/main/java/com/threerings/crowd/server/BodyProvider.java @@ -23,11 +23,11 @@ package com.threerings.crowd.server; import javax.annotation.Generated; -import com.threerings.crowd.client.BodyService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.client.BodyService; + /** * Defines the server-side of the {@link BodyService}. */ diff --git a/src/main/java/com/threerings/crowd/server/LocationProvider.java b/src/main/java/com/threerings/crowd/server/LocationProvider.java index 78d131b6f..0b53012dd 100644 --- a/src/main/java/com/threerings/crowd/server/LocationProvider.java +++ b/src/main/java/com/threerings/crowd/server/LocationProvider.java @@ -23,12 +23,12 @@ package com.threerings.crowd.server; import javax.annotation.Generated; -import com.threerings.crowd.client.LocationService; - import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; +import com.threerings.crowd.client.LocationService; + /** * Defines the server-side of the {@link LocationService}. */ diff --git a/src/test/java/com/threerings/presents/data/TestMarshaller.java b/src/test/java/com/threerings/presents/data/TestMarshaller.java index b0146364a..d1c5d0694 100644 --- a/src/test/java/com/threerings/presents/data/TestMarshaller.java +++ b/src/test/java/com/threerings/presents/data/TestMarshaller.java @@ -22,6 +22,7 @@ package com.threerings.presents.data; import java.util.List; + import javax.annotation.Generated; import com.threerings.presents.client.InvocationService; diff --git a/src/test/java/com/threerings/presents/server/TestProvider.java b/src/test/java/com/threerings/presents/server/TestProvider.java index 7761e5c73..4828e0eed 100644 --- a/src/test/java/com/threerings/presents/server/TestProvider.java +++ b/src/test/java/com/threerings/presents/server/TestProvider.java @@ -22,6 +22,7 @@ package com.threerings.presents.server; import java.util.List; + import javax.annotation.Generated; import com.threerings.presents.client.InvocationService;