From 06d2b7d8323f486fb12b1acf7eb9c4817b4748c1 Mon Sep 17 00:00:00 2001
From: Jamie Doornbos <jamie@threerings.net>
Date: Wed, 6 Jul 2011 22:09:19 +0000
Subject: [PATCH] More tweaks to support (less-standard) ooo import style. This
 is getting pretty ugly and probably should be converted to us the new
 generated haeder markers.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6679 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/presents/tools/GenServiceTask.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/threerings/presents/tools/GenServiceTask.java b/src/main/java/com/threerings/presents/tools/GenServiceTask.java
index 47bdd7776..160c24968 100644
--- a/src/main/java/com/threerings/presents/tools/GenServiceTask.java
+++ b/src/main/java/com/threerings/presents/tools/GenServiceTask.java
@@ -327,7 +327,7 @@ public class GenServiceTask extends InvocationTask
         // remove imports in our own package
         imports.removeSamePackage(mpackage);
 
-        ctx.put("importGroups", imports.toGroups());
+        ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
 
         // now generate ActionScript versions of our marshaller
 
@@ -362,7 +362,7 @@ public class GenServiceTask extends InvocationTask
             // remove imports in our own package
             imports.removeSamePackage(mpackage);
 
-            ctx.put("importGroups", imports.toGroups());
+            ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
             ctx.put("listener", listener);
             String aslpath = _asroot + File.separator + mppath +
                 File.separator + mname + "_" + listener.getListenerName() + "Marshaller.as";
@@ -383,13 +383,16 @@ public class GenServiceTask extends InvocationTask
         // change imports of Foo$Bar to Foo_Bar
         imports.translateInnerClasses();
 
+        // marshallers just use the built-in actionscript classes in place of byte, short, etc
+        imports.removeGlobals();
+
         // convert java bases and primitives
         ActionScriptUtils.convertBaseClasses(imports);
 
         // remove imports in our own package
         imports.removeSamePackage(sdesc.spackage);
 
-        ctx.put("importGroups", imports.toGroups());
+        ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
         ctx.put("package", sdesc.spackage);
 
         // make sure our service directory exists
@@ -421,7 +424,7 @@ public class GenServiceTask extends InvocationTask
             // remove imports in our own package
             imports.removeSamePackage(sdesc.spackage);
 
-            ctx.put("importGroups", imports.toGroups());
+            ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
             ctx.put("listener", listener);
 
             String aslpath = _asroot + File.separator + sppath + File.separator +