Automatic clean-up with Eclipse

- Mostly import organization & whitespace removal

codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameDecoder.java

@@ -15,14 +15,13 @@
  */
 package io.netty.handler.codec.spdy;
 
+import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.TooLongFrameException;
 
-import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
-
 /**
  * Decodes {@link ByteBuf}s into SPDY Data and Control Frames.
  */

codec-http/src/main/java/io/netty/handler/codec/spdy/SpdyFrameEncoder.java

@@ -15,6 +15,7 @@
  */
 package io.netty.handler.codec.spdy;
 
+import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
@@ -25,8 +26,6 @@ import io.netty.handler.codec.UnsupportedMessageTypeException;
 
 import java.util.Set;
 
-import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
-
 /**
  * Encodes a SPDY Data or Control Frame into a {@link ByteBuf}.
  */

codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java

@@ -15,7 +15,7 @@
  */
 package io.netty.handler.codec.http;
 
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -23,7 +23,7 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TimeZone;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class CookieDecoderTest {
     @Test

codec-http/src/test/java/io/netty/handler/codec/spdy/SpdySessionHandlerTest.java

@@ -20,12 +20,13 @@ import io.netty.channel.ChannelInboundMessageHandlerAdapter;
 import io.netty.channel.embedded.EmbeddedMessageChannel;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 import java.util.Map;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class SpdySessionHandlerTest {
 
     private static final InternalLogger logger =

codec/src/main/java/io/netty/handler/codec/marshalling/CompatibleMarshallingDecoder.java

@@ -21,11 +21,12 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ReplayingDecoder;
 import io.netty.handler.codec.TooLongFrameException;
 import io.netty.util.VoidEnum;
-import org.jboss.marshalling.ByteInput;
-import org.jboss.marshalling.Unmarshaller;
 
 import java.io.ObjectStreamConstants;
 
+import org.jboss.marshalling.ByteInput;
+import org.jboss.marshalling.Unmarshaller;
+
 /**
  * {@link ReplayingDecoder} which use an {@link Unmarshaller} to read the Object out of the {@link ByteBuf}.
  *

codec/src/main/java/io/netty/handler/codec/marshalling/LimitingByteInput.java

@@ -15,10 +15,10 @@
  */
 package io.netty.handler.codec.marshalling;
 
-import org.jboss.marshalling.ByteInput;
-
 import java.io.IOException;
 
+import org.jboss.marshalling.ByteInput;
+
 /**
  * {@link ByteInput} implementation which wraps another {@link ByteInput} and throws a {@link TooBigObjectException}
  * if the read limit was reached.

codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java

@@ -17,8 +17,8 @@ package io.netty.handler.codec.protobuf;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.CorruptedFrameException;
 
 import com.google.protobuf.CodedInputStream;
 

example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java

@@ -17,8 +17,8 @@ package io.netty.example.factorial;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.CorruptedFrameException;
 
 import java.math.BigInteger;
 

example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java

@@ -18,12 +18,13 @@ package io.netty.example.http.websocketx.sslserver;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
 import java.io.FileInputStream;
 import java.security.KeyStore;
 import java.security.Security;
 
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+
 /**
  * Creates a {@link SSLContext} for just server certificates.
  */

example/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java

@@ -17,14 +17,15 @@ package io.netty.example.securechat;
 
 import io.netty.handler.ssl.SslHandler;
 
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.Security;
+
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.Security;
 
 /**
  * Creates a bogus {@link SSLContext}.  A client-side context created by this

handler/src/test/java/io/netty/handler/stream/ChunkedWriteHandlerTest.java

@@ -17,8 +17,8 @@ package io.netty.handler.stream;
 
 import static org.junit.Assert.*;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import io.netty.buffer.MessageBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.embedded.EmbeddedByteChannel;

testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java

@@ -15,6 +15,7 @@
  */
 package io.netty.testsuite.transport.socket;
 
+import static org.junit.Assert.*;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -24,14 +25,13 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.socket.DatagramChannel;
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.util.NetworkConstants;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.*;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class DatagramMulticastTest extends AbstractDatagramTest {
 

testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java

@@ -15,6 +15,7 @@
  */
 package io.netty.testsuite.transport.socket;
 
+import static org.junit.Assert.*;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.ByteBuf;
@@ -26,15 +27,7 @@ import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.ssl.SslHandler;
-import org.junit.Test;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.ManagerFactoryParameters;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactorySpi;
-import javax.net.ssl.X509TrustManager;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -47,7 +40,15 @@ import java.security.cert.X509Certificate;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.junit.Assert.*;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactorySpi;
+import javax.net.ssl.X509TrustManager;
+
+import org.junit.Test;
 
 public class SocketSslEchoTest extends AbstractSocketTest {
 

testsuite/src/test/java/io/netty/testsuite/util/TestUtils.java

@@ -25,7 +25,7 @@ public class TestUtils {
 
     /**
      * Return a free port which can be used to bind to
-     * 
+     *
      * @return port
      */
     public static int getFreePort() {
@@ -36,9 +36,9 @@ public class TestUtils {
                 socket.close();
                 return start;
             } catch (IOException e) {
-                // ignore 
+                // ignore
             }
-            
+
         }
         throw new RuntimeException("Unable to find a free port....");
     }

transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java

@@ -15,6 +15,7 @@
  */
 package io.netty.channel;
 
+import static io.netty.channel.DefaultChannelPipeline.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ChannelBuf;
 import io.netty.buffer.MessageBuf;
@@ -29,8 +30,6 @@ import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static io.netty.channel.DefaultChannelPipeline.*;
-
 final class DefaultChannelHandlerContext extends DefaultAttributeMap implements ChannelHandlerContext {
 
     private static final EnumSet<ChannelHandlerType> EMPTY_TYPE = EnumSet.noneOf(ChannelHandlerType.class);

transport/src/main/java/io/netty/channel/embedded/EmbeddedByteChannel.java

@@ -17,8 +17,8 @@ package io.netty.channel.embedded;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelBufferType;
+import io.netty.channel.ChannelHandler;
 
 public class EmbeddedByteChannel extends AbstractEmbeddedChannel {
 

transport/src/main/java/io/netty/channel/embedded/EmbeddedMessageChannel.java

@@ -15,8 +15,8 @@
  */
 package io.netty.channel.embedded;
 
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelBufferType;
+import io.netty.channel.ChannelHandler;
 
 import java.util.ArrayDeque;
 import java.util.Queue;

transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java

@@ -15,6 +15,7 @@
  */
 package io.netty.channel.group;
 
+import static java.util.concurrent.TimeUnit.*;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -31,8 +32,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.concurrent.TimeUnit.*;
-
 /**
  * The default {@link ChannelGroupFuture} implementation.
  */

transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java

@@ -15,6 +15,7 @@
  */
 package io.netty.channel.socket;
 
+import static io.netty.channel.ChannelOption.*;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.DefaultChannelConfig;
@@ -27,8 +28,6 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Map;
 
-import static io.netty.channel.ChannelOption.*;
-
 /**
  * The default {@link DatagramChannelConfig} implementation.
  */

transport/src/main/java/io/netty/channel/socket/nio/AbstractNioByteChannel.java

@@ -17,8 +17,8 @@ package io.netty.channel.socket.nio;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelBufferType;
+import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;

transport/src/main/java/io/netty/channel/socket/nio/AbstractNioMessageChannel.java

@@ -16,8 +16,8 @@
 package io.netty.channel.socket.nio;
 
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelBufferType;
+import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;

transport/src/main/java/io/netty/channel/socket/oio/AbstractOioByteChannel.java

@@ -17,8 +17,8 @@ package io.netty.channel.socket.oio;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelBufferType;
+import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
 

transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java

@@ -16,8 +16,8 @@
 package io.netty.channel.socket.oio;
 
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelBufferType;
+import io.netty.channel.ChannelPipeline;
 
 import java.io.IOException;
 import java.util.Queue;