From 52790799d249484159e24042e1c600ea0d0a399c Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Fri, 26 Apr 2002 02:34:11 +0000
Subject: [PATCH] Name changes; comment fix.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1295 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../presents/server/ClientManager.java        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java
index 7fc4a5aba..a8fe3c117 100644
--- a/src/java/com/threerings/presents/server/ClientManager.java
+++ b/src/java/com/threerings/presents/server/ClientManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ClientManager.java,v 1.18 2002/04/26 02:32:27 mdb Exp $
+// $Id: ClientManager.java,v 1.19 2002/04/26 02:34:11 mdb Exp $
 
 package com.threerings.presents.server;
 
@@ -171,7 +171,7 @@ public class ClientManager implements ConnectionObserver
     public synchronized void unmapClientObject (String username)
     {
         // we only remove the mapping if there's not a session in progress
-        // (which is indicated by a mapping in the usermap table)
+        // (which is indicated by an entry in the locks table)
         if (!_locks.contains(username)) {
             ClientObject clobj = (ClientObject)_objmap.remove(username);
             PresentsServer.omgr.destroyObject(clobj.getOid());
@@ -185,11 +185,11 @@ public class ClientManager implements ConnectionObserver
      * automatically when a real user starts a session by establishing a
      * network connection with the server. If a client session is managed
      * via some other mechanism (bots managed by the server, for example),
-     * this method and its corresponding {@link #releaseClientObject}
-     * should be called at the beginning and end of the faked client
-     * session respectively.
+     * this method and its corresponding {@link #releaseClient} should be
+     * called at the beginning and end of the faked client session
+     * respectively.
      */
-    public synchronized void lockClientObject (String username)
+    public synchronized void lockClient (String username)
     {
         if (_locks.contains(username)) {
             Log.warning("Requested to lock already locked user " +
@@ -204,9 +204,9 @@ public class ClientManager implements ConnectionObserver
     /**
      * Releases a client object when their session has ended.
      *
-     * @see #lockClientObject
+     * @see #lockClient
      */
-    public synchronized void releaseClientObject (String username)
+    public synchronized void releaseClient (String username)
     {
         if (!_locks.remove(username)) {
             Log.warning("Requested to unlock a user that was not locked " +
@@ -240,7 +240,7 @@ public class ClientManager implements ConnectionObserver
                 client.startSession(this, username, conn);
 
                 // lock this client for the duration of this session
-                lockClientObject(username);
+                lockClient(username);
 
                 // map their client instance
                 _usermap.put(username, client);
@@ -303,7 +303,7 @@ public class ClientManager implements ConnectionObserver
         // remove the client from the username map
         PresentsClient rc = (PresentsClient)_usermap.remove(username);
         // release the client session
-        releaseClientObject(username);
+        releaseClient(username);
         // and unmap (and destroy) their client object
         unmapClientObject(username);