From c77bac44a23e75fe258c433296f97185eb59d71a Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Sat, 10 Nov 2012 07:29:14 +0900
Subject: [PATCH] Fix unchecked warnings

---
 .../main/java/io/netty/logging/OsgiLoggerFactory.java | 11 +++++------
 .../transport/socket/DatagramMulticastTest.java       |  8 ++++----
 .../transport/socket/DatagramUnicastTest.java         |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java b/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
index 33d5db6726..31f863cff7 100644
--- a/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
+++ b/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
@@ -26,7 +26,7 @@ import org.osgi.util.tracker.ServiceTracker;
  */
 public class OsgiLoggerFactory extends InternalLoggerFactory {
 
-    private final ServiceTracker logServiceTracker;
+    private final ServiceTracker<LogService, LogService> logServiceTracker;
     private final InternalLoggerFactory fallback;
     volatile LogService logService;
 
@@ -46,18 +46,17 @@ public class OsgiLoggerFactory extends InternalLoggerFactory {
         }
 
         this.fallback = fallback;
-        logServiceTracker = new ServiceTracker(
+        logServiceTracker = new ServiceTracker<LogService, LogService>(
                 ctx, "org.osgi.service.log.LogService", null) {
                     @Override
-                    public Object addingService(ServiceReference reference) {
-                        LogService service = (LogService) super.addingService(reference);
+                    public LogService addingService(ServiceReference<LogService> reference) {
+                        LogService service = super.addingService(reference);
                         logService = service;
                         return service;
                     }
 
                     @Override
-                    public void removedService(ServiceReference reference,
-                            Object service) {
+                    public void removedService(ServiceReference<LogService> reference, LogService service) {
                         logService = null;
                     }
         };
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
index c4f2f2a73d..7802fa4846 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
@@ -15,7 +15,6 @@
  */
 package io.netty.testsuite.transport.socket;
 
-import static org.junit.Assert.*;
 import io.netty.bootstrap.AbstractBootstrap;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -26,13 +25,14 @@ import io.netty.channel.socket.DatagramChannel;
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.channel.socket.oio.OioDatagramChannel;
 import io.netty.util.NetworkConstants;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class DatagramMulticastTest extends AbstractDatagramTest {
 
@@ -42,7 +42,7 @@ public class DatagramMulticastTest extends AbstractDatagramTest {
         run();
     }
 
-    public void testMulticast(AbstractBootstrap sb, AbstractBootstrap cb) throws Throwable {
+    public void testMulticast(AbstractBootstrap<?> sb, AbstractBootstrap<?> cb) throws Throwable {
         MulticastTestHandler mhandler = new MulticastTestHandler();
 
         sb.handler(new ChannelInboundMessageHandlerAdapter<DatagramPacket>() {
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
index 53b3726a79..8b8cd721ff 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
@@ -15,18 +15,18 @@
  */
 package io.netty.testsuite.transport.socket;
 
-import static org.junit.Assert.*;
 import io.netty.bootstrap.AbstractBootstrap;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
 import io.netty.channel.socket.DatagramPacket;
+import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 public class DatagramUnicastTest extends AbstractDatagramTest {
 
@@ -35,7 +35,7 @@ public class DatagramUnicastTest extends AbstractDatagramTest {
         run();
     }
 
-    public void testSimpleSend(AbstractBootstrap sb, AbstractBootstrap cb) throws Throwable {
+    public void testSimpleSend(AbstractBootstrap<?> sb, AbstractBootstrap<?> cb) throws Throwable {
         final CountDownLatch latch = new CountDownLatch(1);
 
         sb.handler(new ChannelInboundMessageHandlerAdapter<DatagramPacket>() {