Unixed import nixage, service regen, some dependency injection.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5205 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-06-29 12:42:06 +00:00
parent 733ec9e5ab
commit 34439e3461
19 changed files with 24 additions and 46 deletions
@@ -32,7 +32,6 @@ import com.threerings.util.Name;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client;
/**
* Manages the mutelist.
@@ -24,8 +24,6 @@ package com.threerings.crowd.chat.data;
import com.threerings.presents.data.InvocationCodes;
import com.threerings.presents.data.Permission;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.chat.client.ChatDirector;
import com.threerings.crowd.chat.client.SpeakService;
@@ -26,7 +26,6 @@ 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.presents.net.Transport;
import com.threerings.util.Name;
/**
@@ -24,7 +24,6 @@ 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.presents.net.Transport;
/**
* Provides the implementation of the {@link SpeakService} interface
@@ -25,7 +25,6 @@ import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.data.ChatMarshaller;
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.util.Name;
@@ -33,7 +32,7 @@ import com.threerings.util.Name;
/**
* Dispatches requests to the {@link ChatProvider}.
*/
public class ChatDispatcher extends InvocationDispatcher
public class ChatDispatcher extends InvocationDispatcher<ChatMarshaller>
{
/**
* Creates a dispatcher that may be registered to dispatch invocation
@@ -45,7 +44,7 @@ public class ChatDispatcher extends InvocationDispatcher
}
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
public ChatMarshaller createMarshaller ()
{
return new ChatMarshaller();
}
@@ -23,14 +23,13 @@ package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.data.SpeakMarshaller;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
/**
* Dispatches requests to the {@link SpeakProvider}.
*/
public class SpeakDispatcher extends InvocationDispatcher
public class SpeakDispatcher extends InvocationDispatcher<SpeakMarshaller>
{
/**
* Creates a dispatcher that may be registered to dispatch invocation
@@ -42,7 +41,7 @@ public class SpeakDispatcher extends InvocationDispatcher
}
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
public SpeakMarshaller createMarshaller ()
{
return new SpeakMarshaller();
}
@@ -30,14 +30,11 @@ import com.google.common.collect.Maps;
import com.samskivert.util.ObserverList;
import com.threerings.util.Name;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.RootDObjectManager;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.chat.client.SpeakService;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.crowd.chat.data.ChatMessage;
import com.threerings.crowd.chat.data.SpeakObject;