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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/client/Communicator.java
+1 -1
View File
@@ -30,9 +30,9 @@ import java.nio.channels.SocketChannel;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import com.samskivert.swing.RuntimeAdjust;
import com.samskivert.util.LoopingThread;
import com.samskivert.util.Queue;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil;
import com.threerings.io.FramedInputStream;
src/java/com/threerings/presents/tools/GenReceiverTask.java
+4 -4
View File
@@ -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();
src/java/com/threerings/presents/tools/GenServiceTask.java
+7 -7
View File
@@ -18,7 +18,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.Client;
@@ -41,7 +41,7 @@ public class GenServiceTask extends InvocationTask
{
public Class listener;
public SortableArrayList methods = new SortableArrayList();
public ComparableArrayList methods = new ComparableArrayList();
public ServiceListener (Class service, Class listener, HashMap imports)
{
@@ -116,8 +116,8 @@ public class GenServiceTask extends InvocationTask
}
HashMap imports = new HashMap();
SortableArrayList methods = new SortableArrayList();
SortableArrayList listeners = new SortableArrayList();
ComparableArrayList methods = new ComparableArrayList();
ComparableArrayList listeners = new ComparableArrayList();
// we need to import the service itself
imports.put(importify(service.getName()), Boolean.TRUE);
@@ -165,7 +165,7 @@ public class GenServiceTask extends InvocationTask
String mpackage = StringUtil.replace(spackage, ".client", ".data");
// construct our imports list
SortableArrayList implist = new SortableArrayList();
ComparableArrayList implist = new ComparableArrayList();
CollectionUtil.addAll(implist, imports);
checkedAdd(implist, Client.class.getName());
checkedAdd(implist, InvocationMarshaller.class.getName());
@@ -205,7 +205,7 @@ public class GenServiceTask extends InvocationTask
String dpackage = StringUtil.replace(spackage, ".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, InvocationMarshaller.class.getName());
@@ -248,7 +248,7 @@ public class GenServiceTask extends InvocationTask
String mpackage = StringUtil.replace(spackage, ".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, InvocationProvider.class.getName());