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

Various Eclipse suggested bits.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2969 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:41:47 +00:00
parent 61d46f2768
commit ef748636e2
20 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/Log.java
+3 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: Log.java,v 1.3 2003/09/22 23:59:39 mdb Exp $
// $Id: Log.java,v 1.4 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd;
@@ -15,7 +15,8 @@ public class Log
/** Convenience function. */
public static boolean debug ()
{
return log.getLevel() == com.samskivert.util.Log.DEBUG;
return (com.samskivert.util.Log.getLevel() ==
com.samskivert.util.Log.DEBUG);
}
/** Convenience function. */
src/java/com/threerings/crowd/chat/client/ChatDirector.java
+5 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: ChatDirector.java,v 1.56 2003/12/03 23:38:45 mdb Exp $
// $Id: ChatDirector.java,v 1.57 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.chat.client;
@@ -609,8 +609,10 @@ public class ChatDirector extends BasicDirector
super.clientDidLogoff(client);
// stop listening to it for tells
removeAuxiliarySource(_clobj);
_clobj = null;
if (_clobj != null) {
removeAuxiliarySource(_clobj);
_clobj = null;
}
clearDisplays();
src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
+1 -3
View File
@@ -1,12 +1,10 @@
//
// $Id: ChatMarshaller.java,v 1.6 2003/09/18 17:53:48 mdb Exp $
// $Id: ChatMarshaller.java,v 1.7 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.chat.data;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.client.ChatService.TellListener;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: SpeakMarshaller.java,v 1.3 2003/06/03 21:41:33 ray Exp $
// $Id: SpeakMarshaller.java,v 1.4 2004/02/25 14:41:47 mdb Exp $
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.dobj.InvocationResponseEvent;
/**
* Provides the implementation of the {@link SpeakService} interface
src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
+1 -3
View File
@@ -1,12 +1,10 @@
//
// $Id: ChatDispatcher.java,v 1.6 2003/09/18 17:53:48 mdb Exp $
// $Id: ChatDispatcher.java,v 1.7 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.client.ChatService.TellListener;
import com.threerings.crowd.chat.data.ChatMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
src/java/com/threerings/crowd/chat/server/ChatProvider.java
+3 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: ChatProvider.java,v 1.25 2003/09/18 17:53:48 mdb Exp $
// $Id: ChatProvider.java,v 1.26 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.chat.server;
@@ -12,16 +12,15 @@ import com.threerings.util.TimeUtil;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.DObjectManager;
import com.threerings.presents.dobj.MessageEvent;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.Log;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.AccessControl;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.chat.client.ChatService.TellListener;
@@ -139,7 +138,7 @@ public class ChatProvider
// make sure the requesting user has broadcast privileges
if (!CrowdServer.actrl.checkAccess(body, BROADCAST_TOKEN)) {
throw new InvocationException(CrowdServer.actrl.LACK_ACCESS);
throw new InvocationException(AccessControl.LACK_ACCESS);
}
Iterator iter = CrowdServer.plreg.enumeratePlaces();
src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
+1 -3
View File
@@ -1,11 +1,9 @@
//
// $Id: SpeakDispatcher.java,v 1.3 2003/06/03 21:41:33 ray Exp $
// $Id: SpeakDispatcher.java,v 1.4 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.client.SpeakService;
import com.threerings.crowd.chat.data.SpeakMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
src/java/com/threerings/crowd/chat/server/SpeakProvider.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SpeakProvider.java,v 1.18 2003/12/09 21:01:43 mdb Exp $
// $Id: SpeakProvider.java,v 1.19 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.chat.server;
@@ -10,7 +10,6 @@ import com.samskivert.util.ObserverList;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.MessageEvent;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.Log;
src/java/com/threerings/crowd/client/LocationDirector.java
+1 -5
View File
@@ -1,11 +1,8 @@
//
// $Id: LocationDirector.java,v 1.31 2003/10/03 20:41:31 mdb Exp $
// $Id: LocationDirector.java,v 1.32 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.client;
import java.util.ArrayList;
import java.util.List;
import com.samskivert.util.ObserverList;
import com.samskivert.util.ObserverList.ObserverOp;
import com.samskivert.util.ResultListener;
@@ -14,7 +11,6 @@ import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.DObjectManager;
import com.threerings.presents.dobj.ObjectAccessException;
import com.threerings.presents.dobj.Subscriber;
src/java/com/threerings/crowd/client/LocationService.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: LocationService.java,v 1.7 2002/08/14 19:07:49 mdb Exp $
// $Id: LocationService.java,v 1.8 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.crowd.Log;
import com.threerings.crowd.data.PlaceConfig;
/**
src/java/com/threerings/crowd/data/BodyMarshaller.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: BodyMarshaller.java,v 1.2 2003/06/03 21:41:33 ray Exp $
// $Id: BodyMarshaller.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.data;
import com.threerings.crowd.client.BodyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
/**
* Provides the implementation of the {@link BodyService} interface
src/java/com/threerings/crowd/data/LocationMarshaller.java
+2 -3
View File
@@ -1,10 +1,9 @@
//
// $Id: LocationMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
// $Id: LocationMarshaller.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.data;
import com.threerings.crowd.client.LocationService;
import com.threerings.crowd.client.LocationService.MoveListener;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
@@ -18,7 +17,7 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
* to the requesting client.
*
* <p> Generated from <code>
* $Id: LocationMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
* $Id: LocationMarshaller.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
* </code>
*/
public class LocationMarshaller extends InvocationMarshaller
src/java/com/threerings/crowd/data/PlaceConfig.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: PlaceConfig.java,v 1.5 2003/02/11 06:00:51 mdb Exp $
// $Id: PlaceConfig.java,v 1.6 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.data;
import com.samskivert.util.StringUtil;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.crowd.client.PlaceController;
/**
* The place config class encapsulates the configuration information for a
src/java/com/threerings/crowd/server/BodyDispatcher.java
+1 -3
View File
@@ -1,11 +1,9 @@
//
// $Id: BodyDispatcher.java,v 1.2 2003/06/03 21:41:33 ray Exp $
// $Id: BodyDispatcher.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
import com.threerings.crowd.client.BodyService;
import com.threerings.crowd.data.BodyMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
src/java/com/threerings/crowd/server/BodyProvider.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: BodyProvider.java,v 1.6 2003/09/11 03:20:06 mdb Exp $
// $Id: BodyProvider.java,v 1.7 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
@@ -11,7 +11,6 @@ import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.Log;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
/**
* Provides the server-side side of the body-related invocation services.
src/java/com/threerings/crowd/server/CrowdClient.java
+1 -3
View File
@@ -1,16 +1,14 @@
//
// $Id: CrowdClient.java,v 1.23 2003/06/14 00:47:16 mdb Exp $
// $Id: CrowdClient.java,v 1.24 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.PresentsClient;
import com.threerings.crowd.Log;
import com.threerings.crowd.chat.server.SpeakProvider;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.CrowdServer;
/**
src/java/com/threerings/crowd/server/LocationDispatcher.java
+2 -5
View File
@@ -1,13 +1,10 @@
//
// $Id: LocationDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
// $Id: LocationDispatcher.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
import com.threerings.crowd.client.LocationService;
import com.threerings.crowd.client.LocationService.MoveListener;
import com.threerings.crowd.data.LocationMarshaller;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
@@ -17,7 +14,7 @@ import com.threerings.presents.server.InvocationException;
* Dispatches requests to the {@link LocationProvider}.
*
* <p> Generated from <code>
* $Id: LocationDispatcher.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
* $Id: LocationDispatcher.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
* </code>
*/
public class LocationDispatcher extends InvocationDispatcher
src/java/com/threerings/crowd/server/LocationProvider.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: LocationProvider.java,v 1.21 2003/08/09 04:58:25 mdb Exp $
// $Id: LocationProvider.java,v 1.22 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
@@ -16,7 +16,6 @@ import com.threerings.crowd.client.LocationService;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.LocationCodes;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
src/java/com/threerings/crowd/server/LocationSender.java
+2 -3
View File
@@ -1,10 +1,9 @@
//
// $Id: LocationSender.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
// $Id: LocationSender.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
import com.threerings.crowd.client.LocationDecoder;
import com.threerings.crowd.client.LocationReceiver;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationSender;
@@ -13,7 +12,7 @@ import com.threerings.presents.server.InvocationSender;
* client.
*
* <p> Generated from <code>
* $Id: LocationSender.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
* $Id: LocationSender.java,v 1.3 2004/02/25 14:41:47 mdb Exp $
* </code>
*/
public class LocationSender extends InvocationSender
src/java/com/threerings/crowd/server/PlaceManager.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: PlaceManager.java,v 1.49 2004/01/11 17:43:12 ray Exp $
// $Id: PlaceManager.java,v 1.50 2004/02/25 14:41:47 mdb Exp $
package com.threerings.crowd.server;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.IntervalManager;