From ef4ee0ac1efdf4313f6e671992beb02162a80129 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Tue, 27 Jan 2009 01:45:19 +0000 Subject: [PATCH] Let's teach GenReceiverTask to cope with inner classes the same way GenServiceTask already does. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5643 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/client/InvocationDecoder.java | 2 +- src/java/com/threerings/presents/tools/GenReceiverTask.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/java/com/threerings/presents/client/InvocationDecoder.java b/src/java/com/threerings/presents/client/InvocationDecoder.java index cbca8589a..07b9abcc0 100644 --- a/src/java/com/threerings/presents/client/InvocationDecoder.java +++ b/src/java/com/threerings/presents/client/InvocationDecoder.java @@ -28,7 +28,7 @@ import static com.threerings.presents.Log.log; */ public abstract class InvocationDecoder { - /** The receiver for which we're decoding and dipatching notifications. */ + /** The receiver for which we're decoding and dispatching notifications. */ public InvocationReceiver receiver; /** diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java index 8636fcc65..8f42563bd 100644 --- a/src/java/com/threerings/presents/tools/GenReceiverTask.java +++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java @@ -79,6 +79,9 @@ public class GenReceiverTask extends InvocationTask } methods.sort(); + // import Foo instead of Foo$Bar + imports.swapInnerClassesForParents(); + // Adjust any bits that want to import arrays to instead import their element classes. imports.translateClassArrays(); imports.removeArrays();