Author: trustin
Date: Tue Oct 2 06:59:36 2007
New Revision: 581243
URL: http://svn.apache.org/viewvc?rev=581243&view=rev
Log:
Optimized imports
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferAllocator.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferWrapper.java
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleBufferAllocator.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java
mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoBuffer.java
Tue Oct 2 06:59:36 2007
@@ -19,6 +19,7 @@
*/
package org.apache.mina.common;
+import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
import java.nio.DoubleBuffer;
@@ -31,7 +32,7 @@
/**
* A base implementation of [EMAIL PROTECTED] IoBuffer}. This implementation
* assumes that [EMAIL PROTECTED] IoBuffer#buf()} always returns a correct NIO
- * [EMAIL PROTECTED] java.nio.ByteBuffer} instance. Most implementations could
+ * [EMAIL PROTECTED] ByteBuffer} instance. Most implementations could
* extend this class and implement their own buffer management mechanism.
*
* @author The Apache MINA Project ([EMAIL PROTECTED])
@@ -230,7 +231,7 @@
}
@Override
- public IoBuffer put(java.nio.ByteBuffer src) {
+ public IoBuffer put(ByteBuffer src) {
autoExpand(src.remaining());
buf().put(src);
return this;
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoBuffer.java Tue Oct
2 06:59:36 2007
@@ -27,6 +27,7 @@
import java.io.OutputStream;
import java.nio.BufferOverflowException;
import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
import java.nio.DoubleBuffer;
@@ -46,10 +47,9 @@
/**
* A byte buffer used by MINA applications.
* <p>
- * This is a replacement for [EMAIL PROTECTED] java.nio.ByteBuffer}. Please
refer to
- * [EMAIL PROTECTED] java.nio.ByteBuffer} and [EMAIL PROTECTED]
java.nio.Buffer} documentation for
- * usage. MINA does not use NIO [EMAIL PROTECTED] java.nio.ByteBuffer}
directly for two
- * reasons:
+ * This is a replacement for [EMAIL PROTECTED] ByteBuffer}. Please refer to
+ * [EMAIL PROTECTED] ByteBuffer} documentation for preliminary usage. MINA
does
+ * not use NIO [EMAIL PROTECTED] ByteBuffer} directly for two reasons:
* <ul>
* <li>It doesn't provide useful getters and putters such as
* <code>fill</code>, <code>get/putString</code>, and
@@ -219,9 +219,9 @@
}
/**
- * Wraps the specified NIO [EMAIL PROTECTED] java.nio.ByteBuffer} into
MINA buffer.
+ * Wraps the specified NIO [EMAIL PROTECTED] ByteBuffer} into MINA buffer.
*/
- public static IoBuffer wrap(java.nio.ByteBuffer nioBuffer) {
+ public static IoBuffer wrap(ByteBuffer nioBuffer) {
return allocator.wrap(nioBuffer);
}
@@ -229,14 +229,14 @@
* Wraps the specified byte array into MINA heap buffer.
*/
public static IoBuffer wrap(byte[] byteArray) {
- return wrap(java.nio.ByteBuffer.wrap(byteArray));
+ return wrap(ByteBuffer.wrap(byteArray));
}
/**
* Wraps the specified byte array into MINA heap buffer.
*/
public static IoBuffer wrap(byte[] byteArray, int offset, int length) {
- return wrap(java.nio.ByteBuffer.wrap(byteArray, offset, length));
+ return wrap(ByteBuffer.wrap(byteArray, offset, length));
}
/**
@@ -249,20 +249,20 @@
/**
* Returns the underlying NIO buffer instance.
*/
- public abstract java.nio.ByteBuffer buf();
+ public abstract ByteBuffer buf();
/**
- * @see java.nio.ByteBuffer#isDirect()
+ * @see ByteBuffer#isDirect()
*/
public abstract boolean isDirect();
/**
- * @see java.nio.ByteBuffer#isReadOnly()
+ * @see ByteBuffer#isReadOnly()
*/
public abstract boolean isReadOnly();
/**
- * @see java.nio.ByteBuffer#capacity()
+ * @see ByteBuffer#capacity()
*/
public abstract int capacity();
@@ -386,37 +386,37 @@
}
/**
- * @see java.nio.ByteBuffer#duplicate()
+ * @see ByteBuffer#duplicate()
*/
public abstract IoBuffer duplicate();
/**
- * @see java.nio.ByteBuffer#slice()
+ * @see ByteBuffer#slice()
*/
public abstract IoBuffer slice();
/**
- * @see java.nio.ByteBuffer#asReadOnlyBuffer()
+ * @see ByteBuffer#asReadOnlyBuffer()
*/
public abstract IoBuffer asReadOnlyBuffer();
/**
- * @see java.nio.ByteBuffer#hasArray()
+ * @see ByteBuffer#hasArray()
*/
public abstract boolean hasArray();
/**
- * @see java.nio.ByteBuffer#array()
+ * @see ByteBuffer#array()
*/
public abstract byte[] array();
/**
- * @see java.nio.ByteBuffer#arrayOffset()
+ * @see ByteBuffer#arrayOffset()
*/
public abstract int arrayOffset();
/**
- * @see java.nio.ByteBuffer#get()
+ * @see ByteBuffer#get()
*/
public abstract byte get();
@@ -428,12 +428,12 @@
}
/**
- * @see java.nio.ByteBuffer#put(byte)
+ * @see ByteBuffer#put(byte)
*/
public abstract IoBuffer put(byte b);
/**
- * @see java.nio.ByteBuffer#get(int)
+ * @see ByteBuffer#get(int)
*/
public abstract byte get(int index);
@@ -445,17 +445,17 @@
}
/**
- * @see java.nio.ByteBuffer#put(int, byte)
+ * @see ByteBuffer#put(int, byte)
*/
public abstract IoBuffer put(int index, byte b);
/**
- * @see java.nio.ByteBuffer#get(byte[], int, int)
+ * @see ByteBuffer#get(byte[], int, int)
*/
public abstract IoBuffer get(byte[] dst, int offset, int length);
/**
- * @see java.nio.ByteBuffer#get(byte[])
+ * @see ByteBuffer#get(byte[])
*/
public IoBuffer get(byte[] dst) {
return get(dst, 0, dst.length);
@@ -464,7 +464,7 @@
/**
* Writes the content of the specified <tt>src</tt> into this buffer.
*/
- public abstract IoBuffer put(java.nio.ByteBuffer src);
+ public abstract IoBuffer put(ByteBuffer src);
/**
* Writes the content of the specified <tt>src</tt> into this buffer.
@@ -474,19 +474,19 @@
}
/**
- * @see java.nio.ByteBuffer#put(byte[], int, int)
+ * @see ByteBuffer#put(byte[], int, int)
*/
public abstract IoBuffer put(byte[] src, int offset, int length);
/**
- * @see java.nio.ByteBuffer#put(byte[])
+ * @see ByteBuffer#put(byte[])
*/
public IoBuffer put(byte[] src) {
return put(src, 0, src.length);
}
/**
- * @see java.nio.ByteBuffer#compact()
+ * @see ByteBuffer#compact()
*/
public abstract IoBuffer compact();
@@ -560,42 +560,42 @@
}
/**
- * @see java.nio.ByteBuffer#order()
+ * @see ByteBuffer#order()
*/
public abstract ByteOrder order();
/**
- * @see java.nio.ByteBuffer#order(ByteOrder)
+ * @see ByteBuffer#order(ByteOrder)
*/
public abstract IoBuffer order(ByteOrder bo);
/**
- * @see java.nio.ByteBuffer#getChar()
+ * @see ByteBuffer#getChar()
*/
public abstract char getChar();
/**
- * @see java.nio.ByteBuffer#putChar(char)
+ * @see ByteBuffer#putChar(char)
*/
public abstract IoBuffer putChar(char value);
/**
- * @see java.nio.ByteBuffer#getChar(int)
+ * @see ByteBuffer#getChar(int)
*/
public abstract char getChar(int index);
/**
- * @see java.nio.ByteBuffer#putChar(int, char)
+ * @see ByteBuffer#putChar(int, char)
*/
public abstract IoBuffer putChar(int index, char value);
/**
- * @see java.nio.ByteBuffer#asCharBuffer()
+ * @see ByteBuffer#asCharBuffer()
*/
public abstract CharBuffer asCharBuffer();
/**
- * @see java.nio.ByteBuffer#getShort()
+ * @see ByteBuffer#getShort()
*/
public abstract short getShort();
@@ -607,12 +607,12 @@
}
/**
- * @see java.nio.ByteBuffer#putShort(short)
+ * @see ByteBuffer#putShort(short)
*/
public abstract IoBuffer putShort(short value);
/**
- * @see java.nio.ByteBuffer#getShort()
+ * @see ByteBuffer#getShort()
*/
public abstract short getShort(int index);
@@ -624,17 +624,17 @@
}
/**
- * @see java.nio.ByteBuffer#putShort(int, short)
+ * @see ByteBuffer#putShort(int, short)
*/
public abstract IoBuffer putShort(int index, short value);
/**
- * @see java.nio.ByteBuffer#asShortBuffer()
+ * @see ByteBuffer#asShortBuffer()
*/
public abstract ShortBuffer asShortBuffer();
/**
- * @see java.nio.ByteBuffer#getInt()
+ * @see ByteBuffer#getInt()
*/
public abstract int getInt();
@@ -815,12 +815,12 @@
}
/**
- * @see java.nio.ByteBuffer#putInt(int)
+ * @see ByteBuffer#putInt(int)
*/
public abstract IoBuffer putInt(int value);
/**
- * @see java.nio.ByteBuffer#getInt(int)
+ * @see ByteBuffer#getInt(int)
*/
public abstract int getInt(int index);
@@ -832,87 +832,87 @@
}
/**
- * @see java.nio.ByteBuffer#putInt(int, int)
+ * @see ByteBuffer#putInt(int, int)
*/
public abstract IoBuffer putInt(int index, int value);
/**
- * @see java.nio.ByteBuffer#asIntBuffer()
+ * @see ByteBuffer#asIntBuffer()
*/
public abstract IntBuffer asIntBuffer();
/**
- * @see java.nio.ByteBuffer#getLong()
+ * @see ByteBuffer#getLong()
*/
public abstract long getLong();
/**
- * @see java.nio.ByteBuffer#putLong(int, long)
+ * @see ByteBuffer#putLong(int, long)
*/
public abstract IoBuffer putLong(long value);
/**
- * @see java.nio.ByteBuffer#getLong(int)
+ * @see ByteBuffer#getLong(int)
*/
public abstract long getLong(int index);
/**
- * @see java.nio.ByteBuffer#putLong(int, long)
+ * @see ByteBuffer#putLong(int, long)
*/
public abstract IoBuffer putLong(int index, long value);
/**
- * @see java.nio.ByteBuffer#asLongBuffer()
+ * @see ByteBuffer#asLongBuffer()
*/
public abstract LongBuffer asLongBuffer();
/**
- * @see java.nio.ByteBuffer#getFloat()
+ * @see ByteBuffer#getFloat()
*/
public abstract float getFloat();
/**
- * @see java.nio.ByteBuffer#putFloat(float)
+ * @see ByteBuffer#putFloat(float)
*/
public abstract IoBuffer putFloat(float value);
/**
- * @see java.nio.ByteBuffer#getFloat(int)
+ * @see ByteBuffer#getFloat(int)
*/
public abstract float getFloat(int index);
/**
- * @see java.nio.ByteBuffer#putFloat(int, float)
+ * @see ByteBuffer#putFloat(int, float)
*/
public abstract IoBuffer putFloat(int index, float value);
/**
- * @see java.nio.ByteBuffer#asFloatBuffer()
+ * @see ByteBuffer#asFloatBuffer()
*/
public abstract FloatBuffer asFloatBuffer();
/**
- * @see java.nio.ByteBuffer#getDouble()
+ * @see ByteBuffer#getDouble()
*/
public abstract double getDouble();
/**
- * @see java.nio.ByteBuffer#putDouble(double)
+ * @see ByteBuffer#putDouble(double)
*/
public abstract IoBuffer putDouble(double value);
/**
- * @see java.nio.ByteBuffer#getDouble(int)
+ * @see ByteBuffer#getDouble(int)
*/
public abstract double getDouble(int index);
/**
- * @see java.nio.ByteBuffer#putDouble(int, double)
+ * @see ByteBuffer#putDouble(int, double)
*/
public abstract IoBuffer putDouble(int index, double value);
/**
- * @see java.nio.ByteBuffer#asDoubleBuffer()
+ * @see ByteBuffer#asDoubleBuffer()
*/
public abstract DoubleBuffer asDoubleBuffer();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferAllocator.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferAllocator.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferAllocator.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferAllocator.java
Tue Oct 2 06:59:36 2007
@@ -19,6 +19,8 @@
*/
package org.apache.mina.common;
+import java.nio.ByteBuffer;
+
/**
* Allocates [EMAIL PROTECTED] IoBuffer}s and manages them. Please implement
this
* interface if you need more advanced memory management scheme.
@@ -37,9 +39,9 @@
IoBuffer allocate(int capacity, boolean direct);
/**
- * Wraps the specified NIO [EMAIL PROTECTED] java.nio.ByteBuffer} into
MINA buffer.
+ * Wraps the specified NIO [EMAIL PROTECTED] ByteBuffer} into MINA buffer.
*/
- IoBuffer wrap(java.nio.ByteBuffer nioBuffer);
+ IoBuffer wrap(ByteBuffer nioBuffer);
/**
* Dispose of this allocator.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferWrapper.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferWrapper.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferWrapper.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoBufferWrapper.java
Tue Oct 2 06:59:36 2007
@@ -22,6 +22,7 @@
import java.io.FilterOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
import java.nio.DoubleBuffer;
@@ -67,7 +68,7 @@
}
@Override
- public java.nio.ByteBuffer buf() {
+ public ByteBuffer buf() {
return buf.buf();
}
@@ -201,7 +202,7 @@
}
@Override
- public IoBuffer put(java.nio.ByteBuffer src) {
+ public IoBuffer put(ByteBuffer src) {
buf.put(src);
return this;
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleBufferAllocator.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/SimpleBufferAllocator.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleBufferAllocator.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleBufferAllocator.java
Tue Oct 2 06:59:36 2007
@@ -19,6 +19,7 @@
*/
package org.apache.mina.common;
+import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -36,16 +37,16 @@
}
public IoBuffer allocate(int capacity, boolean direct) {
- java.nio.ByteBuffer nioBuffer;
+ ByteBuffer nioBuffer;
if (direct) {
- nioBuffer = java.nio.ByteBuffer.allocateDirect(capacity);
+ nioBuffer = ByteBuffer.allocateDirect(capacity);
} else {
- nioBuffer = java.nio.ByteBuffer.allocate(capacity);
+ nioBuffer = ByteBuffer.allocate(capacity);
}
return new SimpleBuffer(nioBuffer, true);
}
- public IoBuffer wrap(java.nio.ByteBuffer nioBuffer) {
+ public IoBuffer wrap(ByteBuffer nioBuffer) {
return new SimpleBuffer(nioBuffer, true);
}
@@ -53,9 +54,9 @@
}
private static class SimpleBuffer extends AbstractIoBuffer {
- private java.nio.ByteBuffer buf;
+ private ByteBuffer buf;
- protected SimpleBuffer(java.nio.ByteBuffer buf,
+ protected SimpleBuffer(ByteBuffer buf,
boolean autoExpandAllowed) {
super(autoExpandAllowed);
this.buf = buf;
@@ -63,7 +64,7 @@
}
@Override
- public java.nio.ByteBuffer buf() {
+ public ByteBuffer buf() {
return buf;
}
@@ -74,12 +75,12 @@
newCapacity <<= 1;
}
- java.nio.ByteBuffer oldBuf = this.buf;
- java.nio.ByteBuffer newBuf;
+ ByteBuffer oldBuf = this.buf;
+ ByteBuffer newBuf;
if (isDirect()) {
- newBuf = java.nio.ByteBuffer.allocateDirect(newCapacity);
+ newBuf = ByteBuffer.allocateDirect(newCapacity);
} else {
- newBuf = java.nio.ByteBuffer.allocate(newCapacity);
+ newBuf = ByteBuffer.allocate(newCapacity);
}
newBuf.clear();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
Tue Oct 2 06:59:36 2007
@@ -19,27 +19,29 @@
*/
package org.apache.mina.filter.ssl;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.mina.common.DefaultWriteFuture;
import org.apache.mina.common.DefaultWriteRequest;
+import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoEventType;
-import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilterEvent;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
+import org.apache.mina.common.IoFilter.NextFilter;
/**
* A helper class using the SSLEngine API to decrypt/encrypt data.
@@ -702,9 +704,8 @@
* @param src the buffer to copy
* @return the new buffer, ready to read from
*/
- public static org.apache.mina.common.IoBuffer copy(java.nio.ByteBuffer
src) {
- org.apache.mina.common.IoBuffer copy = org.apache.mina.common.IoBuffer
- .allocate(src.remaining());
+ public static IoBuffer copy(ByteBuffer src) {
+ IoBuffer copy = IoBuffer.allocate(src.remaining());
copy.put(src);
copy.flip();
return copy;
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java
(original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java Tue
Oct 2 06:59:36 2007
@@ -20,6 +20,7 @@
package org.apache.mina.common;
import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ReadOnlyBufferException;
import java.nio.charset.CharacterCodingException;
@@ -511,7 +512,7 @@
}
public void testWrapNioBuffer() throws Exception {
- java.nio.ByteBuffer nioBuf = java.nio.ByteBuffer.allocate(10);
+ ByteBuffer nioBuf = ByteBuffer.allocate(10);
nioBuf.position(3);
nioBuf.limit(7);
Modified:
mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java?rev=581243&r1=581242&r2=581243&view=diff
==============================================================================
---
mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java
(original)
+++
mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java
Tue Oct 2 06:59:36 2007
@@ -19,6 +19,8 @@
*/
package org.apache.mina.filter.codec.netty;
+import java.nio.ByteBuffer;
+
import net.gleamynode.netty2.Message;
import net.gleamynode.netty2.MessageParseException;
import net.gleamynode.netty2.MessageRecognizer;
@@ -40,7 +42,7 @@
public class NettyDecoder extends ProtocolDecoderAdapter {
private final MessageRecognizer recognizer;
- private java.nio.ByteBuffer readBuf = java.nio.ByteBuffer.allocate(1024);
+ private ByteBuffer readBuf = ByteBuffer.allocate(1024);
private Message readingMessage;
@@ -64,7 +66,7 @@
}
private void expand(int newCapacity) {
- java.nio.ByteBuffer newBuf = java.nio.ByteBuffer.allocate(newCapacity);
+ ByteBuffer newBuf = ByteBuffer.allocate(newCapacity);
readBuf.flip();
newBuf.put(readBuf);
readBuf = newBuf;
