From 635e9cf930084a69a9afc382a9eab7a88f0f3a3d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 9 Feb 2002 20:47:11 +0000 Subject: [PATCH] addObserver -> addClientObserver. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@982 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/chat/client/ChatDirector.java | 4 ++-- src/java/com/threerings/crowd/client/LocationDirector.java | 4 ++-- src/java/com/threerings/micasa/client/ClientController.java | 4 ++-- src/java/com/threerings/micasa/client/MiCasaApp.java | 4 ++-- src/java/com/threerings/micasa/client/MiCasaApplet.java | 4 ++-- .../threerings/micasa/simulator/client/ClientController.java | 4 ++-- .../com/threerings/micasa/simulator/client/SimulatorApp.java | 4 ++-- tests/src/java/com/threerings/crowd/client/TestClient.java | 4 ++-- tests/src/java/com/threerings/parlor/TestClient.java | 4 ++-- tests/src/java/com/threerings/presents/client/TestClient.java | 4 ++-- tests/src/java/com/threerings/whirled/TestClient.java | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index d82391baf..58658b7a7 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -1,5 +1,5 @@ // -// $Id: ChatDirector.java,v 1.15 2002/02/03 08:22:38 shaper Exp $ +// $Id: ChatDirector.java,v 1.16 2002/02/09 20:47:11 mdb Exp $ package com.threerings.crowd.chat; @@ -36,7 +36,7 @@ public class ChatDirector // register a client observer that will register us as the chat // receiver when we log on - _ctx.getClient().addObserver(new ClientAdapter() { + _ctx.getClient().addClientObserver(new ClientAdapter() { public void clientDidLogon (Client client) { client.getInvocationDirector().registerReceiver( diff --git a/src/java/com/threerings/crowd/client/LocationDirector.java b/src/java/com/threerings/crowd/client/LocationDirector.java index bcee89f7c..615558086 100644 --- a/src/java/com/threerings/crowd/client/LocationDirector.java +++ b/src/java/com/threerings/crowd/client/LocationDirector.java @@ -1,5 +1,5 @@ // -// $Id: LocationDirector.java,v 1.16 2001/12/16 05:18:20 mdb Exp $ +// $Id: LocationDirector.java,v 1.17 2002/02/09 20:47:11 mdb Exp $ package com.threerings.crowd.client; @@ -47,7 +47,7 @@ public class LocationDirector _ctx = ctx; // register ourselves as a client observer - ctx.getClient().addObserver(this); + ctx.getClient().addClientObserver(this); } /** diff --git a/src/java/com/threerings/micasa/client/ClientController.java b/src/java/com/threerings/micasa/client/ClientController.java index c592cf09d..97064edb9 100644 --- a/src/java/com/threerings/micasa/client/ClientController.java +++ b/src/java/com/threerings/micasa/client/ClientController.java @@ -1,5 +1,5 @@ // -// $Id: ClientController.java,v 1.11 2001/12/20 01:10:51 shaper Exp $ +// $Id: ClientController.java,v 1.12 2002/02/09 20:47:11 mdb Exp $ package com.threerings.micasa.client; @@ -34,7 +34,7 @@ public class ClientController _frame = frame; // we want to know about logon/logoff - _ctx.getClient().addObserver(this); + _ctx.getClient().addClientObserver(this); // create the logon panel and display it _logonPanel = new LogonPanel(_ctx); diff --git a/src/java/com/threerings/micasa/client/MiCasaApp.java b/src/java/com/threerings/micasa/client/MiCasaApp.java index 759322ae0..697c103b1 100644 --- a/src/java/com/threerings/micasa/client/MiCasaApp.java +++ b/src/java/com/threerings/micasa/client/MiCasaApp.java @@ -1,5 +1,5 @@ // -// $Id: MiCasaApp.java,v 1.5 2002/01/19 04:02:11 mdb Exp $ +// $Id: MiCasaApp.java,v 1.6 2002/02/09 20:47:11 mdb Exp $ package com.threerings.micasa.client; @@ -60,7 +60,7 @@ public class MiCasaApp } // we want to exit when we logged off or failed to log on - client.addObserver(new ClientAdapter() { + client.addClientObserver(new ClientAdapter() { public void clientFailedToLogon (Client c, Exception cause) { System.exit(0); } diff --git a/src/java/com/threerings/micasa/client/MiCasaApplet.java b/src/java/com/threerings/micasa/client/MiCasaApplet.java index 3ec1ca7fb..2e74b380a 100644 --- a/src/java/com/threerings/micasa/client/MiCasaApplet.java +++ b/src/java/com/threerings/micasa/client/MiCasaApplet.java @@ -1,5 +1,5 @@ // -// $Id: MiCasaApplet.java,v 1.5 2002/01/19 04:16:02 mdb Exp $ +// $Id: MiCasaApplet.java,v 1.6 2002/02/09 20:47:11 mdb Exp $ package com.threerings.micasa.client; @@ -46,7 +46,7 @@ public class MiCasaApplet extends Applet new UsernamePasswordCreds(username, authkey)); // we want to hide the client frame when we logoff - client.addObserver(new ClientAdapter() { + client.addClientObserver(new ClientAdapter() { public void clientDidLogoff (Client c) { _frame.setVisible(false); diff --git a/src/java/com/threerings/micasa/simulator/client/ClientController.java b/src/java/com/threerings/micasa/simulator/client/ClientController.java index 7f8bb4557..fc304503f 100644 --- a/src/java/com/threerings/micasa/simulator/client/ClientController.java +++ b/src/java/com/threerings/micasa/simulator/client/ClientController.java @@ -1,5 +1,5 @@ // -// $Id: ClientController.java,v 1.3 2002/02/05 22:57:44 mdb Exp $ +// $Id: ClientController.java,v 1.4 2002/02/09 20:47:11 mdb Exp $ package com.threerings.micasa.simulator.client; @@ -39,7 +39,7 @@ public class ClientController _info = info; // we want to know about logon/logoff - _ctx.getClient().addObserver(this); + _ctx.getClient().addClientObserver(this); } // documentation inherited diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java b/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java index a025b2413..3302c3375 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorApp.java,v 1.4 2002/02/05 22:58:23 mdb Exp $ +// $Id: SimulatorApp.java,v 1.5 2002/02/09 20:47:11 mdb Exp $ package com.threerings.micasa.simulator.client; @@ -86,7 +86,7 @@ public class SimulatorApp client.setServer("localhost", Client.DEFAULT_SERVER_PORT); // we want to exit when we logged off or failed to log on - client.addObserver(new ClientAdapter() { + client.addClientObserver(new ClientAdapter() { public void clientFailedToLogon (Client c, Exception cause) { System.exit(0); } diff --git a/tests/src/java/com/threerings/crowd/client/TestClient.java b/tests/src/java/com/threerings/crowd/client/TestClient.java index 9850b1e69..26166d7ee 100644 --- a/tests/src/java/com/threerings/crowd/client/TestClient.java +++ b/tests/src/java/com/threerings/crowd/client/TestClient.java @@ -1,5 +1,5 @@ // -// $Id: TestClient.java,v 1.7 2001/11/08 02:07:36 mdb Exp $ +// $Id: TestClient.java,v 1.8 2002/02/09 20:47:11 mdb Exp $ package com.threerings.crowd.client; @@ -28,7 +28,7 @@ public class TestClient _occmgr = new OccupantManager(_ctx); // we want to know about logon/logoff - _client.addObserver(this); + _client.addClientObserver(this); // for test purposes, hardcode the server info _client.setServer("localhost", 4007); diff --git a/tests/src/java/com/threerings/parlor/TestClient.java b/tests/src/java/com/threerings/parlor/TestClient.java index 07da88041..57d15cf79 100644 --- a/tests/src/java/com/threerings/parlor/TestClient.java +++ b/tests/src/java/com/threerings/parlor/TestClient.java @@ -1,5 +1,5 @@ // -// $Id: TestClient.java,v 1.5 2001/11/08 02:07:36 mdb Exp $ +// $Id: TestClient.java,v 1.6 2002/02/09 20:47:11 mdb Exp $ package com.threerings.parlor; @@ -38,7 +38,7 @@ public class TestClient _pardtr.setInvitationHandler(this); // we want to know about logon/logoff - _client.addObserver(this); + _client.addClientObserver(this); // for test purposes, hardcode the server info _client.setServer("localhost", 4007); diff --git a/tests/src/java/com/threerings/presents/client/TestClient.java b/tests/src/java/com/threerings/presents/client/TestClient.java index da82918ba..9d3fc0986 100644 --- a/tests/src/java/com/threerings/presents/client/TestClient.java +++ b/tests/src/java/com/threerings/presents/client/TestClient.java @@ -1,5 +1,5 @@ // -// $Id: TestClient.java,v 1.12 2001/11/08 02:07:36 mdb Exp $ +// $Id: TestClient.java,v 1.13 2002/02/09 20:47:11 mdb Exp $ package com.threerings.presents.client; @@ -117,7 +117,7 @@ public class TestClient new UsernamePasswordCreds("test", "test"); Client client = new Client(creds, tclient); tclient.setClient(client); - client.addObserver(tclient); + client.addClientObserver(tclient); client.setServer("localhost", 4007); client.logon(); // start up our event processing loop diff --git a/tests/src/java/com/threerings/whirled/TestClient.java b/tests/src/java/com/threerings/whirled/TestClient.java index 13e472db4..4e4705211 100644 --- a/tests/src/java/com/threerings/whirled/TestClient.java +++ b/tests/src/java/com/threerings/whirled/TestClient.java @@ -1,5 +1,5 @@ // -// $Id: TestClient.java,v 1.9 2001/12/17 03:36:36 mdb Exp $ +// $Id: TestClient.java,v 1.10 2002/02/09 20:47:11 mdb Exp $ package com.threerings.whirled; @@ -37,7 +37,7 @@ public class TestClient _ctx, _locdir, _screp, new DefaultDisplaySceneFactory()); // we want to know about logon/logoff - _client.addObserver(this); + _client.addClientObserver(this); // we want to know about location changes _locdir.addLocationObserver(this);