From 51281a9d498512423e0a5c71adc8cb5c66efa1bf Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 4 Oct 2006 21:10:00 +0000
Subject: [PATCH] Let's just call clearOccupant() clearOccupantByOid() to avoid
 differences between the Java and ActionScript version since ActionScript
 doesn't support method overloading. We only have to observe this limitation
 in Streamable classes.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@88 c613c5cb-e716-0410-b11b-feb51c14d237
---
 src/java/com/threerings/parlor/data/Table.java          | 2 +-
 src/java/com/threerings/parlor/server/TableManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java
index 2098cba4..c9ad5e65 100644
--- a/src/java/com/threerings/parlor/data/Table.java
+++ b/src/java/com/threerings/parlor/data/Table.java
@@ -278,7 +278,7 @@ public class Table
      * removed, false if the user was never seated at the table in the
      * first place.
      */
-    public boolean clearOccupant (int bodyOid)
+    public boolean clearOccupantByOid (int bodyOid)
     {
         for (int i = 0; i < bodyOids.length; i++) {
             if (bodyOid == bodyOids[i]) {
diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java
index 14d6546b..0512282f 100644
--- a/src/java/com/threerings/parlor/server/TableManager.java
+++ b/src/java/com/threerings/parlor/server/TableManager.java
@@ -335,7 +335,7 @@ public class TableManager
         }
 
         // remove this occupant from the table
-        if (!pender.clearOccupant(bodyOid)) {
+        if (!pender.clearOccupantByOid(bodyOid)) {
             Log.warning("Attempt to remove body from mapped table failed " +
                         "[table=" + pender + ", bodyOid=" + bodyOid + "].");
             return;