Author: trustin
Date: Sun Jul 8 21:05:20 2007
New Revision: 554522
URL: http://svn.apache.org/viewvc?view=rev&rev=554522
Log:
Removed a few generics warnings
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferProxy.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java?view=diff&rev=554522&r1=554521&r2=554522
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java Sun
Jul 8 21:05:20 2007
@@ -132,7 +132,7 @@
* @noinspection StaticNonFinalField
* @see ByteBufferAllocator
*/
-public abstract class ByteBuffer implements Comparable
+public abstract class ByteBuffer implements Comparable<ByteBuffer>
{
private static ByteBufferAllocator allocator = new
SimpleByteBufferAllocator();
@@ -570,9 +570,8 @@
return true;
}
- public int compareTo( Object o )
+ public int compareTo( ByteBuffer that )
{
- ByteBuffer that = (ByteBuffer)o;
int n = this.position() + Math.min( this.remaining(), that.remaining()
);
for( int i = this.position(), j = that.position(); i < n; i ++, j ++ )
{
@@ -1638,7 +1637,7 @@
protected ObjectStreamClass readClassDescriptor() throws
IOException, ClassNotFoundException
{
String className = readUTF();
- Class clazz = Class.forName( className, true, classLoader
);
+ Class<?> clazz = Class.forName( className, true,
classLoader );
return ObjectStreamClass.lookup( clazz );
}
};
@@ -2020,7 +2019,7 @@
*
* @param e The enum to write to the buffer
*/
- public ByteBuffer putEnum(Enum e) {
+ public ByteBuffer putEnum(Enum<?> e) {
if (e.ordinal() > Byte.MAX_VALUE) {
throw new IllegalArgumentException(enumConversionErrorMessage(e,
"byte"));
}
@@ -2033,7 +2032,7 @@
* @param index The index at which the byte will be written
* @param e The enum to write to the buffer
*/
- public ByteBuffer putEnum(int index, Enum e) {
+ public ByteBuffer putEnum(int index, Enum<?> e) {
if (e.ordinal() > Byte.MAX_VALUE) {
throw new IllegalArgumentException(enumConversionErrorMessage(e,
"byte"));
}
@@ -2045,7 +2044,7 @@
*
* @param e The enum to write to the buffer
*/
- public ByteBuffer putEnumShort(Enum e) {
+ public ByteBuffer putEnumShort(Enum<?> e) {
if (e.ordinal() > Short.MAX_VALUE) {
throw new IllegalArgumentException(enumConversionErrorMessage(e,
"short"));
}
@@ -2058,7 +2057,7 @@
* @param index The index at which the bytes will be written
* @param e The enum to write to the buffer
*/
- public ByteBuffer putEnumShort(int index, Enum e) {
+ public ByteBuffer putEnumShort(int index, Enum<?> e) {
if (e.ordinal() > Short.MAX_VALUE) {
throw new IllegalArgumentException(enumConversionErrorMessage(e,
"short"));
}
@@ -2070,7 +2069,7 @@
*
* @param e The enum to write to the buffer
*/
- public ByteBuffer putEnumInt(Enum e) {
+ public ByteBuffer putEnumInt(Enum<?> e) {
return putInt(e.ordinal());
}
@@ -2080,7 +2079,7 @@
* @param index The index at which the bytes will be written
* @param e The enum to write to the buffer
*/
- public ByteBuffer putEnumInt(int index, Enum e) {
+ public ByteBuffer putEnumInt(int index, Enum<?> e) {
return putInt(index, e.ordinal());
}
@@ -2092,7 +2091,7 @@
return enumConstants[i];
}
- private String enumConversionErrorMessage(Enum e, String type) {
+ private String enumConversionErrorMessage(Enum<?> e, String type) {
return String.format("%s.%s has an ordinal value too large for a %s",
e.getClass().getName(), e.name(), type);
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferProxy.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferProxy.java?view=diff&rev=554522&r1=554521&r2=554522
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferProxy.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferProxy.java
Sun Jul 8 21:05:20 2007
@@ -275,9 +275,9 @@
}
@Override
- public int compareTo( Object o )
+ public int compareTo( ByteBuffer that )
{
- return buf.compareTo( o );
+ return buf.compareTo( that );
}
@Override
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?view=diff&rev=554522&r1=554521&r2=554522
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
Sun Jul 8 21:05:20 2007
@@ -50,7 +50,7 @@
private static final String DECODER_LOCK =
ProtocolCodecFilter.class.getName() + ".decoderLock";
- private static final Class[] EMPTY_PARAMS = new Class[0];
+ private static final Class<?>[] EMPTY_PARAMS = new Class[0];
private static final ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap( new
byte[0] );
private final ProtocolCodecFactory factory;
