AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer java standard libraries, then guava, then samskivert.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/peer/data/NodeObject.java
+3 -2
View File
@@ -22,7 +22,8 @@
package com.threerings.presents.peer.data;
import javax.annotation.Generated;
import com.samskivert.util.ObjectUtil;
import com.google.common.base.Objects;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.io.Streamable;
@@ -115,7 +116,7 @@ public class NodeObject extends DObject
public boolean equals (Object other)
{
Lock olock = (Lock)other;
return type.equals(olock.type) && ObjectUtil.equals(id, olock.id);
return type.equals(olock.type) && Objects.equal(id, olock.id);
}
}
src/java/com/threerings/presents/tools/GenReceiverTask.java
+4 -3
View File
@@ -30,9 +30,10 @@ import java.util.List;
import java.io.File;
import java.io.StringWriter;
import com.google.common.collect.Iterators;
import org.apache.velocity.VelocityContext;
import com.samskivert.util.CollectionUtil;
import com.samskivert.util.ComparableArrayList;
import com.samskivert.util.StringUtil;
@@ -103,7 +104,7 @@ public class GenReceiverTask extends InvocationTask
// construct our imports list
ComparableArrayList<String> implist = new ComparableArrayList<String>();
CollectionUtil.addAll(implist, imports);
Iterators.addAll(implist, imports);
checkedAdd(implist, ClientObject.class.getName());
checkedAdd(implist, InvocationSender.class.getName());
String dname = rname.replace("Receiver", "Decoder");
@@ -135,7 +136,7 @@ public class GenReceiverTask extends InvocationTask
// construct our imports list
ComparableArrayList<String> implist = new ComparableArrayList<String>();
CollectionUtil.addAll(implist, imports);
Iterators.addAll(implist, imports);
checkedAdd(implist, InvocationDecoder.class.getName());
implist.sort();