From 657aafaedb60201d49014fe20a04264f9d424632 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Fri, 26 Sep 2008 17:35:29 +0000 Subject: [PATCH] And of course, if I were thinking this morning, I would've rerun the organize imports thing before committing instead of just going "oh yeah, I've been having this stuff sitting around uncommitted for a while waiting on it to be blessed" and missing out on things that'd changed in the meantime. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5400 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/admin/client/FieldEditor.java | 3 ++- .../threerings/admin/server/ConfigRegistry.java | 8 +++++--- .../threerings/bureau/server/BureauRegistry.java | 3 ++- .../crowd/chat/server/ChatChannelManager.java | 8 ++++---- .../threerings/crowd/client/PlaceController.java | 3 ++- src/java/com/threerings/io/BasicStreamers.java | 5 +++-- .../com/threerings/io/ByteBufferInputStream.java | 1 + .../threerings/io/ByteBufferOutputStream.java | 1 + src/java/com/threerings/io/FieldMarshaller.java | 1 + .../com/threerings/io/FramedInputStream.java | 1 + .../com/threerings/io/ObjectInputStream.java | 5 +++-- .../com/threerings/io/ObjectOutputStream.java | 5 +++-- src/java/com/threerings/io/Streamer.java | 4 +++- .../io/UnreliableObjectOutputStream.java | 5 +++-- .../presents/client/BlockingCommunicator.java | 10 ++++++---- .../presents/client/ClientCommunicator.java | 4 +++- .../presents/client/ClientDObjectMgr.java | 3 ++- .../com/threerings/presents/dobj/DObject.java | 1 + src/java/com/threerings/presents/dobj/DSet.java | 3 ++- .../presents/dobj/DynamicListener.java | 1 + .../com/threerings/presents/net/AuthRequest.java | 3 ++- .../presents/peer/server/PeerManager.java | 5 +++-- .../presents/peer/server/PeerNode.java | 1 + .../peer/server/persist/NodeRepository.java | 1 + .../threerings/presents/peer/util/PeerUtil.java | 1 + .../presents/server/ClientManager.java | 3 ++- .../presents/server/PresentsClient.java | 4 +++- .../presents/server/PresentsDObjectMgr.java | 1 + .../presents/server/net/AuthingConnection.java | 1 + .../presents/server/net/Connection.java | 10 ++++++---- .../presents/server/net/ConnectionManager.java | 15 +++++++++------ .../presents/server/net/RunningConnection.java | 1 + .../presents/tools/ActionScriptSource.java | 16 +++++++++------- .../tools/GenActionScriptBundlesTask.java | 9 +++++---- .../presents/tools/GenActionScriptTask.java | 8 +++++--- .../presents/tools/GenDObjectTask.java | 8 +++++--- .../presents/tools/GenReceiverTask.java | 6 ++++-- .../presents/tools/GenServiceTask.java | 6 ++++-- .../presents/tools/GenStreamableTask.java | 6 ++++-- .../com/threerings/presents/tools/GenUtil.java | 10 ++++++---- .../presents/tools/InstrumentStreamableTask.java | 5 +++-- .../presents/tools/InvocationTask.java | 8 +++++--- .../threerings/presents/tools/SourceFile.java | 3 ++- .../com/threerings/presents/util/ClassUtil.java | 1 + .../presents/util/DatagramSequencer.java | 3 ++- src/java/com/threerings/util/MessageBundle.java | 3 ++- .../com/threerings/util/StreamableArrayList.java | 3 ++- .../com/threerings/util/StreamableEnumSet.java | 3 ++- .../com/threerings/util/StreamableHashMap.java | 3 ++- .../com/threerings/util/StreamableHashSet.java | 3 ++- .../threerings/crowd/client/JabberClient.java | 3 ++- tests/src/java/com/threerings/io/FrameTest.java | 1 + 52 files changed, 148 insertions(+), 81 deletions(-) diff --git a/src/java/com/threerings/admin/client/FieldEditor.java b/src/java/com/threerings/admin/client/FieldEditor.java index b08d86824..cc999c71f 100644 --- a/src/java/com/threerings/admin/client/FieldEditor.java +++ b/src/java/com/threerings/admin/client/FieldEditor.java @@ -21,12 +21,13 @@ package com.threerings.admin.client; +import java.lang.reflect.Field; + import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import java.lang.reflect.Field; import javax.swing.BorderFactory; import javax.swing.JLabel; diff --git a/src/java/com/threerings/admin/server/ConfigRegistry.java b/src/java/com/threerings/admin/server/ConfigRegistry.java index bff9390bc..23e74d494 100644 --- a/src/java/com/threerings/admin/server/ConfigRegistry.java +++ b/src/java/com/threerings/admin/server/ConfigRegistry.java @@ -21,12 +21,14 @@ package com.threerings.admin.server; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +import java.util.HashMap; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.HashMap; import com.samskivert.io.ByteArrayOutInputStream; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/bureau/server/BureauRegistry.java b/src/java/com/threerings/bureau/server/BureauRegistry.java index 31346f352..d42194273 100644 --- a/src/java/com/threerings/bureau/server/BureauRegistry.java +++ b/src/java/com/threerings/bureau/server/BureauRegistry.java @@ -21,10 +21,11 @@ package com.threerings.bureau.server; -import java.io.IOException; import java.util.Map; import java.util.Set; +import java.io.IOException; + import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.inject.Inject; diff --git a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java index 7140c05b9..28861267b 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java +++ b/src/java/com/threerings/crowd/chat/server/ChatChannelManager.java @@ -34,6 +34,7 @@ import com.google.inject.Singleton; import com.samskivert.util.ArrayIntSet; import com.samskivert.util.IntSet; import com.samskivert.util.Interval; + import com.threerings.util.Name; import com.threerings.presents.annotation.AnyThread; @@ -45,16 +46,15 @@ import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.PresentsDObjectMgr; import com.threerings.presents.server.ShutdownManager; +import com.threerings.crowd.chat.data.ChatChannel; +import com.threerings.crowd.chat.data.ChatCodes; +import com.threerings.crowd.chat.data.UserMessage; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.CrowdCodes; import com.threerings.crowd.peer.data.CrowdClientInfo; import com.threerings.crowd.peer.data.CrowdNodeObject; import com.threerings.crowd.peer.server.CrowdPeerManager; -import com.threerings.crowd.chat.data.ChatChannel; -import com.threerings.crowd.chat.data.ChatCodes; -import com.threerings.crowd.chat.data.UserMessage; - import static com.threerings.crowd.Log.log; /** diff --git a/src/java/com/threerings/crowd/client/PlaceController.java b/src/java/com/threerings/crowd/client/PlaceController.java index 150af39e0..50796af4e 100644 --- a/src/java/com/threerings/crowd/client/PlaceController.java +++ b/src/java/com/threerings/crowd/client/PlaceController.java @@ -21,9 +21,10 @@ package com.threerings.crowd.client; -import java.awt.event.ActionEvent; import java.util.ArrayList; +import java.awt.event.ActionEvent; + import com.samskivert.swing.Controller; import com.threerings.crowd.data.PlaceConfig; diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/java/com/threerings/io/BasicStreamers.java index 26293eba8..cf6b767cc 100644 --- a/src/java/com/threerings/io/BasicStreamers.java +++ b/src/java/com/threerings/io/BasicStreamers.java @@ -21,12 +21,13 @@ package com.threerings.io; -import java.io.EOFException; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.RandomAccess; +import java.io.EOFException; +import java.io.IOException; + /** * Code to read and write basic object types (like arrays of primitives, {@link Integer} instances, * {@link Double} instances, etc.). diff --git a/src/java/com/threerings/io/ByteBufferInputStream.java b/src/java/com/threerings/io/ByteBufferInputStream.java index 35e57e8ce..f6a22bda3 100644 --- a/src/java/com/threerings/io/ByteBufferInputStream.java +++ b/src/java/com/threerings/io/ByteBufferInputStream.java @@ -5,6 +5,7 @@ package com.threerings.io; import java.io.IOException; import java.io.InputStream; + import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.InvalidMarkException; diff --git a/src/java/com/threerings/io/ByteBufferOutputStream.java b/src/java/com/threerings/io/ByteBufferOutputStream.java index 44bf7e218..913d9732e 100644 --- a/src/java/com/threerings/io/ByteBufferOutputStream.java +++ b/src/java/com/threerings/io/ByteBufferOutputStream.java @@ -4,6 +4,7 @@ package com.threerings.io; import java.io.OutputStream; + import java.nio.BufferOverflowException; import java.nio.ByteBuffer; diff --git a/src/java/com/threerings/io/FieldMarshaller.java b/src/java/com/threerings/io/FieldMarshaller.java index 348aae8a0..a6085d253 100644 --- a/src/java/com/threerings/io/FieldMarshaller.java +++ b/src/java/com/threerings/io/FieldMarshaller.java @@ -24,6 +24,7 @@ package com.threerings.io; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ReflectPermission; + import java.util.Date; import java.util.HashMap; diff --git a/src/java/com/threerings/io/FramedInputStream.java b/src/java/com/threerings/io/FramedInputStream.java index 6580a71f1..4f496ec26 100644 --- a/src/java/com/threerings/io/FramedInputStream.java +++ b/src/java/com/threerings/io/FramedInputStream.java @@ -24,6 +24,7 @@ package com.threerings.io; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; + import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; diff --git a/src/java/com/threerings/io/ObjectInputStream.java b/src/java/com/threerings/io/ObjectInputStream.java index da32d0632..b4d25b43e 100644 --- a/src/java/com/threerings/io/ObjectInputStream.java +++ b/src/java/com/threerings/io/ObjectInputStream.java @@ -21,11 +21,12 @@ package com.threerings.io; +import java.util.ArrayList; +import java.util.HashMap; + import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/io/ObjectOutputStream.java b/src/java/com/threerings/io/ObjectOutputStream.java index 2719f8fe7..22d7e985c 100644 --- a/src/java/com/threerings/io/ObjectOutputStream.java +++ b/src/java/com/threerings/io/ObjectOutputStream.java @@ -21,11 +21,12 @@ package com.threerings.io; +import java.util.HashMap; +import java.util.Map; + import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.util.HashMap; -import java.util.Map; import static com.threerings.NaryaLog.log; diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java index 97b4ccb16..a2afca583 100644 --- a/src/java/com/threerings/io/Streamer.java +++ b/src/java/com/threerings/io/Streamer.java @@ -21,7 +21,6 @@ package com.threerings.io; -import java.io.IOException; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -30,10 +29,13 @@ import java.lang.reflect.Modifier; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; + import java.util.HashMap; import java.util.List; import java.util.Map; +import java.io.IOException; + import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/src/java/com/threerings/io/UnreliableObjectOutputStream.java b/src/java/com/threerings/io/UnreliableObjectOutputStream.java index a4b15f636..8b2c1b3c8 100644 --- a/src/java/com/threerings/io/UnreliableObjectOutputStream.java +++ b/src/java/com/threerings/io/UnreliableObjectOutputStream.java @@ -3,12 +3,13 @@ package com.threerings.io; -import java.io.IOException; -import java.io.OutputStream; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import java.io.IOException; +import java.io.OutputStream; + /** * Extends {@link ObjectOutputStream} for use in unreliable channels, where we must transmit class * mappings with every object until we are explicitly notified that the receiver has cached the diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java index 46cf7d365..e70d71f19 100644 --- a/src/java/com/threerings/presents/client/BlockingCommunicator.java +++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java @@ -21,19 +21,21 @@ package com.threerings.presents.client; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + import java.io.EOFException; import java.io.IOException; import java.io.InterruptedIOException; -import java.net.InetAddress; -import java.net.InetSocketAddress; + import java.nio.ByteBuffer; import java.nio.channels.AsynchronousCloseException; import java.nio.channels.DatagramChannel; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import com.samskivert.util.LoopingThread; import com.samskivert.util.Queue; diff --git a/src/java/com/threerings/presents/client/ClientCommunicator.java b/src/java/com/threerings/presents/client/ClientCommunicator.java index bad7e9c19..e776c58c3 100644 --- a/src/java/com/threerings/presents/client/ClientCommunicator.java +++ b/src/java/com/threerings/presents/client/ClientCommunicator.java @@ -21,10 +21,12 @@ package com.threerings.presents.client; -import java.io.IOException; import java.net.ConnectException; import java.net.InetAddress; import java.net.InetSocketAddress; + +import java.io.IOException; + import java.nio.channels.SocketChannel; import com.samskivert.util.IntListUtil; diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index 3066a69f0..89be03361 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -21,12 +21,13 @@ package com.threerings.presents.client; -import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.awt.event.KeyEvent; + import com.samskivert.util.DebugChords; import com.samskivert.util.HashIntMap; import com.samskivert.util.IntMap; diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index e2112a648..18dcf0497 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -22,6 +22,7 @@ package com.threerings.presents.dobj; import java.lang.reflect.Field; + import java.util.Arrays; import java.util.Comparator; import java.util.Map; diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java index f04bb4a50..8d76fc761 100644 --- a/src/java/com/threerings/presents/dobj/DSet.java +++ b/src/java/com/threerings/presents/dobj/DSet.java @@ -21,13 +21,14 @@ package com.threerings.presents.dobj; -import java.io.IOException; import java.util.AbstractSet; import java.util.Comparator; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Set; +import java.io.IOException; + import com.samskivert.util.ArrayUtil; import com.threerings.io.ObjectInputStream; diff --git a/src/java/com/threerings/presents/dobj/DynamicListener.java b/src/java/com/threerings/presents/dobj/DynamicListener.java index b168d8aba..5b821e47e 100644 --- a/src/java/com/threerings/presents/dobj/DynamicListener.java +++ b/src/java/com/threerings/presents/dobj/DynamicListener.java @@ -22,6 +22,7 @@ package com.threerings.presents.dobj; import java.lang.reflect.Method; + import java.util.HashMap; import com.samskivert.util.MethodFinder; diff --git a/src/java/com/threerings/presents/net/AuthRequest.java b/src/java/com/threerings/presents/net/AuthRequest.java index a7126e037..f5b492e16 100644 --- a/src/java/com/threerings/presents/net/AuthRequest.java +++ b/src/java/com/threerings/presents/net/AuthRequest.java @@ -21,9 +21,10 @@ package com.threerings.presents.net; -import java.io.IOException; import java.util.TimeZone; +import java.io.IOException; + import com.threerings.io.ObjectInputStream; /** diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 8aef35179..80bf6dfeb 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -21,11 +21,12 @@ package com.threerings.presents.peer.server; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.util.List; import java.util.Map; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + import com.google.common.base.Function; import com.google.common.collect.Maps; import com.google.inject.Inject; diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/java/com/threerings/presents/peer/server/PeerNode.java index b8ae32a27..348bd0058 100644 --- a/src/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/java/com/threerings/presents/peer/server/PeerNode.java @@ -22,6 +22,7 @@ package com.threerings.presents.peer.server; import java.net.ConnectException; + import java.util.Date; import com.samskivert.util.ResultListenerList; diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java b/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java index e7f23770c..0cbccf0ab 100644 --- a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java +++ b/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java @@ -22,6 +22,7 @@ package com.threerings.presents.peer.server.persist; import java.sql.Timestamp; + import java.util.List; import java.util.Set; diff --git a/src/java/com/threerings/presents/peer/util/PeerUtil.java b/src/java/com/threerings/presents/peer/util/PeerUtil.java index db0ba22ba..479810153 100644 --- a/src/java/com/threerings/presents/peer/util/PeerUtil.java +++ b/src/java/com/threerings/presents/peer/util/PeerUtil.java @@ -24,6 +24,7 @@ package com.threerings.presents.peer.util; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; + import java.util.HashMap; import com.threerings.presents.client.Client; diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 27a9c1627..bc918aac4 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -21,11 +21,12 @@ package com.threerings.presents.server; -import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.io.IOException; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index c29d7d421..c773cce54 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -21,11 +21,13 @@ package com.threerings.presents.server; -import java.io.IOException; import java.net.InetAddress; + import java.util.Map; import java.util.TimeZone; +import java.io.IOException; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.inject.Inject; diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index f40ed253d..f0b0009e6 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -24,6 +24,7 @@ package com.threerings.presents.server; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; + import java.util.List; import java.util.Map; diff --git a/src/java/com/threerings/presents/server/net/AuthingConnection.java b/src/java/com/threerings/presents/server/net/AuthingConnection.java index f0b4d853c..a18c5faf9 100644 --- a/src/java/com/threerings/presents/server/net/AuthingConnection.java +++ b/src/java/com/threerings/presents/server/net/AuthingConnection.java @@ -22,6 +22,7 @@ package com.threerings.presents.server.net; import java.io.IOException; + import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/java/com/threerings/presents/server/net/Connection.java index de4abe1b9..e35eb444f 100644 --- a/src/java/com/threerings/presents/server/net/Connection.java +++ b/src/java/com/threerings/presents/server/net/Connection.java @@ -21,15 +21,17 @@ package com.threerings.presents.server.net; -import java.io.EOFException; -import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +import java.io.EOFException; +import java.io.IOException; + import java.nio.ByteBuffer; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 16ce2758b..8804c44a2 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -21,9 +21,17 @@ package com.threerings.presents.server.net; +import java.net.InetSocketAddress; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.net.InetSocketAddress; + import java.nio.ByteBuffer; import java.nio.channels.DatagramChannel; import java.nio.channels.SelectableChannel; @@ -32,11 +40,6 @@ import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.nio.channels.spi.SelectorProvider; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/src/java/com/threerings/presents/server/net/RunningConnection.java b/src/java/com/threerings/presents/server/net/RunningConnection.java index a1fa55210..d1ab8b37a 100644 --- a/src/java/com/threerings/presents/server/net/RunningConnection.java +++ b/src/java/com/threerings/presents/server/net/RunningConnection.java @@ -22,6 +22,7 @@ package com.threerings.presents.server.net; import java.io.IOException; + import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; diff --git a/src/java/com/threerings/presents/tools/ActionScriptSource.java b/src/java/com/threerings/presents/tools/ActionScriptSource.java index 6fc3e7ba9..bca0669af 100644 --- a/src/java/com/threerings/presents/tools/ActionScriptSource.java +++ b/src/java/com/threerings/presents/tools/ActionScriptSource.java @@ -21,18 +21,20 @@ package com.threerings.presents.tools; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java index d140e5b48..feccbee9a 100644 --- a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java +++ b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java @@ -21,15 +21,16 @@ package com.threerings.presents.tools; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.Date; import java.util.Map; import java.util.Properties; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; diff --git a/src/java/com/threerings/presents/tools/GenActionScriptTask.java b/src/java/com/threerings/presents/tools/GenActionScriptTask.java index 194cf8847..bbcf71eb8 100644 --- a/src/java/com/threerings/presents/tools/GenActionScriptTask.java +++ b/src/java/com/threerings/presents/tools/GenActionScriptTask.java @@ -21,15 +21,17 @@ package com.threerings.presents.tools; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +import java.util.ArrayList; + import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; import org.apache.commons.io.IOUtils; import org.apache.tools.ant.BuildException; diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/java/com/threerings/presents/tools/GenDObjectTask.java index 4f069fe6b..8c310e7de 100644 --- a/src/java/com/threerings/presents/tools/GenDObjectTask.java +++ b/src/java/com/threerings/presents/tools/GenDObjectTask.java @@ -21,15 +21,17 @@ package com.threerings.presents.tools; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; + import java.util.ArrayList; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; + import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java index 00831d9ea..8636fcc65 100644 --- a/src/java/com/threerings/presents/tools/GenReceiverTask.java +++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java @@ -21,13 +21,15 @@ package com.threerings.presents.tools; -import java.io.File; -import java.io.StringWriter; import java.lang.reflect.Method; import java.lang.reflect.Modifier; + import java.util.Iterator; import java.util.List; +import java.io.File; +import java.io.StringWriter; + import org.apache.velocity.VelocityContext; import com.samskivert.util.CollectionUtil; diff --git a/src/java/com/threerings/presents/tools/GenServiceTask.java b/src/java/com/threerings/presents/tools/GenServiceTask.java index 6b0505dd8..2fb6ac505 100644 --- a/src/java/com/threerings/presents/tools/GenServiceTask.java +++ b/src/java/com/threerings/presents/tools/GenServiceTask.java @@ -21,12 +21,14 @@ package com.threerings.presents.tools; -import java.io.File; -import java.io.StringWriter; import java.lang.reflect.Method; import java.lang.reflect.Modifier; + import java.util.HashSet; +import java.io.File; +import java.io.StringWriter; + import org.apache.velocity.VelocityContext; import com.google.common.base.Predicate; diff --git a/src/java/com/threerings/presents/tools/GenStreamableTask.java b/src/java/com/threerings/presents/tools/GenStreamableTask.java index 60d8bb630..93e1245ed 100644 --- a/src/java/com/threerings/presents/tools/GenStreamableTask.java +++ b/src/java/com/threerings/presents/tools/GenStreamableTask.java @@ -21,12 +21,14 @@ package com.threerings.presents.tools; -import java.io.File; -import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; + import java.util.ArrayList; +import java.io.File; +import java.io.IOException; + import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; diff --git a/src/java/com/threerings/presents/tools/GenUtil.java b/src/java/com/threerings/presents/tools/GenUtil.java index baa0d106b..090e540ee 100644 --- a/src/java/com/threerings/presents/tools/GenUtil.java +++ b/src/java/com/threerings/presents/tools/GenUtil.java @@ -21,14 +21,16 @@ package com.threerings.presents.tools; +import java.lang.reflect.Field; +import java.lang.reflect.Type; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java b/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java index 4418ff210..959c2f4b6 100644 --- a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java +++ b/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java @@ -21,13 +21,14 @@ package com.threerings.presents.tools; +import java.util.ArrayList; +import java.util.HashSet; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashSet; import javassist.CannotCompileException; import javassist.ClassPool; diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java index edc4805a9..679f28b6d 100644 --- a/src/java/com/threerings/presents/tools/InvocationTask.java +++ b/src/java/com/threerings/presents/tools/InvocationTask.java @@ -21,16 +21,18 @@ package com.threerings.presents.tools; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.tools.ant.AntClassLoader; diff --git a/src/java/com/threerings/presents/tools/SourceFile.java b/src/java/com/threerings/presents/tools/SourceFile.java index 12f5b288c..4c32b676a 100644 --- a/src/java/com/threerings/presents/tools/SourceFile.java +++ b/src/java/com/threerings/presents/tools/SourceFile.java @@ -21,13 +21,14 @@ package com.threerings.presents.tools; +import java.util.ArrayList; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.util.ArrayList; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/presents/util/ClassUtil.java b/src/java/com/threerings/presents/util/ClassUtil.java index e9af43479..2322642cc 100644 --- a/src/java/com/threerings/presents/util/ClassUtil.java +++ b/src/java/com/threerings/presents/util/ClassUtil.java @@ -22,6 +22,7 @@ package com.threerings.presents.util; import java.lang.reflect.Method; + import java.util.Map; import com.samskivert.util.MethodFinder; diff --git a/src/java/com/threerings/presents/util/DatagramSequencer.java b/src/java/com/threerings/presents/util/DatagramSequencer.java index afd66d60c..1e4d9d65d 100644 --- a/src/java/com/threerings/presents/util/DatagramSequencer.java +++ b/src/java/com/threerings/presents/util/DatagramSequencer.java @@ -21,11 +21,12 @@ package com.threerings.presents.util; -import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.Set; +import java.io.IOException; + import com.threerings.io.UnreliableObjectInputStream; import com.threerings.io.UnreliableObjectOutputStream; diff --git a/src/java/com/threerings/util/MessageBundle.java b/src/java/com/threerings/util/MessageBundle.java index b56809e3c..659115fff 100644 --- a/src/java/com/threerings/util/MessageBundle.java +++ b/src/java/com/threerings/util/MessageBundle.java @@ -21,12 +21,13 @@ package com.threerings.util; -import java.text.MessageFormat; import java.util.Collection; import java.util.Enumeration; import java.util.MissingResourceException; import java.util.ResourceBundle; +import java.text.MessageFormat; + import com.samskivert.text.MessageUtil; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/util/StreamableArrayList.java b/src/java/com/threerings/util/StreamableArrayList.java index 84a20fc17..78a481cfd 100644 --- a/src/java/com/threerings/util/StreamableArrayList.java +++ b/src/java/com/threerings/util/StreamableArrayList.java @@ -21,9 +21,10 @@ package com.threerings.util; -import java.io.IOException; import java.util.ArrayList; +import java.io.IOException; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; diff --git a/src/java/com/threerings/util/StreamableEnumSet.java b/src/java/com/threerings/util/StreamableEnumSet.java index 4e0987aa5..26a4fcff8 100644 --- a/src/java/com/threerings/util/StreamableEnumSet.java +++ b/src/java/com/threerings/util/StreamableEnumSet.java @@ -21,7 +21,6 @@ package com.threerings.util; -import java.io.IOException; import java.util.AbstractSet; import java.util.Arrays; import java.util.Collection; @@ -29,6 +28,8 @@ import java.util.ConcurrentModificationException; import java.util.EnumSet; import java.util.Iterator; +import java.io.IOException; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; diff --git a/src/java/com/threerings/util/StreamableHashMap.java b/src/java/com/threerings/util/StreamableHashMap.java index 698e95a06..f964e52bf 100644 --- a/src/java/com/threerings/util/StreamableHashMap.java +++ b/src/java/com/threerings/util/StreamableHashMap.java @@ -21,10 +21,11 @@ package com.threerings.util; -import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.io.IOException; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; diff --git a/src/java/com/threerings/util/StreamableHashSet.java b/src/java/com/threerings/util/StreamableHashSet.java index 825e7432a..ce175316d 100644 --- a/src/java/com/threerings/util/StreamableHashSet.java +++ b/src/java/com/threerings/util/StreamableHashSet.java @@ -21,9 +21,10 @@ package com.threerings.util; -import java.io.IOException; import java.util.HashSet; +import java.io.IOException; + import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; diff --git a/tests/src/java/com/threerings/crowd/client/JabberClient.java b/tests/src/java/com/threerings/crowd/client/JabberClient.java index 88f598260..c43b67e1b 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberClient.java +++ b/tests/src/java/com/threerings/crowd/client/JabberClient.java @@ -21,11 +21,12 @@ package com.threerings.crowd.client; +import java.io.IOException; + import java.awt.BorderLayout; import java.awt.EventQueue; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import javax.swing.JFrame; import javax.swing.JPanel; diff --git a/tests/src/java/com/threerings/io/FrameTest.java b/tests/src/java/com/threerings/io/FrameTest.java index 0fe08af90..e91fd6053 100644 --- a/tests/src/java/com/threerings/io/FrameTest.java +++ b/tests/src/java/com/threerings/io/FrameTest.java @@ -24,6 +24,7 @@ package com.threerings.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import java.nio.channels.Pipe; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel;