From 219ab38b776307e3da9c5c2c9d9feeb43577c9da Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 22 Jul 2008 12:33:37 +0000 Subject: [PATCH] Widening; nixed import of receiver as it's not needed. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5244 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/tools/GenReceiverTask.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java index c8e6ac692..955473921 100644 --- a/src/java/com/threerings/presents/tools/GenReceiverTask.java +++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java @@ -41,8 +41,7 @@ import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; /** - * An Ant task for generating invocation receiver marshalling and unmarshalling - * classes. + * An Ant task for generating invocation receiver marshalling and unmarshalling classes. */ public class GenReceiverTask extends InvocationTask { @@ -61,17 +60,12 @@ public class GenReceiverTask extends InvocationTask // verify that the receiver class name is as we expect it to be if (!rname.endsWith("Receiver")) { System.err.println("Cannot process '" + rname + "':"); - System.err.println( - "Receiver classes must be named SomethingReceiver."); + System.err.println("Receiver classes must be named SomethingReceiver."); return; } ImportSet imports = new ImportSet(); - ComparableArrayList methods = - new ComparableArrayList(); - - // we need to import the receiver itself - imports.add(receiver); + ComparableArrayList methods = new ComparableArrayList(); // look through and locate our receiver methods Method[] methdecls = receiver.getDeclaredMethods(); @@ -89,14 +83,12 @@ public class GenReceiverTask extends InvocationTask // Adjust any bits that want to import arrays to instead import their element classes. imports.translateClassArrays(); imports.removeArrays(); - + // get rid of primitives and java.lang types imports.removeGlobals(); - generateSender(source, rname, rpackage, methods, - imports.toList().iterator()); - generateDecoder(source, rname, rpackage, methods, - imports.toList().iterator()); + generateSender(source, rname, rpackage, methods, imports.toList().iterator()); + generateDecoder(source, rname, rpackage, methods, imports.toList().iterator()); } protected void generateSender (File source, String rname, String rpackage,