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

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.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6679 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Jamie Doornbos
2011-07-06 22:09:19 +00:00
parent 8be7e992f0
commit 06d2b7d832
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/presents/tools/GenServiceTask.java
+7 -4
View File
@@ -327,7 +327,7 @@ public class GenServiceTask extends InvocationTask
// remove imports in our own package // remove imports in our own package
imports.removeSamePackage(mpackage); imports.removeSamePackage(mpackage);
ctx.put("importGroups", imports.toGroups()); ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
// now generate ActionScript versions of our marshaller // now generate ActionScript versions of our marshaller
@@ -362,7 +362,7 @@ public class GenServiceTask extends InvocationTask
// remove imports in our own package // remove imports in our own package
imports.removeSamePackage(mpackage); imports.removeSamePackage(mpackage);
ctx.put("importGroups", imports.toGroups()); ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
ctx.put("listener", listener); ctx.put("listener", listener);
String aslpath = _asroot + File.separator + mppath + String aslpath = _asroot + File.separator + mppath +
File.separator + mname + "_" + listener.getListenerName() + "Marshaller.as"; File.separator + mname + "_" + listener.getListenerName() + "Marshaller.as";
@@ -383,13 +383,16 @@ public class GenServiceTask extends InvocationTask
// change imports of Foo$Bar to Foo_Bar // change imports of Foo$Bar to Foo_Bar
imports.translateInnerClasses(); imports.translateInnerClasses();
// marshallers just use the built-in actionscript classes in place of byte, short, etc
imports.removeGlobals();
// convert java bases and primitives // convert java bases and primitives
ActionScriptUtils.convertBaseClasses(imports); ActionScriptUtils.convertBaseClasses(imports);
// remove imports in our own package // remove imports in our own package
imports.removeSamePackage(sdesc.spackage); imports.removeSamePackage(sdesc.spackage);
ctx.put("importGroups", imports.toGroups()); ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
ctx.put("package", sdesc.spackage); ctx.put("package", sdesc.spackage);
// make sure our service directory exists // make sure our service directory exists
@@ -421,7 +424,7 @@ public class GenServiceTask extends InvocationTask
// remove imports in our own package // remove imports in our own package
imports.removeSamePackage(sdesc.spackage); imports.removeSamePackage(sdesc.spackage);
ctx.put("importGroups", imports.toGroups()); ctx.put("importGroups", imports.toGroups(Arrays.asList("com.threerings")));
ctx.put("listener", listener); ctx.put("listener", listener);
String aslpath = _asroot + File.separator + sppath + File.separator + String aslpath = _asroot + File.separator + sppath + File.separator +