From 0a0a658c94761762e79578ec36f7ad453ec7ce91 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 14 Jul 2010 20:43:13 +0000
Subject: [PATCH] Prefer guava over samskivert.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@938 c613c5cb-e716-0410-b11b-feb51c14d237
---
 src/java/com/threerings/parlor/client/TableDirector.java | 5 +++--
 src/java/com/threerings/parlor/util/RobotPlayer.java     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/parlor/client/TableDirector.java b/src/java/com/threerings/parlor/client/TableDirector.java
index f2efb9b7..31d88b54 100644
--- a/src/java/com/threerings/parlor/client/TableDirector.java
+++ b/src/java/com/threerings/parlor/client/TableDirector.java
@@ -21,7 +21,8 @@
 
 package com.threerings.parlor.client;
 
-import com.samskivert.util.ObjectUtil;
+import com.google.common.base.Objects;
+
 import com.samskivert.util.ObserverList;
 
 import com.threerings.util.Name;
@@ -331,7 +332,7 @@ public class TableDirector extends BasicDirector
         }
 
         // if nothing changed, bail now
-        if (ObjectUtil.equals(oldTable, _ourTable)) {
+        if (Objects.equal(oldTable, _ourTable)) {
             return;
         }
 
diff --git a/src/java/com/threerings/parlor/util/RobotPlayer.java b/src/java/com/threerings/parlor/util/RobotPlayer.java
index 88e2d38b..d9a8e33e 100644
--- a/src/java/com/threerings/parlor/util/RobotPlayer.java
+++ b/src/java/com/threerings/parlor/util/RobotPlayer.java
@@ -25,9 +25,9 @@ import java.util.List;
 
 import java.awt.Component;
 
+import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 
-import com.samskivert.util.CollectionUtil;
 import com.samskivert.util.Interval;
 import com.samskivert.util.RandomUtil;
 
@@ -57,8 +57,8 @@ public class RobotPlayer extends Interval
         _xlate = xlate;
 
         // build the list of available commands
-        CollectionUtil.addAll(_press, _xlate.enumeratePressCommands());
-        CollectionUtil.addAll(_release, _xlate.enumerateReleaseCommands());
+        Iterators.addAll(_press, _xlate.enumeratePressCommands());
+        Iterators.addAll(_release, _xlate.enumerateReleaseCommands());
     }
 
     /**