Prefer guava over samskivert.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@938 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Ray Greenwell
2010-07-14 20:43:13 +00:00
parent dc789fc46d
commit 0a0a658c94
2 changed files with 6 additions and 5 deletions
@@ -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;
}
@@ -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());
}
/**