Prefer java standard libraries, then guava, then samskivert.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6095 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2010-07-14 19:28:14 +00:00
parent cdebcfa71d
commit 6bff220be7
6 changed files with 16 additions and 14 deletions
@@ -21,11 +21,11 @@
package com.threerings.crowd.chat.client;
import java.util.Collections;
import java.util.HashSet;
import com.google.common.collect.Sets;
import com.samskivert.util.CollectionUtil;
import com.samskivert.util.ObserverList;
import com.threerings.util.MessageBundle;
@@ -70,7 +70,7 @@ public class MuteDirector extends BasicDirector
{
this(ctx);
CollectionUtil.addAll(_mutelist, list);
Collections.addAll(_mutelist, list);
}
/**
@@ -30,9 +30,9 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.primitives.Longs;
import com.google.inject.Inject;
import com.samskivert.util.Comparators;
import com.samskivert.util.Interval;
import com.samskivert.util.Lifecycle;
import com.samskivert.util.ResultListener;
@@ -321,7 +321,7 @@ public abstract class CrowdPeerManager extends PeerManager
protected static final Comparator<ChatHistoryEntry> SORT_BY_TIMESTAMP =
new Comparator<ChatHistoryEntry>() {
public int compare (ChatHistoryEntry e1, ChatHistoryEntry e2) {
return Comparators.compare(e1.message.timestamp, e2.message.timestamp);
return Longs.compare(e1.message.timestamp, e2.message.timestamp);
}
};
}