Parameterize InvocationService on the ClientObject type expected to call the service, and generate

InvocationProviders that take that type instead of just ClientObject.

Also, use the full set of import groupings no matter what. If that's the way we like it, that's the
way we like it.



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

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

@@ -14,7 +14,7 @@ import {{this}};
  * to the requesting client.
  */
 {{generated}}
-public class {{name}}Marshaller extends InvocationMarshaller
+public class {{name}}Marshaller extends InvocationMarshaller{{typeParameters}}
     implements {{name}}Service
 {
 {{#listeners}}

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

@@ -19,7 +19,7 @@ public interface {{name}}Provider extends InvocationProvider
     /**
      * Handles a {@link {{name}}Service#{{method.name}}} request.
      */
-    {{typeParams}}void {{method.name}} (ClientObject caller{{#hasArgs}}, {{/hasArgs}}{{getArgList}}){{^listenerArgs.isEmpty}}
+    {{typeParams}}void {{method.name}} ({{callerType}} caller{{#hasArgs}}, {{/hasArgs}}{{getArgList}}){{^listenerArgs.isEmpty}}
 
         throws InvocationException{{/listenerArgs.isEmpty}};
 {{/methods}}