From 62c466b95f62ebf1b3947485f7d896242080c4de Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 5 Feb 2002 22:58:23 +0000
Subject: [PATCH] Changed getContext() to getParlorContext() to prevent naming
 conflict.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@942 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/micasa/simulator/client/SimpleClient.java    | 4 ++--
 .../threerings/micasa/simulator/client/SimulatorApp.java    | 6 +++---
 .../threerings/micasa/simulator/client/SimulatorClient.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java
index a3a992aef..64748a907 100644
--- a/src/java/com/threerings/micasa/simulator/client/SimpleClient.java
+++ b/src/java/com/threerings/micasa/simulator/client/SimpleClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: SimpleClient.java,v 1.1 2002/01/16 02:59:08 mdb Exp $
+// $Id: SimpleClient.java,v 1.2 2002/02/05 22:58:23 mdb Exp $
 
 package com.threerings.micasa.simulator.client;
 
@@ -65,7 +65,7 @@ public class SimpleClient
      * Returns a reference to the context in effect for this client. This
      * reference is valid for the lifetime of the application.
      */
-    public ParlorContext getContext ()
+    public ParlorContext getParlorContext ()
     {
         return _ctx;
     }
diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java b/src/java/com/threerings/micasa/simulator/client/SimulatorApp.java
index de1d6a47b..a025b2413 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.3 2002/02/05 22:12:42 mdb Exp $
+// $Id: SimulatorApp.java,v 1.4 2002/02/05 22:58:23 mdb Exp $
 
 package com.threerings.micasa.simulator.client;
 
@@ -46,7 +46,7 @@ public class SimulatorApp
 
         // set up the top-level client controller
         Controller ctrl = new ClientController(
-            _client.getContext(), _frame, siminfo);
+            _client.getParlorContext(), _frame, siminfo);
         _frame.setController(ctrl);
     }
 
@@ -80,7 +80,7 @@ public class SimulatorApp
         _serverThread.start();
 
         // start up the client
-        Client client = _client.getContext().getClient();
+        Client client = _client.getParlorContext().getClient();
 
         // we're connecting to our own server
         client.setServer("localhost", Client.DEFAULT_SERVER_PORT);
diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorClient.java b/src/java/com/threerings/micasa/simulator/client/SimulatorClient.java
index 586844705..3b40bc7c7 100644
--- a/src/java/com/threerings/micasa/simulator/client/SimulatorClient.java
+++ b/src/java/com/threerings/micasa/simulator/client/SimulatorClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: SimulatorClient.java,v 1.2 2002/01/16 02:59:08 mdb Exp $
+// $Id: SimulatorClient.java,v 1.3 2002/02/05 22:58:23 mdb Exp $
 
 package com.threerings.micasa.simulator.client;
 
@@ -7,5 +7,5 @@ import com.threerings.parlor.util.ParlorContext;
 
 public interface SimulatorClient
 {
-    public ParlorContext getContext ();
+    public ParlorContext getParlorContext ();
 }