Unless I'm missing something, those bits of generated code don't need those extra imports.
I've rerun the code generators without those in vilya & yohoho and everything seems happy, so let's give it a whirl. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5225 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -24,7 +24,6 @@ package com.threerings.bureau.data;
|
|||||||
import com.threerings.bureau.client.BureauService;
|
import com.threerings.bureau.client.BureauService;
|
||||||
import com.threerings.presents.client.Client;
|
import com.threerings.presents.client.Client;
|
||||||
import com.threerings.presents.data.InvocationMarshaller;
|
import com.threerings.presents.data.InvocationMarshaller;
|
||||||
import com.threerings.presents.net.Transport;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the implementation of the {@link BureauService} interface
|
* Provides the implementation of the {@link BureauService} interface
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ package com.threerings.bureau.server;
|
|||||||
|
|
||||||
import com.threerings.bureau.data.BureauMarshaller;
|
import com.threerings.bureau.data.BureauMarshaller;
|
||||||
import com.threerings.presents.data.ClientObject;
|
import com.threerings.presents.data.ClientObject;
|
||||||
import com.threerings.presents.data.InvocationMarshaller;
|
|
||||||
import com.threerings.presents.server.InvocationDispatcher;
|
import com.threerings.presents.server.InvocationDispatcher;
|
||||||
import com.threerings.presents.server.InvocationException;
|
import com.threerings.presents.server.InvocationException;
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ package com.threerings.presents.server;
|
|||||||
|
|
||||||
import com.threerings.presents.client.TimeBaseService;
|
import com.threerings.presents.client.TimeBaseService;
|
||||||
import com.threerings.presents.data.ClientObject;
|
import com.threerings.presents.data.ClientObject;
|
||||||
import com.threerings.presents.data.InvocationMarshaller;
|
|
||||||
import com.threerings.presents.data.TimeBaseMarshaller;
|
import com.threerings.presents.data.TimeBaseMarshaller;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -111,7 +111,6 @@ public class GenReceiverTask extends InvocationTask
|
|||||||
CollectionUtil.addAll(implist, imports);
|
CollectionUtil.addAll(implist, imports);
|
||||||
checkedAdd(implist, ClientObject.class.getName());
|
checkedAdd(implist, ClientObject.class.getName());
|
||||||
checkedAdd(implist, InvocationSender.class.getName());
|
checkedAdd(implist, InvocationSender.class.getName());
|
||||||
checkedAdd(implist, Transport.class.getName());
|
|
||||||
String dname = StringUtil.replace(rname, "Receiver", "Decoder");
|
String dname = StringUtil.replace(rname, "Receiver", "Decoder");
|
||||||
checkedAdd(implist, rpackage + "." + dname);
|
checkedAdd(implist, rpackage + "." + dname);
|
||||||
implist.sort();
|
implist.sort();
|
||||||
|
|||||||
@@ -176,7 +176,6 @@ public class GenServiceTask extends InvocationTask
|
|||||||
imports.add(sdesc.service);
|
imports.add(sdesc.service);
|
||||||
imports.add(Client.class);
|
imports.add(Client.class);
|
||||||
imports.add(InvocationMarshaller.class);
|
imports.add(InvocationMarshaller.class);
|
||||||
imports.add(Transport.class);
|
|
||||||
|
|
||||||
// if any listeners are to be present, they need the response event
|
// if any listeners are to be present, they need the response event
|
||||||
if (sdesc.listeners.size() > 0) {
|
if (sdesc.listeners.size() > 0) {
|
||||||
@@ -467,7 +466,6 @@ public class GenServiceTask extends InvocationTask
|
|||||||
imports.remove(Client.class);
|
imports.remove(Client.class);
|
||||||
|
|
||||||
// add some classes required for all dispatchers
|
// add some classes required for all dispatchers
|
||||||
imports.add(InvocationMarshaller.class);
|
|
||||||
imports.add(InvocationDispatcher.class);
|
imports.add(InvocationDispatcher.class);
|
||||||
imports.add(InvocationException.class);
|
imports.add(InvocationException.class);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user