From 1578adceb1da313885e41d2a0da0bfca7659cc50 Mon Sep 17 00:00:00 2001
From: Dave Hoover <dhoover@threerings.net>
Date: Thu, 10 Jul 2008 18:39:29 +0000
Subject: [PATCH] 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
---
 src/java/com/threerings/bureau/data/BureauMarshaller.java       | 1 -
 src/java/com/threerings/bureau/server/BureauDispatcher.java     | 1 -
 src/java/com/threerings/presents/server/TimeBaseDispatcher.java | 1 -
 src/java/com/threerings/presents/tools/GenReceiverTask.java     | 1 -
 src/java/com/threerings/presents/tools/GenServiceTask.java      | 2 --
 5 files changed, 6 deletions(-)

diff --git a/src/java/com/threerings/bureau/data/BureauMarshaller.java b/src/java/com/threerings/bureau/data/BureauMarshaller.java
index d7cda856a..1b8c4e8a8 100644
--- a/src/java/com/threerings/bureau/data/BureauMarshaller.java
+++ b/src/java/com/threerings/bureau/data/BureauMarshaller.java
@@ -24,7 +24,6 @@ package com.threerings.bureau.data;
 import com.threerings.bureau.client.BureauService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link BureauService} interface
diff --git a/src/java/com/threerings/bureau/server/BureauDispatcher.java b/src/java/com/threerings/bureau/server/BureauDispatcher.java
index 6d223399f..292ffcf4d 100644
--- a/src/java/com/threerings/bureau/server/BureauDispatcher.java
+++ b/src/java/com/threerings/bureau/server/BureauDispatcher.java
@@ -23,7 +23,6 @@ package com.threerings.bureau.server;
 
 import com.threerings.bureau.data.BureauMarshaller;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
index 62fbf0e7f..aae12a382 100644
--- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
+++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
@@ -23,7 +23,6 @@ package com.threerings.presents.server;
 
 import com.threerings.presents.client.TimeBaseService;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.TimeBaseMarshaller;
 
 /**
diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java
index 25938c129..149bf4d24 100644
--- a/src/java/com/threerings/presents/tools/GenReceiverTask.java
+++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java
@@ -111,7 +111,6 @@ public class GenReceiverTask extends InvocationTask
         CollectionUtil.addAll(implist, imports);
         checkedAdd(implist, ClientObject.class.getName());
         checkedAdd(implist, InvocationSender.class.getName());
-        checkedAdd(implist, Transport.class.getName());
         String dname = StringUtil.replace(rname, "Receiver", "Decoder");
         checkedAdd(implist, rpackage + "." + dname);
         implist.sort();
diff --git a/src/java/com/threerings/presents/tools/GenServiceTask.java b/src/java/com/threerings/presents/tools/GenServiceTask.java
index 65a638b39..ac7350ceb 100644
--- a/src/java/com/threerings/presents/tools/GenServiceTask.java
+++ b/src/java/com/threerings/presents/tools/GenServiceTask.java
@@ -176,7 +176,6 @@ public class GenServiceTask extends InvocationTask
         imports.add(sdesc.service);
         imports.add(Client.class);
         imports.add(InvocationMarshaller.class);
-        imports.add(Transport.class);
 
         // if any listeners are to be present, they need the response event
         if (sdesc.listeners.size() > 0) {
@@ -467,7 +466,6 @@ public class GenServiceTask extends InvocationTask
         imports.remove(Client.class);
 
         // add some classes required for all dispatchers
-        imports.add(InvocationMarshaller.class);
         imports.add(InvocationDispatcher.class);
         imports.add(InvocationException.class);