From 4399c1e90b6372cddb4b8af829cb240059d416e7 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Tue, 19 Oct 2010 06:00:42 +0000 Subject: [PATCH] Removed nagging compiler warnings introduced by Eclipse Helios --- .../java/org/jboss/netty/bootstrap/Bootstrap.java | 2 +- .../channel/socket/nio/SocketSendBufferPool.java | 4 ---- .../jboss/netty/util/internal/ConcurrentHashMap.java | 2 +- .../util/internal/ConcurrentIdentityHashMap.java | 2 +- .../internal/ConcurrentIdentityWeakKeyHashMap.java | 4 ++-- .../util/internal/ConcurrentWeakKeyHashMap.java | 4 ++-- .../netty/util/internal/LinkedTransferQueue.java | 6 +++--- .../org/jboss/netty/util/internal/jzlib/ZStream.java | 9 +++------ .../java/org/jboss/netty/util/MapBackedSetTest.java | 12 ++++++------ 9 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java index 02eea45c4e..6892a3dfb8 100644 --- a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java @@ -329,7 +329,7 @@ public class Bootstrap implements ExternalResourceReleasable { * Returns {@code true} if and only if the specified {@code map} is an * ordered map, like {@link LinkedHashMap} is. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) static boolean isOrderedMap(Map map) { Class mapType = map.getClass(); if (LinkedHashMap.class.isAssignableFrom(mapType)) { diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java index a1d85e0c65..70826d0300 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java @@ -38,10 +38,6 @@ final class SocketSendBufferPool { private static final int ALIGN_SHIFT = 4; private static final int ALIGN_MASK = 15; - static { - assert (DEFAULT_PREALLOCATION_SIZE & ALIGN_MASK) == 0; - } - PreallocationRef poolHead = null; Preallocation current = new Preallocation(DEFAULT_PREALLOCATION_SIZE); diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java index 82524474a3..db0d7af661 100644 --- a/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java +++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java @@ -1253,7 +1253,7 @@ public final class ConcurrentHashMap extends AbstractMap if (!(o instanceof Map.Entry)) { return false; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") Map.Entry e = (Map.Entry) o; return eq(key, e.getKey()) && eq(value, e.getValue()); } diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java index ec14ab8d64..a83f938528 100644 --- a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java +++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java @@ -1255,7 +1255,7 @@ public final class ConcurrentIdentityHashMap extends AbstractMap if (!(o instanceof Map.Entry)) { return false; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") Map.Entry e = (Map.Entry) o; return eq(key, e.getKey()) && eq(value, e.getValue()); } diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java index f1db20196c..fd9ceb68f3 100644 --- a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java +++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java @@ -617,7 +617,7 @@ public final class ConcurrentIdentityWeakKeyHashMap extends AbstractMap extends AbstractMap)) { return false; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") Map.Entry e = (Map.Entry) o; return eq(key, e.getKey()) && eq(value, e.getValue()); } diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java index eb945bf710..010c4fe3cf 100644 --- a/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java +++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java @@ -617,7 +617,7 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl } } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") final void removeStale() { WeakKeyReference ref; while ((ref = (WeakKeyReference) refQueue.poll()) != null) { @@ -1333,7 +1333,7 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl if (!(o instanceof Map.Entry)) { return false; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") Map.Entry e = (Map.Entry) o; return eq(key, e.getKey()) && eq(value, e.getValue()); } diff --git a/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java b/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java index bcbccf8abb..d4422bac90 100644 --- a/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java +++ b/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java @@ -1337,13 +1337,13 @@ public class LinkedTransferQueue extends AbstractQueue } } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private static final AtomicReferenceFieldUpdater headUpdater = AtomicFieldUpdaterUtil.newRefUpdater(LinkedTransferQueue.class, Node.class, "head"); - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private static final AtomicReferenceFieldUpdater tailUpdater = AtomicFieldUpdaterUtil.newRefUpdater(LinkedTransferQueue.class, Node.class, "tail"); - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private static final AtomicIntegerFieldUpdater sweepVotesUpdater = AtomicFieldUpdaterUtil.newIntUpdater(LinkedTransferQueue.class, "sweepVotes"); } diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java index 17a9bd4034..d18e907be9 100644 --- a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java +++ b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java @@ -78,8 +78,7 @@ public final class ZStream { return inflateInit(w, WrapperType.ZLIB); } - @SuppressWarnings("unchecked") - public int inflateInit(int w, Enum wrapperType) { + public int inflateInit(int w, Enum wrapperType) { istate = new Inflate(); return istate.inflateInit(this, w, (WrapperType) wrapperType); } @@ -118,8 +117,7 @@ public final class ZStream { return deflateInit(level, JZlib.MAX_WBITS); } - @SuppressWarnings("unchecked") - public int deflateInit(int level, Enum wrapperType) { + public int deflateInit(int level, Enum wrapperType) { return deflateInit(level, JZlib.MAX_WBITS, wrapperType); } @@ -127,8 +125,7 @@ public final class ZStream { return deflateInit(level, bits, WrapperType.ZLIB); } - @SuppressWarnings("unchecked") - public int deflateInit(int level, int bits, Enum wrapperType) { + public int deflateInit(int level, int bits, Enum wrapperType) { dstate = new Deflate(); return dstate.deflateInit(this, level, bits, (WrapperType) wrapperType); } diff --git a/src/test/java/org/jboss/netty/util/MapBackedSetTest.java b/src/test/java/org/jboss/netty/util/MapBackedSetTest.java index 13816b9c5e..54d45c036c 100644 --- a/src/test/java/org/jboss/netty/util/MapBackedSetTest.java +++ b/src/test/java/org/jboss/netty/util/MapBackedSetTest.java @@ -35,7 +35,7 @@ import org.junit.Test; public class MapBackedSetTest { @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testSize() { Map map = createStrictMock(Map.class); expect(map.size()).andReturn(0); @@ -46,7 +46,7 @@ public class MapBackedSetTest { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testContains() { Map map = createStrictMock(Map.class); expect(map.containsKey("key")).andReturn(true); @@ -58,7 +58,7 @@ public class MapBackedSetTest { @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testRemove() { Map map = createStrictMock(Map.class); expect(map.remove("key")).andReturn(true); @@ -71,7 +71,7 @@ public class MapBackedSetTest { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public void testAdd() { Map map = createStrictMock(Map.class); expect(map.put("key", true)).andReturn(null); @@ -84,7 +84,7 @@ public class MapBackedSetTest { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testClear() { Map map = createStrictMock(Map.class); map.clear(); @@ -95,7 +95,7 @@ public class MapBackedSetTest { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testIterator() { Map map = createStrictMock(Map.class); Set keySet = createStrictMock(Set.class);