From e532378ce48a8c17b0b21e44759f87f4ca86d91d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 5 Oct 2006 20:38:11 +0000 Subject: [PATCH] We need InvocationService inner-listeners in our raw imports because those aren't magically in scope for ActionScript, we have to generate import statements for them. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4414 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/tools/InvocationTask.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java index 1658e78e2..7938ed169 100644 --- a/src/java/com/threerings/presents/tools/InvocationTask.java +++ b/src/java/com/threerings/presents/tools/InvocationTask.java @@ -126,13 +126,12 @@ public abstract class InvocationTask extends Task // InvocationService listeners, we need to import its // marshaller as well String sname = GenUtil.simpleName(arg, null); - if (_ilistener.isAssignableFrom(arg) && - !sname.startsWith("InvocationService")) { + if (_ilistener.isAssignableFrom(arg)) { String mname = arg.getName(); mname = StringUtil.replace(mname, "Service", "Marshaller"); mname = StringUtil.replace(mname, "Listener", "Marshaller"); mname = StringUtil.replace(mname, ".client.", ".data."); - if (!samepkg) { + if (!samepkg && !sname.startsWith("InvocationService")) { imports.put(importify(mname), Boolean.TRUE); } if (rawimports != null) {