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

The first great Three Rings renaming. Cocktail changed to Narya, Cher

Browse Source 
changed to Presents and Party changed to Crowd. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@431 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-10-11 04:07:54 +00:00
parent ac477756ea
commit 8a4c46badc
170 changed files with 832 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/client/SceneCodes.java
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: SceneCodes.java,v 1.1 2001/10/01 22:16:02 mdb Exp $
// $Id: SceneCodes.java,v 1.2 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.client;
import com.threerings.cocktail.party.client.LocationCodes;
import com.threerings.crowd.client.LocationCodes;
/**
* Contains codes used by the scene invocation services.
src/java/com/threerings/whirled/client/SceneDirector.java
+9 -9
View File
@@ -1,18 +1,18 @@
//
// $Id: SceneDirector.java,v 1.5 2001/10/05 23:59:36 mdb Exp $
// $Id: SceneDirector.java,v 1.6 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.client;
import java.io.IOException;
import com.samskivert.util.HashIntMap;
import com.threerings.cocktail.cher.dobj.DObject;
import com.threerings.cocktail.cher.dobj.ObjectAccessException;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.ObjectAccessException;
import com.threerings.cocktail.party.client.LocationDirector;
import com.threerings.cocktail.party.client.LocationObserver;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.cocktail.party.data.PlaceObject;
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;
@@ -29,9 +29,9 @@ import com.threerings.whirled.util.WhirledContext;
*
* <p> Note that when the scene director is in use instead of the location
* director, scene ids instead of place oids will be supplied to {@link
* com.threerings.cocktail.party.client.LocationObserver#locationMayChange}
* com.threerings.crowd.client.LocationObserver#locationMayChange}
* and {@link
* com.threerings.cocktail.party.client.LocationObserver#locationChangeFailed}.
* com.threerings.crowd.client.LocationObserver#locationChangeFailed}.
*/
public class SceneDirector
extends LocationDirector implements SceneCodes
src/java/com/threerings/whirled/client/SceneService.java
+3 -3
View File
@@ -1,10 +1,10 @@
//
// $Id: SceneService.java,v 1.4 2001/10/02 02:08:16 mdb Exp $
// $Id: SceneService.java,v 1.5 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.client;
import com.threerings.cocktail.cher.client.Client;
import com.threerings.cocktail.cher.client.InvocationDirector;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationDirector;
import com.threerings.whirled.Log;
src/java/com/threerings/whirled/data/DummyScene.java
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: DummyScene.java,v 1.4 2001/10/05 23:59:37 mdb Exp $
// $Id: DummyScene.java,v 1.5 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.test;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.whirled.data.Scene;
public class DummyScene implements Scene
src/java/com/threerings/whirled/data/Scene.java
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: Scene.java,v 1.5 2001/10/05 23:59:36 mdb Exp $
// $Id: Scene.java,v 1.6 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.data;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.crowd.data.PlaceConfig;
/**
* The base scene interface. This encapsulates the minimum information
src/java/com/threerings/whirled/data/SceneObject.java
+2 -2
View File
@@ -1,9 +1,9 @@
//
// $Id: SceneObject.java,v 1.1 2001/08/11 04:09:50 mdb Exp $
// $Id: SceneObject.java,v 1.2 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.data;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.crowd.data.PlaceObject;
public class SceneObject extends PlaceObject
{
src/java/com/threerings/whirled/server/SceneManager.java
+4 -4
View File
@@ -1,11 +1,11 @@
//
// $Id: SceneManager.java,v 1.5 2001/10/05 23:59:36 mdb Exp $
// $Id: SceneManager.java,v 1.6 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.server;
import com.threerings.cocktail.party.chat.ChatMessageHandler;
import com.threerings.cocktail.party.chat.ChatService;
import com.threerings.cocktail.party.server.PlaceManager;
import com.threerings.crowd.chat.ChatMessageHandler;
import com.threerings.crowd.chat.ChatService;
import com.threerings.crowd.server.PlaceManager;
import com.threerings.whirled.data.Scene;
src/java/com/threerings/whirled/server/SceneProvider.java
+5 -5
View File
@@ -1,13 +1,13 @@
//
// $Id: SceneProvider.java,v 1.3 2001/10/05 23:59:36 mdb Exp $
// $Id: SceneProvider.java,v 1.4 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.server;
import com.threerings.cocktail.cher.server.InvocationProvider;
import com.threerings.cocktail.cher.server.ServiceFailedException;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.presents.server.ServiceFailedException;
import com.threerings.cocktail.party.data.*;
import com.threerings.cocktail.party.server.LocationProvider;
import com.threerings.crowd.data.*;
import com.threerings.crowd.server.LocationProvider;
import com.threerings.whirled.Log;
import com.threerings.whirled.client.SceneCodes;
src/java/com/threerings/whirled/server/SceneRegistry.java
+4 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneRegistry.java,v 1.4 2001/10/05 23:59:36 mdb Exp $
// $Id: SceneRegistry.java,v 1.5 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.server;
@@ -7,9 +7,9 @@ import java.util.ArrayList;
import java.util.Properties;
import com.samskivert.util.HashIntMap;
import com.threerings.cocktail.cher.util.Invoker;
import com.threerings.presents.util.Invoker;
import com.threerings.cocktail.party.server.PartyServer;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.whirled.Log;
import com.threerings.whirled.data.Scene;
@@ -161,7 +161,7 @@ public class SceneRegistry
try {
SceneManager scmgr = (SceneManager)
PartyServer.plreg.createPlace(scene.getPlaceConfig());
CrowdServer.plreg.createPlace(scene.getPlaceConfig());
// configure the scene manager with references to useful
// stuff; we'll somehow need to convey configuration
src/java/com/threerings/whirled/server/WhirledServer.java
+5 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: WhirledServer.java,v 1.6 2001/10/05 23:59:36 mdb Exp $
// $Id: WhirledServer.java,v 1.7 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.server;
@@ -7,17 +7,17 @@ import com.samskivert.jdbc.ConnectionProvider;
import com.samskivert.jdbc.StaticConnectionProvider;
import com.samskivert.util.Config;
import com.threerings.cocktail.party.server.PartyServer;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.whirled.Log;
import com.threerings.whirled.server.persist.SceneRepository;
import com.threerings.whirled.test.DummySceneRepository;
/**
* The whirled server extends the party server and provides access to
* The whirled server extends the crowd server and provides access to
* managers and the like that are needed by the whirled serviecs.
*/
public class WhirledServer extends PartyServer
public class WhirledServer extends CrowdServer
{
/** The namespace used for server config properties. */
public static final String CONFIG_KEY = "whirled";
@@ -34,7 +34,7 @@ public class WhirledServer extends PartyServer
public void init ()
throws Exception
{
// do the cher server initialization
// do the base server initialization
super.init();
// bind the whirled server config into the namespace
src/java/com/threerings/whirled/util/WhirledContext.java
+3 -3
View File
@@ -1,16 +1,16 @@
//
// $Id: WhirledContext.java,v 1.2 2001/10/01 22:16:02 mdb Exp $
// $Id: WhirledContext.java,v 1.3 2001/10/11 04:07:54 mdb Exp $
package com.threerings.whirled.util;
import com.threerings.cocktail.party.util.PartyContext;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.whirled.client.SceneDirector;
/**
* The whirled context provides access to the various managers, etc. that
* are needed by the whirled client code.
*/
public interface WhirledContext extends PartyContext
public interface WhirledContext extends CrowdContext
{
/**
* Returns a reference to the scene director.