From 127e38834906384d8a5c7bb23e67622da1c8c99a Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 31 Dec 2010 22:36:46 +0000 Subject: [PATCH] Unused import nixage. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6400 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/main/java/com/threerings/admin/client/AdminService.java | 1 - src/main/java/com/threerings/admin/data/AdminMarshaller.java | 1 - .../java/com/threerings/admin/web/client/ConfigEditorPanel.java | 1 - src/main/java/com/threerings/bureau/client/BureauService.java | 1 - src/main/java/com/threerings/bureau/data/BureauMarshaller.java | 1 - .../com/threerings/crowd/chat/client/ChannelSpeakService.java | 1 - src/main/java/com/threerings/crowd/chat/client/ChatService.java | 1 - .../java/com/threerings/crowd/chat/client/SpeakService.java | 1 - .../com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java | 1 - .../java/com/threerings/crowd/chat/data/ChatMarshaller.java | 1 - .../java/com/threerings/crowd/chat/data/SpeakMarshaller.java | 1 - src/main/java/com/threerings/crowd/client/BodyService.java | 1 - src/main/java/com/threerings/crowd/client/LocationService.java | 1 - src/main/java/com/threerings/crowd/data/BodyMarshaller.java | 1 - src/main/java/com/threerings/crowd/data/LocationMarshaller.java | 1 - .../java/com/threerings/crowd/peer/client/CrowdPeerService.java | 1 - .../com/threerings/crowd/peer/data/CrowdPeerMarshaller.java | 1 - src/main/java/com/threerings/io/ObjectOutputStream.java | 1 - src/main/java/com/threerings/nio/PolicyServer.java | 1 - src/main/java/com/threerings/nio/conman/ConnectionManager.java | 1 - .../com/threerings/nio/conman/ServerSocketChannelAcceptor.java | 1 - .../com/threerings/presents/client/RegistrationService.java | 1 - .../com/threerings/presents/data/RegistrationMarshaller.java | 1 - .../java/com/threerings/presents/data/TimeBaseMarshaller.java | 1 - .../java/com/threerings/presents/peer/client/PeerService.java | 1 - .../java/com/threerings/presents/peer/data/PeerMarshaller.java | 1 - src/main/java/com/threerings/presents/tools/GenTask.java | 1 - src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java | 1 - src/main/java/com/threerings/util/MethodProfiler.java | 2 -- src/test/java/com/threerings/presents/data/TestMarshaller.java | 1 - 30 files changed, 31 deletions(-) diff --git a/src/main/java/com/threerings/admin/client/AdminService.java b/src/main/java/com/threerings/admin/client/AdminService.java index b3632ecf9..1334bc1d2 100644 --- a/src/main/java/com/threerings/admin/client/AdminService.java +++ b/src/main/java/com/threerings/admin/client/AdminService.java @@ -21,7 +21,6 @@ package com.threerings.admin.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; /** diff --git a/src/main/java/com/threerings/admin/data/AdminMarshaller.java b/src/main/java/com/threerings/admin/data/AdminMarshaller.java index 6af22365a..27afda637 100644 --- a/src/main/java/com/threerings/admin/data/AdminMarshaller.java +++ b/src/main/java/com/threerings/admin/data/AdminMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.admin.data; import javax.annotation.Generated; import com.threerings.admin.client.AdminService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; diff --git a/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java b/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java index 112ae4ad7..04712a121 100644 --- a/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java +++ b/src/main/java/com/threerings/admin/web/client/ConfigEditorPanel.java @@ -40,7 +40,6 @@ import com.threerings.admin.web.gwt.ConfigService.ConfigurationResult; import com.threerings.admin.web.gwt.ConfigServiceAsync; import com.threerings.gwt.util.PopupCallback; - /** * The main panel of the configuration editor. All service calls are routed through here. * Subclass this class in your project. diff --git a/src/main/java/com/threerings/bureau/client/BureauService.java b/src/main/java/com/threerings/bureau/client/BureauService.java index 899dd1df5..c7b2a6382 100644 --- a/src/main/java/com/threerings/bureau/client/BureauService.java +++ b/src/main/java/com/threerings/bureau/client/BureauService.java @@ -21,7 +21,6 @@ package com.threerings.bureau.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; /** diff --git a/src/main/java/com/threerings/bureau/data/BureauMarshaller.java b/src/main/java/com/threerings/bureau/data/BureauMarshaller.java index 803685d03..9aca68bf1 100644 --- a/src/main/java/com/threerings/bureau/data/BureauMarshaller.java +++ b/src/main/java/com/threerings/bureau/data/BureauMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.bureau.data; import javax.annotation.Generated; import com.threerings.bureau.client.BureauService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; /** diff --git a/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java b/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java index e338193d8..90a19f605 100644 --- a/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java +++ b/src/main/java/com/threerings/crowd/chat/client/ChannelSpeakService.java @@ -21,7 +21,6 @@ package com.threerings.crowd.chat.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.crowd.chat.data.ChatChannel; diff --git a/src/main/java/com/threerings/crowd/chat/client/ChatService.java b/src/main/java/com/threerings/crowd/chat/client/ChatService.java index f60dcde10..dc1ba84e6 100644 --- a/src/main/java/com/threerings/crowd/chat/client/ChatService.java +++ b/src/main/java/com/threerings/crowd/chat/client/ChatService.java @@ -23,7 +23,6 @@ package com.threerings.crowd.chat.client; import com.threerings.util.Name; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; /** diff --git a/src/main/java/com/threerings/crowd/chat/client/SpeakService.java b/src/main/java/com/threerings/crowd/chat/client/SpeakService.java index adae900b7..710dedc22 100644 --- a/src/main/java/com/threerings/crowd/chat/client/SpeakService.java +++ b/src/main/java/com/threerings/crowd/chat/client/SpeakService.java @@ -21,7 +21,6 @@ package com.threerings.crowd.chat.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; /** diff --git a/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java index 63e80bb85..7832b162d 100644 --- a/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java +++ b/src/main/java/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.crowd.chat.data; import javax.annotation.Generated; import com.threerings.crowd.chat.client.ChannelSpeakService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; /** diff --git a/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java index a5c06ef19..563b51bdf 100644 --- a/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java +++ b/src/main/java/com/threerings/crowd/chat/data/ChatMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.crowd.chat.data; import javax.annotation.Generated; import com.threerings.crowd.chat.client.ChatService; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; diff --git a/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java index 560396e16..253d216e1 100644 --- a/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java +++ b/src/main/java/com/threerings/crowd/chat/data/SpeakMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.crowd.chat.data; import javax.annotation.Generated; import com.threerings.crowd.chat.client.SpeakService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; /** diff --git a/src/main/java/com/threerings/crowd/client/BodyService.java b/src/main/java/com/threerings/crowd/client/BodyService.java index 663f69a8b..132316503 100644 --- a/src/main/java/com/threerings/crowd/client/BodyService.java +++ b/src/main/java/com/threerings/crowd/client/BodyService.java @@ -21,7 +21,6 @@ package com.threerings.crowd.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; /** diff --git a/src/main/java/com/threerings/crowd/client/LocationService.java b/src/main/java/com/threerings/crowd/client/LocationService.java index f83655cc9..387f5b437 100644 --- a/src/main/java/com/threerings/crowd/client/LocationService.java +++ b/src/main/java/com/threerings/crowd/client/LocationService.java @@ -21,7 +21,6 @@ package com.threerings.crowd.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.crowd.data.PlaceConfig; diff --git a/src/main/java/com/threerings/crowd/data/BodyMarshaller.java b/src/main/java/com/threerings/crowd/data/BodyMarshaller.java index f79ee7956..2853a35c6 100644 --- a/src/main/java/com/threerings/crowd/data/BodyMarshaller.java +++ b/src/main/java/com/threerings/crowd/data/BodyMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.crowd.data; import javax.annotation.Generated; import com.threerings.crowd.client.BodyService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; /** diff --git a/src/main/java/com/threerings/crowd/data/LocationMarshaller.java b/src/main/java/com/threerings/crowd/data/LocationMarshaller.java index 27056f26c..b7fd8926f 100644 --- a/src/main/java/com/threerings/crowd/data/LocationMarshaller.java +++ b/src/main/java/com/threerings/crowd/data/LocationMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.crowd.data; import javax.annotation.Generated; import com.threerings.crowd.client.LocationService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; diff --git a/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java b/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java index 5c2d04822..74f192da7 100644 --- a/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java +++ b/src/main/java/com/threerings/crowd/peer/client/CrowdPeerService.java @@ -23,7 +23,6 @@ package com.threerings.crowd.peer.client; import com.threerings.util.Name; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.crowd.chat.client.ChatService; diff --git a/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java b/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java index 5ae810b67..55f0752b8 100644 --- a/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java +++ b/src/main/java/com/threerings/crowd/peer/data/CrowdPeerMarshaller.java @@ -27,7 +27,6 @@ import com.threerings.crowd.chat.client.ChatService; import com.threerings.crowd.chat.data.ChatMarshaller; import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.peer.client.CrowdPeerService; -import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.util.Name; diff --git a/src/main/java/com/threerings/io/ObjectOutputStream.java b/src/main/java/com/threerings/io/ObjectOutputStream.java index c81c02d1a..82d8591e5 100644 --- a/src/main/java/com/threerings/io/ObjectOutputStream.java +++ b/src/main/java/com/threerings/io/ObjectOutputStream.java @@ -321,7 +321,6 @@ public class ObjectOutputStream extends DataOutputStream write(baos.toByteArray()); } - /** Used to map classes to numeric codes and the {@link Streamer} instance used to write * them. */ protected Map, ClassMapping> _classmap; diff --git a/src/main/java/com/threerings/nio/PolicyServer.java b/src/main/java/com/threerings/nio/PolicyServer.java index 264aef199..4375c37fd 100644 --- a/src/main/java/com/threerings/nio/PolicyServer.java +++ b/src/main/java/com/threerings/nio/PolicyServer.java @@ -87,7 +87,6 @@ public class PolicyServer extends ConnectionManager } } - @Override protected void didShutdown () { diff --git a/src/main/java/com/threerings/nio/conman/ConnectionManager.java b/src/main/java/com/threerings/nio/conman/ConnectionManager.java index d81853eef..5013ec6ec 100644 --- a/src/main/java/com/threerings/nio/conman/ConnectionManager.java +++ b/src/main/java/com/threerings/nio/conman/ConnectionManager.java @@ -159,7 +159,6 @@ public abstract class ConnectionManager extends LoopingThread _lastDebugStamp = iterStamp; } - // close any connections that have been queued up to die Connection dconn; while ((dconn = _deathq.getNonBlocking()) != null) { diff --git a/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java b/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java index cd2d6f636..b3826177e 100644 --- a/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java +++ b/src/main/java/com/threerings/nio/conman/ServerSocketChannelAcceptor.java @@ -94,7 +94,6 @@ public class ServerSocketChannelAcceptor } } - protected void acceptConnections (int port) throws IOException { diff --git a/src/main/java/com/threerings/presents/client/RegistrationService.java b/src/main/java/com/threerings/presents/client/RegistrationService.java index 5f979f849..9d541e496 100644 --- a/src/main/java/com/threerings/presents/client/RegistrationService.java +++ b/src/main/java/com/threerings/presents/client/RegistrationService.java @@ -1,6 +1,5 @@ package com.threerings.presents.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationReceiver.Registration; /** diff --git a/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java b/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java index 069b75831..2f51f6335 100644 --- a/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java +++ b/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java @@ -2,7 +2,6 @@ package com.threerings.presents.data; import javax.annotation.Generated; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationReceiver; import com.threerings.presents.client.RegistrationService; diff --git a/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java index fd8dd1bef..8d97d5f9f 100644 --- a/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java +++ b/src/main/java/com/threerings/presents/data/TimeBaseMarshaller.java @@ -23,7 +23,6 @@ package com.threerings.presents.data; import javax.annotation.Generated; -import com.threerings.presents.client.Client; import com.threerings.presents.client.TimeBaseService; import com.threerings.presents.dobj.InvocationResponseEvent; diff --git a/src/main/java/com/threerings/presents/peer/client/PeerService.java b/src/main/java/com/threerings/presents/peer/client/PeerService.java index 0aa73960a..d8fd83a42 100644 --- a/src/main/java/com/threerings/presents/peer/client/PeerService.java +++ b/src/main/java/com/threerings/presents/peer/client/PeerService.java @@ -21,7 +21,6 @@ package com.threerings.presents.peer.client; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.peer.data.NodeObject.Lock; diff --git a/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java b/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java index 02fc77882..45fffc531 100644 --- a/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java +++ b/src/main/java/com/threerings/presents/peer/data/PeerMarshaller.java @@ -23,7 +23,6 @@ package com.threerings.presents.peer.data; import javax.annotation.Generated; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.peer.client.PeerService; diff --git a/src/main/java/com/threerings/presents/tools/GenTask.java b/src/main/java/com/threerings/presents/tools/GenTask.java index faac87c63..5810e420f 100644 --- a/src/main/java/com/threerings/presents/tools/GenTask.java +++ b/src/main/java/com/threerings/presents/tools/GenTask.java @@ -51,7 +51,6 @@ import com.google.common.io.Files; import com.samskivert.io.StreamUtil; import com.samskivert.mustache.Mustache; - public abstract class GenTask extends Task { /** diff --git a/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java b/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java index aaf641f9d..71025cba1 100644 --- a/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java +++ b/src/main/java/com/threerings/presents/tools/cpp/CPPUtil.java @@ -86,7 +86,6 @@ public class CPPUtil return new File(root, makePath(klass, ext)).getAbsolutePath(); } - public static String makePath (File root, List namespaces, String className, String ext) { return new File(root, makePath(namespaces, className, ext)).getAbsolutePath(); diff --git a/src/main/java/com/threerings/util/MethodProfiler.java b/src/main/java/com/threerings/util/MethodProfiler.java index 26568dc38..488cade01 100644 --- a/src/main/java/com/threerings/util/MethodProfiler.java +++ b/src/main/java/com/threerings/util/MethodProfiler.java @@ -315,8 +315,6 @@ public class MethodProfiler log.info(name, "results", toResult(stats)); } - - /** * Calculates the results of the the profile. */ diff --git a/src/test/java/com/threerings/presents/data/TestMarshaller.java b/src/test/java/com/threerings/presents/data/TestMarshaller.java index 22eebc9cd..b1dc1fa90 100644 --- a/src/test/java/com/threerings/presents/data/TestMarshaller.java +++ b/src/test/java/com/threerings/presents/data/TestMarshaller.java @@ -23,7 +23,6 @@ package com.threerings.presents.data; import javax.annotation.Generated; -import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.TestService; import com.threerings.presents.dobj.InvocationResponseEvent;