AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import cleanups

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5399 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Dave Hoover
2008-09-26 17:29:59 +00:00
parent c04adc6a6e
commit 8856120403
131 changed files with 261 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/chat/client/ChatDirector.java
+10 -11
View File
@@ -37,6 +37,11 @@ import com.samskivert.util.ObserverList;
import com.samskivert.util.ResultListener;
import com.samskivert.util.StringUtil;
import com.threerings.util.MessageBundle;
import com.threerings.util.MessageManager;
import com.threerings.util.Name;
import com.threerings.util.TimeUtil;
import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
@@ -44,23 +49,17 @@ import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.MessageEvent;
import com.threerings.presents.dobj.MessageListener;
import com.threerings.util.MessageBundle;
import com.threerings.util.MessageManager;
import com.threerings.util.Name;
import com.threerings.util.TimeUtil;
import com.threerings.crowd.client.LocationObserver;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.CrowdCodes;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.data.ChatMessage;
import com.threerings.crowd.chat.data.SystemMessage;
import com.threerings.crowd.chat.data.TellFeedbackMessage;
import com.threerings.crowd.chat.data.UserMessage;
import com.threerings.crowd.chat.data.UserSystemMessage;
import com.threerings.crowd.client.LocationObserver;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.CrowdCodes;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.util.CrowdContext;
import static com.threerings.crowd.Log.log;
src/java/com/threerings/crowd/chat/client/MuteDirector.java
+2 -2
View File
@@ -29,10 +29,10 @@ import com.samskivert.util.ObserverList;
import com.threerings.util.MessageBundle;
import com.threerings.util.Name;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.presents.client.BasicDirector;
import com.threerings.crowd.util.CrowdContext;
/**
* Manages the mutelist.
*
src/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java
+2 -1
View File
@@ -21,10 +21,11 @@
package com.threerings.crowd.chat.data;
import com.threerings.crowd.chat.client.ChannelSpeakService;
import com.threerings.presents.client.Client;
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
src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
+4 -2
View File
@@ -21,12 +21,14 @@
package com.threerings.crowd.chat.data;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.util.Name;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.util.Name;
import com.threerings.crowd.chat.client.ChatService;
/**
* Provides the implementation of the {@link ChatService} interface
src/java/com/threerings/crowd/chat/data/ChatMessage.java
+1
View File
@@ -24,6 +24,7 @@ package com.threerings.crowd.chat.data;
import com.samskivert.util.StringUtil;
import com.threerings.io.Streamable;
import com.threerings.util.ActionScript;
/**
src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
+2 -1
View File
@@ -21,10 +21,11 @@
package com.threerings.crowd.chat.data;
import com.threerings.crowd.chat.client.SpeakService;
import com.threerings.presents.client.Client;
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
src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java
+3 -2
View File
@@ -21,12 +21,13 @@
package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.data.ChannelSpeakMarshaller;
import com.threerings.crowd.chat.data.ChatChannel;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.crowd.chat.data.ChannelSpeakMarshaller;
import com.threerings.crowd.chat.data.ChatChannel;
/**
* Dispatches requests to the {@link ChannelSpeakProvider}.
*/
src/java/com/threerings/crowd/chat/server/ChannelSpeakProvider.java
+3 -2
View File
@@ -21,11 +21,12 @@
package com.threerings.crowd.chat.server;
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}.
*/
src/java/com/threerings/crowd/chat/server/ChatChannelManager.java
+1
View File
@@ -132,6 +132,7 @@ public abstract class ChatChannelManager
// create and start our idle channel closer (always be closing)
_closer = new Interval(omgr) {
@Override
public void expired () {
closeIdleChannels();
}
src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
+5 -3
View File
@@ -21,13 +21,15 @@
package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.data.ChatMarshaller;
import com.threerings.util.Name;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.util.Name;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.data.ChatMarshaller;
/**
* Dispatches requests to the {@link ChatProvider}.
src/java/com/threerings/crowd/chat/server/ChatProvider.java
+5 -6
View File
@@ -27,6 +27,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.samskivert.util.StringUtil;
import com.threerings.util.MessageBundle;
import com.threerings.util.Name;
import com.threerings.util.TimeUtil;
@@ -34,11 +35,14 @@ import com.threerings.util.TimeUtil;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.client.ChatService.TellListener;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.data.UserMessage;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.CrowdCodes;
import com.threerings.crowd.data.OccupantInfo;
@@ -46,11 +50,6 @@ import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.BodyLocator;
import com.threerings.crowd.server.PlaceRegistry;
import com.threerings.crowd.chat.client.ChatService.TellListener;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.data.UserMessage;
/**
* The chat provider handles the server side of the chat-related invocation services.
*/
src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
+2 -1
View File
@@ -21,11 +21,12 @@
package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.data.SpeakMarshaller;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.crowd.chat.data.SpeakMarshaller;
/**
* Dispatches requests to the {@link SpeakProvider}.
*/
src/java/com/threerings/crowd/chat/server/SpeakProvider.java
+2 -1
View File
@@ -21,10 +21,11 @@
package com.threerings.crowd.chat.server;
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}.
*/
src/java/com/threerings/crowd/chat/server/SpeakUtil.java
+2 -2
View File
@@ -28,18 +28,18 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.samskivert.util.ObserverList;
import com.threerings.util.Name;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.RootDObjectManager;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.data.ChatMessage;
import com.threerings.crowd.chat.data.SpeakObject;
import com.threerings.crowd.chat.data.SystemMessage;
import com.threerings.crowd.chat.data.UserMessage;
import com.threerings.crowd.data.BodyObject;
import static com.threerings.crowd.Log.log;