Big fat renaming!

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@432 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-10-11 04:13:33 +00:00
parent 8a4c46badc
commit 55093e30f8
19 changed files with 76 additions and 76 deletions
@@ -1,5 +1,5 @@
//
// $Id: ChatPanel.java,v 1.3 2001/10/09 19:23:26 mdb Exp $
// $Id: ChatPanel.java,v 1.4 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.client;
@@ -11,11 +11,11 @@ import javax.swing.text.*;
import java.util.StringTokenizer;
import com.samskivert.swing.*;
import com.threerings.cocktail.party.chat.*;
import com.threerings.cocktail.party.client.*;
import com.threerings.cocktail.party.data.OccupantInfo;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.cocktail.party.util.PartyContext;
import com.threerings.crowd.chat.*;
import com.threerings.crowd.client.*;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.micasa.Log;
@@ -23,7 +23,7 @@ public class ChatPanel
extends JPanel
implements ActionListener, ChatDisplay, OccupantObserver, PlaceView
{
public ChatPanel (PartyContext ctx)
public ChatPanel (CrowdContext ctx)
{
// keep this around for later
_ctx = ctx;
@@ -228,7 +228,7 @@ public class ChatPanel
// nothing doing
}
protected PartyContext _ctx;
protected CrowdContext _ctx;
protected ChatDirector _chatdtr;
protected JComboBox _roombox;
@@ -1,5 +1,5 @@
//
// $Id: ClientController.java,v 1.6 2001/10/09 19:23:26 mdb Exp $
// $Id: ClientController.java,v 1.7 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.client;
@@ -7,13 +7,13 @@ import java.awt.event.ActionEvent;
import com.samskivert.swing.Controller;
import com.samskivert.util.StringUtil;
import com.threerings.cocktail.cher.dobj.*;
import com.threerings.cocktail.cher.client.*;
import com.threerings.cocktail.cher.net.Credentials;
import com.threerings.cocktail.cher.net.UsernamePasswordCreds;
import com.threerings.presents.dobj.*;
import com.threerings.presents.client.*;
import com.threerings.presents.net.Credentials;
import com.threerings.presents.net.UsernamePasswordCreds;
import com.threerings.cocktail.party.client.*;
import com.threerings.cocktail.party.data.*;
import com.threerings.crowd.client.*;
import com.threerings.crowd.data.*;
import com.threerings.micasa.Log;
import com.threerings.micasa.data.MiCasaBootstrapData;
@@ -1,5 +1,5 @@
//
// $Id: LogonPanel.java,v 1.1 2001/10/03 23:24:09 mdb Exp $
// $Id: LogonPanel.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.client;
@@ -11,8 +11,8 @@ import javax.swing.*;
import com.samskivert.swing.*;
import com.threerings.cocktail.cher.client.Client;
import com.threerings.cocktail.cher.net.*;
import com.threerings.presents.client.Client;
import com.threerings.presents.net.*;
import com.threerings.micasa.util.MiCasaContext;
@@ -1,5 +1,5 @@
//
// $Id: MiCasaClient.java,v 1.2 2001/10/09 17:47:33 mdb Exp $
// $Id: MiCasaClient.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.client;
@@ -10,13 +10,13 @@ import javax.swing.SwingUtilities;
import com.samskivert.util.Config;
import com.threerings.cocktail.cher.client.*;
import com.threerings.cocktail.cher.dobj.DObjectManager;
import com.threerings.cocktail.cher.net.*;
import com.threerings.presents.client.*;
import com.threerings.presents.dobj.DObjectManager;
import com.threerings.presents.net.*;
import com.threerings.cocktail.party.client.LocationDirector;
import com.threerings.cocktail.party.client.OccupantManager;
import com.threerings.cocktail.party.client.PlaceView;
import com.threerings.crowd.client.LocationDirector;
import com.threerings.crowd.client.OccupantManager;
import com.threerings.crowd.client.PlaceView;
import com.threerings.parlor.client.ParlorDirector;
@@ -1,15 +1,15 @@
//
// $Id: OccupantList.java,v 1.2 2001/10/09 00:48:34 mdb Exp $
// $Id: OccupantList.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.client;
import java.util.Iterator;
import javax.swing.*;
import com.threerings.cocktail.party.client.OccupantObserver;
import com.threerings.cocktail.party.client.PlaceView;
import com.threerings.cocktail.party.data.OccupantInfo;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.crowd.client.OccupantObserver;
import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.micasa.util.MiCasaContext;
@@ -1,12 +1,12 @@
//
// $Id: MiCasaBootstrapData.java,v 1.1 2001/10/09 18:20:08 mdb Exp $
// $Id: MiCasaBootstrapData.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.data;
import com.threerings.cocktail.cher.net.BootstrapData;
import com.threerings.presents.net.BootstrapData;
/**
* Extends the basic Cher bootstrap data and provides some bootstrap
* Extends the basic Presents bootstrap data and provides some bootstrap
* information specific to the MiCasa services.
*/
public class MiCasaBootstrapData extends BootstrapData
@@ -1,5 +1,5 @@
//
// $Id: Lobby.java,v 1.1 2001/10/04 23:41:44 mdb Exp $
// $Id: Lobby.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
@@ -7,7 +7,7 @@ import java.io.IOException;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import com.threerings.cocktail.cher.io.Streamable;
import com.threerings.presents.io.Streamable;
/**
* A simple class for keeping track of information for each lobby in
@@ -1,9 +1,9 @@
//
// $Id: LobbyCodes.java,v 1.2 2001/10/04 23:41:44 mdb Exp $
// $Id: LobbyCodes.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import com.threerings.cocktail.cher.client.InvocationCodes;
import com.threerings.presents.client.InvocationCodes;
/**
* Contains codes used by the lobby invocation services.
@@ -1,5 +1,5 @@
//
// $Id: LobbyConfig.java,v 1.2 2001/10/09 20:22:51 mdb Exp $
// $Id: LobbyConfig.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
@@ -10,7 +10,7 @@ import java.io.DataOutputStream;
import java.util.Properties;
import com.samskivert.util.StringUtil;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.parlor.data.GameConfig;
@@ -1,13 +1,13 @@
//
// $Id: LobbyController.java,v 1.4 2001/10/09 20:22:51 mdb Exp $
// $Id: LobbyController.java,v 1.5 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import com.threerings.cocktail.party.data.PlaceConfig;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.cocktail.party.client.PlaceController;
import com.threerings.cocktail.party.client.PlaceView;
import com.threerings.cocktail.party.util.PartyContext;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.client.PlaceController;
import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.util.CrowdContext;
import com.threerings.parlor.client.*;
import com.threerings.parlor.data.GameConfig;
@@ -19,7 +19,7 @@ public class LobbyController
extends PlaceController
implements InvitationHandler, InvitationResponseObserver
{
public void init (PartyContext ctx, PlaceConfig config)
public void init (CrowdContext ctx, PlaceConfig config)
{
// cast our context reference
_ctx = (MiCasaContext)ctx;
@@ -1,14 +1,14 @@
//
// $Id: LobbyManager.java,v 1.3 2001/10/09 17:47:33 mdb Exp $
// $Id: LobbyManager.java,v 1.4 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import java.util.Properties;
import com.samskivert.util.StringUtil;
import com.threerings.cocktail.party.chat.ChatService;
import com.threerings.cocktail.party.chat.ChatMessageHandler;
import com.threerings.cocktail.party.server.PlaceManager;
import com.threerings.crowd.chat.ChatService;
import com.threerings.crowd.chat.ChatMessageHandler;
import com.threerings.crowd.server.PlaceManager;
import com.threerings.micasa.Log;
/**
@@ -1,9 +1,9 @@
//
// $Id: LobbyObject.dobj,v 1.2 2001/10/04 23:41:44 mdb Exp $
// $Id: LobbyObject.dobj,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.crowd.data.PlaceObject;
public class LobbyObject extends PlaceObject
{
@@ -1,13 +1,13 @@
//
// $Id: LobbyPanel.java,v 1.5 2001/10/09 19:49:59 mdb Exp $
// $Id: LobbyPanel.java,v 1.6 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import javax.swing.*;
import com.samskivert.swing.*;
import com.threerings.cocktail.party.client.PlaceView;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.micasa.client.*;
import com.threerings.micasa.util.MiCasaContext;
@@ -1,11 +1,11 @@
//
// $Id: LobbyProvider.java,v 1.2 2001/10/04 23:41:44 mdb Exp $
// $Id: LobbyProvider.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import com.threerings.cocktail.cher.server.InvocationProvider;
import com.threerings.cocktail.cher.util.StreamableArrayList;
import com.threerings.cocktail.party.data.BodyObject;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.presents.util.StreamableArrayList;
import com.threerings.crowd.data.BodyObject;
/**
* Handles server side of lobby-related invocation services.
@@ -1,13 +1,13 @@
//
// $Id: LobbyRegistry.java,v 1.5 2001/10/09 20:22:51 mdb Exp $
// $Id: LobbyRegistry.java,v 1.6 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
import java.util.*;
import com.samskivert.util.*;
import com.threerings.cocktail.cher.server.InvocationManager;
import com.threerings.cocktail.party.data.BodyObject;
import com.threerings.presents.server.InvocationManager;
import com.threerings.crowd.data.BodyObject;
import com.threerings.micasa.Log;
import com.threerings.micasa.server.MiCasaServer;
@@ -1,5 +1,5 @@
//
// $Id: LobbySelector.java,v 1.2 2001/10/09 18:20:08 mdb Exp $
// $Id: LobbySelector.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
@@ -15,7 +15,7 @@ import javax.swing.event.AncestorListener;
import com.samskivert.util.StringUtil;
import com.threerings.cocktail.party.data.PlaceObject;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.micasa.Log;
import com.threerings.micasa.lobby.Lobby;
@@ -1,10 +1,10 @@
//
// $Id: LobbyService.java,v 1.1 2001/10/04 23:41:44 mdb Exp $
// $Id: LobbyService.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.lobby;
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.micasa.Log;
@@ -1,18 +1,18 @@
//
// $Id: MiCasaClient.java,v 1.2 2001/10/09 19:23:50 mdb Exp $
// $Id: MiCasaClient.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.server;
import com.threerings.cocktail.cher.net.BootstrapData;
import com.threerings.cocktail.party.server.PartyClient;
import com.threerings.presents.net.BootstrapData;
import com.threerings.crowd.server.CrowdClient;
import com.threerings.micasa.data.MiCasaBootstrapData;
/**
* Extends the cher client and provides bootstrap data specific to the
* Extends the Crowd client and provides bootstrap data specific to the
* MiCasa services.
*/
public class MiCasaClient extends PartyClient
public class MiCasaClient extends CrowdClient
{
// documentation inherited
protected BootstrapData createBootstrapData ()
@@ -1,5 +1,5 @@
//
// $Id: MiCasaServer.java,v 1.3 2001/10/09 18:20:08 mdb Exp $
// $Id: MiCasaServer.java,v 1.4 2001/10/11 04:13:33 mdb Exp $
package com.threerings.micasa.server;
@@ -7,7 +7,7 @@ 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.parlor.server.ParlorManager;
import com.threerings.micasa.Log;
@@ -17,7 +17,7 @@ import com.threerings.micasa.lobby.LobbyRegistry;
* This class is the main entry point and general organizer of everything
* that goes on in the MiCasa game server process.
*/
public class MiCasaServer extends PartyServer
public class MiCasaServer extends CrowdServer
{
/** The namespace used for server config properties. */
public static final String CONFIG_KEY = "micasa";
@@ -37,7 +37,7 @@ public class MiCasaServer extends PartyServer
public void init ()
throws Exception
{
// do the cher server initialization
// do the base server initialization
super.init();
// configure the client manager to use our client class