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

Eclipse suggested cleanup.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2971 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:50:28 +00:00
parent 6cd4e73720
commit d618d3c771
169 changed files with 208 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/Log.java
+3 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: Log.java,v 1.2 2003/09/22 23:57:20 mdb Exp $
// $Id: Log.java,v 1.3 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled;
@@ -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/whirled/client/SceneDirector.java
+1 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneDirector.java,v 1.25 2003/10/03 20:41:31 mdb Exp $
// $Id: SceneDirector.java,v 1.26 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.client;
@@ -9,13 +9,9 @@ import com.samskivert.util.ResultListener;
import com.threerings.presents.client.BasicDirector;
import com.threerings.presents.client.Client;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.ObjectAccessException;
import com.threerings.crowd.client.LocationDirector;
import com.threerings.crowd.client.LocationObserver;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.whirled.Log;
import com.threerings.whirled.client.persist.SceneRepository;
src/java/com/threerings/whirled/data/SceneCodes.java
+1 -2
View File
@@ -1,10 +1,9 @@
//
// $Id: SceneCodes.java,v 1.4 2003/06/11 04:14:11 mdb Exp $
// $Id: SceneCodes.java,v 1.5 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.data;
import com.threerings.crowd.data.LocationCodes;
import com.threerings.whirled.client.SceneDirector;
/**
* Contains codes used by the scene invocation services.
src/java/com/threerings/whirled/server/SceneManager.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneManager.java,v 1.14 2003/06/11 04:14:11 mdb Exp $
// $Id: SceneManager.java,v 1.15 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.server;
@@ -11,7 +11,6 @@ import com.threerings.presents.util.Invoker;
import com.threerings.whirled.Log;
import com.threerings.whirled.data.Scene;
import com.threerings.whirled.data.SceneCodes;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.server.WhirledServer;
import com.threerings.whirled.util.UpdateList;
src/java/com/threerings/whirled/server/SceneProvider.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneProvider.java,v 1.18 2003/10/25 00:10:35 mdb Exp $
// $Id: SceneProvider.java,v 1.19 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.server;
@@ -9,7 +9,6 @@ import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.LocationProvider;
import com.threerings.whirled.Log;
src/java/com/threerings/whirled/server/SceneRegistry.java
+1 -4
View File
@@ -1,10 +1,9 @@
//
// $Id: SceneRegistry.java,v 1.21 2003/11/24 21:06:36 mdb Exp $
// $Id: SceneRegistry.java,v 1.22 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.server;
import java.util.ArrayList;
import java.util.Properties;
import com.samskivert.util.HashIntMap;
import com.threerings.presents.util.Invoker;
@@ -13,12 +12,10 @@ import com.threerings.presents.server.InvocationManager;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.server.PlaceManager;
import com.threerings.whirled.Log;
import com.threerings.whirled.data.Scene;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneObject;
import com.threerings.whirled.server.persist.SceneRepository;
import com.threerings.whirled.util.SceneFactory;
import com.threerings.whirled.util.UpdateList;
src/java/com/threerings/whirled/server/WhirledServer.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: WhirledServer.java,v 1.16 2003/02/12 07:23:31 mdb Exp $
// $Id: WhirledServer.java,v 1.17 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.server;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.whirled.Log;
import com.threerings.whirled.server.persist.DummySceneRepository;
import com.threerings.whirled.server.persist.SceneRepository;
import com.threerings.whirled.util.SceneFactory;
src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
+1 -2
View File
@@ -1,9 +1,8 @@
//
// $Id: SpotSceneDirector.java,v 1.32 2003/09/16 21:26:14 ray Exp $
// $Id: SpotSceneDirector.java,v 1.33 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.client;
import java.util.Iterator;
import com.samskivert.util.ResultListener;
import com.samskivert.util.StringUtil;
src/java/com/threerings/whirled/spot/data/Cluster.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: Cluster.java,v 1.6 2003/03/27 15:57:47 mdb Exp $
// $Id: Cluster.java,v 1.7 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.data;
@@ -7,7 +7,6 @@ import java.awt.Rectangle;
import com.samskivert.util.StringUtil;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.io.Streamable;
import com.threerings.presents.dobj.DSet;
src/java/com/threerings/whirled/spot/data/ClusteredBodyObject.java
+1 -2
View File
@@ -1,9 +1,8 @@
//
// $Id: ClusteredBodyObject.java,v 1.2 2003/05/06 00:21:59 mdb Exp $
// $Id: ClusteredBodyObject.java,v 1.3 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.data;
import com.threerings.crowd.data.BodyObject;
import com.threerings.whirled.data.ScenedBodyObject;
/**
src/java/com/threerings/whirled/spot/data/Location.java
+1 -2
View File
@@ -1,10 +1,9 @@
//
// $Id: Location.java,v 1.7 2003/03/25 19:28:58 mdb Exp $
// $Id: Location.java,v 1.8 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.data;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil;
/**
src/java/com/threerings/whirled/spot/data/SpotCodes.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: SpotCodes.java,v 1.7 2003/06/03 21:41:33 ray Exp $
// $Id: SpotCodes.java,v 1.8 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.data;
import com.threerings.crowd.chat.data.ChatCodes;
import com.threerings.whirled.data.SceneCodes;
import com.threerings.whirled.spot.client.SpotSceneDirector;
/**
* Contains codes used by the Spot invocation services.
src/java/com/threerings/whirled/spot/data/SpotSceneImpl.java
+1 -2
View File
@@ -1,12 +1,11 @@
//
// $Id: SpotSceneImpl.java,v 1.2 2003/06/11 04:14:11 mdb Exp $
// $Id: SpotSceneImpl.java,v 1.3 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.data;
import java.util.Iterator;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.ListUtil;
import com.threerings.whirled.spot.Log;
src/java/com/threerings/whirled/spot/data/SpotSceneModel.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SpotSceneModel.java,v 1.9 2003/02/12 07:23:31 mdb Exp $
// $Id: SpotSceneModel.java,v 1.10 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.data;
@@ -7,7 +7,6 @@ import com.samskivert.util.ArrayUtil;
import com.samskivert.util.ListUtil;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.DirectionUtil;
import com.threerings.whirled.data.AuxModel;
import com.threerings.whirled.data.SceneModel;
src/java/com/threerings/whirled/spot/server/SpotProvider.java
+1 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: SpotProvider.java,v 1.22 2003/11/24 18:17:41 mdb Exp $
// $Id: SpotProvider.java,v 1.23 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.server;
@@ -8,17 +8,13 @@ import com.samskivert.util.StringUtil;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.RootDObjectManager;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.chat.server.CommunicationAuthorizer;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.PlaceRegistry;
import com.threerings.whirled.client.SceneService.SceneMoveListener;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.ScenedBodyObject;
import com.threerings.whirled.server.SceneManager;
import com.threerings.whirled.server.SceneRegistry;
src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+1 -5
View File
@@ -1,15 +1,12 @@
//
// $Id: SpotSceneManager.java,v 1.49 2003/12/11 22:50:55 mdb Exp $
// $Id: SpotSceneManager.java,v 1.50 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.server;
import java.awt.Point;
import java.util.Iterator;
import com.samskivert.util.ArrayIntSet;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.IntIntMap;
import com.samskivert.util.StringUtil;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.Subscriber;
@@ -31,7 +28,6 @@ import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SceneLocation;
import com.threerings.whirled.spot.data.SpotCodes;
import com.threerings.whirled.spot.data.SpotScene;
import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.whirled.spot.data.SpotSceneObject;
/**
src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SpotSceneWriter.java,v 1.7 2003/02/12 07:23:31 mdb Exp $
// $Id: SpotSceneWriter.java,v 1.8 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.spot.tools.xml;
@@ -9,7 +9,6 @@ import org.xml.sax.helpers.AttributesImpl;
import com.megginson.sax.DataWriter;
import com.threerings.tools.xml.NestableWriter;
import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SpotSceneModel;
import com.threerings.whirled.spot.tools.EditablePortal;
src/java/com/threerings/whirled/tools/xml/SceneRuleSet.java
+1 -2
View File
@@ -1,11 +1,10 @@
//
// $Id: SceneRuleSet.java,v 1.3 2003/02/12 07:23:31 mdb Exp $
// $Id: SceneRuleSet.java,v 1.4 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.tools.xml;
import org.apache.commons.digester.Digester;
import com.samskivert.util.StringUtil;
import com.samskivert.xml.SetPropertyFieldsRule;
import com.threerings.tools.xml.NestableRuleSet;
src/java/com/threerings/whirled/tools/xml/SceneWriter.java
+1 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneWriter.java,v 1.4 2003/02/12 07:23:32 mdb Exp $
// $Id: SceneWriter.java,v 1.5 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.tools.xml;
@@ -7,13 +7,11 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import com.megginson.sax.DataWriter;
import com.samskivert.util.StringUtil;
import com.threerings.tools.xml.NestableWriter;
import com.threerings.whirled.Log;
src/java/com/threerings/whirled/zone/data/SceneSummary.java
+2 -4
View File
@@ -1,14 +1,12 @@
//
// $Id: SceneSummary.java,v 1.6 2003/07/22 07:29:11 mdb Exp $
// $Id: SceneSummary.java,v 1.7 2004/02/25 14:50:28 mdb Exp $
package com.threerings.whirled.zone.data;
import com.samskivert.util.StringUtil;
import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil;
import com.threerings.io.Streamable;
import com.threerings.util.DirectionUtil;
/**
* The scene summary class is used to provide info about the connected