Brought code in line with changes to Samskivert. I have not started to

genericize Narya data structures, nor make the existing code type safe. That's
going to be an extremely large project.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4007 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2006-04-10 08:59:30 +00:00
parent 02b59f33c9
commit 5a2583470c
24 changed files with 49 additions and 48 deletions
@@ -35,7 +35,7 @@ import java.util.List;
import org.apache.velocity.VelocityContext;
import com.samskivert.util.CollectionUtil;
import com.samskivert.util.SortableArrayList;
import com.samskivert.util.ComparableArrayList;
import com.samskivert.util.StringUtil;
import com.threerings.presents.client.InvocationDecoder;
@@ -69,7 +69,7 @@ public class GenReceiverTask extends InvocationTask
}
HashMap imports = new HashMap();
SortableArrayList methods = new SortableArrayList();
ComparableArrayList methods = new ComparableArrayList();
// we need to import the receiver itself
imports.put(importify(receiver.getName()), Boolean.TRUE);
@@ -101,7 +101,7 @@ public class GenReceiverTask extends InvocationTask
String spackage = StringUtil.replace(rpackage, ".client", ".server");
// construct our imports list
SortableArrayList implist = new SortableArrayList();
ComparableArrayList implist = new ComparableArrayList();
CollectionUtil.addAll(implist, imports);
checkedAdd(implist, ClientObject.class.getName());
checkedAdd(implist, InvocationSender.class.getName());
@@ -140,7 +140,7 @@ public class GenReceiverTask extends InvocationTask
String dname = StringUtil.replace(rname, "Receiver", "Decoder");
// construct our imports list
SortableArrayList implist = new SortableArrayList();
ComparableArrayList implist = new ComparableArrayList();
CollectionUtil.addAll(implist, imports);
checkedAdd(implist, InvocationDecoder.class.getName());
implist.sort();