From a15213d751bf386678570d66f00812919ffcaf07 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman@apache.org>
Date: Fri, 21 Sep 2012 22:08:12 +0200
Subject: [PATCH] Cleanup imports and add javadocs

---
 .../main/java/io/netty/channel/socket/SctpData.java   |  3 ++-
 .../io/netty/channel/socket/SctpNotification.java     | 11 +++++++++--
 .../netty/channel/socket/SctpNotificationHandler.java |  1 -
 .../io/netty/channel/socket/oio/OioSctpChannel.java   |  2 +-
 .../channel/socket/oio/OioSctpServerChannel.java      |  2 --
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/socket/SctpData.java b/transport/src/main/java/io/netty/channel/socket/SctpData.java
index 25804872c0..123de98f9e 100644
--- a/transport/src/main/java/io/netty/channel/socket/SctpData.java
+++ b/transport/src/main/java/io/netty/channel/socket/SctpData.java
@@ -29,7 +29,7 @@ public final class SctpData implements SctpMessage {
 
     private final ByteBuf payloadBuffer;
 
-    private MessageInfo msgInfo;
+    private final MessageInfo msgInfo;
 
     /**
      * Essential data that is being carried within SCTP Data Chunk
@@ -41,6 +41,7 @@ public final class SctpData implements SctpMessage {
         this.protocolIdentifier = protocolIdentifier;
         this.streamIdentifier = streamIdentifier;
         this.payloadBuffer = payloadBuffer;
+        this.msgInfo = null;
     }
 
     public SctpData(MessageInfo msgInfo, ByteBuf payloadBuffer) {
diff --git a/transport/src/main/java/io/netty/channel/socket/SctpNotification.java b/transport/src/main/java/io/netty/channel/socket/SctpNotification.java
index a02e4bac73..95fa304249 100644
--- a/transport/src/main/java/io/netty/channel/socket/SctpNotification.java
+++ b/transport/src/main/java/io/netty/channel/socket/SctpNotification.java
@@ -18,8 +18,8 @@ package io.netty.channel.socket;
 import com.sun.nio.sctp.Notification;
 
 public final class SctpNotification implements SctpMessage {
-    private Notification notification;
-    private Object attachment;
+    private final Notification notification;
+    private final Object attachment;
 
 
     public SctpNotification(Notification notification, Object attachment) {
@@ -27,10 +27,17 @@ public final class SctpNotification implements SctpMessage {
         this.attachment = attachment;
     }
 
+    /**
+     * Return the {@link Notification}
+     */
     public Notification notification() {
         return notification;
     }
 
+    /**
+     * Return the attachment of this {@link SctpNotification}, or
+     * <code>null</code> if no attachment was provided
+     */
     public Object attachment() {
         return attachment;
     }
diff --git a/transport/src/main/java/io/netty/channel/socket/SctpNotificationHandler.java b/transport/src/main/java/io/netty/channel/socket/SctpNotificationHandler.java
index b409a027d5..103a317e60 100644
--- a/transport/src/main/java/io/netty/channel/socket/SctpNotificationHandler.java
+++ b/transport/src/main/java/io/netty/channel/socket/SctpNotificationHandler.java
@@ -22,7 +22,6 @@ import com.sun.nio.sctp.Notification;
 import com.sun.nio.sctp.PeerAddressChangeNotification;
 import com.sun.nio.sctp.SendFailedNotification;
 import com.sun.nio.sctp.ShutdownNotification;
-import io.netty.channel.ChannelPipeline;
 
 public class SctpNotificationHandler extends AbstractNotificationHandler<Object> {
 
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSctpChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSctpChannel.java
index 7219ff2f1d..d9525696bf 100755
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioSctpChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSctpChannel.java
@@ -52,7 +52,7 @@ public class OioSctpChannel extends AbstractOioMessageChannel
 
     private final SctpChannel ch;
     private final SctpChannelConfig config;
-    private final NotificationHandler notificationHandler;
+    private final NotificationHandler<?> notificationHandler;
 
     private static SctpChannel openChannel() {
         try {
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSctpServerChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSctpServerChannel.java
index 5f31c9a507..11d0ebe30d 100755
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioSctpServerChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSctpServerChannel.java
@@ -21,9 +21,7 @@ import io.netty.buffer.ChannelBufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelMetadata;
-import io.netty.channel.socket.DefaultSctpChannelConfig;
 import io.netty.channel.socket.DefaultSctpServerChannelConfig;
-import io.netty.channel.socket.SctpNotificationHandler;
 import io.netty.channel.socket.SctpServerChannelConfig;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;