Various tweaks to get import ordering to match the ooo convention of putting java and javax imports first, then threerings imports.

* Add importGroups template variable, set to the two groups: one for java, one for threerings.
* Omit Client import the client-side generated code. This was removed some time ago.
* Omit the blanket int -> Integer replacement, this was only needed for the marshaller
* Add the as boxing imports when generating the marshaller (this gets the Integer import for int types in marshaller signatures)
* Change the templates to put space between each group of imports.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6677 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/main/resources/com/threerings/presents/tools/marshaller.tmpl

@@ -1,11 +1,11 @@
 package {{package}};
 
-import javax.annotation.Generated;
-
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * Provides the implementation of the {@link {{name}}Service} interface
  * that marshalls the arguments and delivers the request to the provider

src/main/resources/com/threerings/presents/tools/marshaller_as.tmpl

@@ -1,9 +1,11 @@
 package {{package}} {
 
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * Provides the implementation of the <code>{{name}}Service</code> interface
  * that marshalls the arguments and delivers the request to the provider

src/main/resources/com/threerings/presents/tools/marshaller_listener_as.tmpl

@@ -1,9 +1,11 @@
 package {{package}} {
 
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * Marshalls instances of the {{name}}Service_{{listener.listenerName}}Marshaller interface.
  */

src/main/resources/com/threerings/presents/tools/provider.tmpl

@@ -1,11 +1,11 @@
 package {{package}};
 
-import javax.annotation.Generated;
-
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * Defines the server-side of the {@link {{name}}Service}.
  */

src/main/resources/com/threerings/presents/tools/service_as.tmpl

@@ -1,9 +1,11 @@
 package {{package}} {
 
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * An ActionScript version of the Java {{name}}Service interface.
  */

src/main/resources/com/threerings/presents/tools/service_listener_adapter_as.tmpl

@@ -1,9 +1,11 @@
 package {{package}} {
 
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * A functional adapter for the {{name}}Service_{{listener.listenerName}}Listener interface.
  */

src/main/resources/com/threerings/presents/tools/service_listener_as.tmpl

@@ -1,9 +1,11 @@
 package {{package}} {
 
-{{#imports}}
+{{#importGroups}}
+{{#this}}
 import {{this}};
-{{/imports}}
+{{/this}}
 
+{{/importGroups}}
 /**
  * An ActionScript version of the Java {{name}}Service_{{listener.listenerName}}Listener interface.
  */