From 8d5f29639c2441abf7b3cb1e2b9103d68272878e Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman@apache.org>
Date: Sun, 20 May 2012 17:35:30 +0200
Subject: [PATCH] Fix checkstyle

---
 .../netty/handler/traffic/AbstractTrafficShapingHandler.java | 5 +++--
 .../netty/handler/traffic/ChannelTrafficShapingHandler.java  | 2 +-
 .../netty/handler/traffic/GlobalTrafficShapingHandler.java   | 2 +-
 .../java/org/jboss/netty/handler/traffic/TrafficCounter.java | 2 +-
 .../java/org/jboss/netty/handler/traffic/package-info.java   | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
index be2e4e355a..4c2436c27d 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
@@ -88,10 +88,11 @@ public abstract class AbstractTrafficShapingHandler extends
      * Timer to associated to any TrafficCounter
      */
     protected Timer timer;
+
     /**
      * used in releaseExternalResources() to cancel the timer
      */
-    volatile private Timeout timeout = null;
+    private volatile Timeout timeout;
     
     /**
      * Limit in B/s to apply to write
@@ -286,7 +287,7 @@ public abstract class AbstractTrafficShapingHandler extends
         writeLimit = newWriteLimit;
         readLimit = newReadLimit;
         if (trafficCounter != null) {
-            trafficCounter.resetAccounting(System.currentTimeMillis()+1);
+            trafficCounter.resetAccounting(System.currentTimeMillis() + 1);
         }
     }
 
diff --git a/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java
index 28389693ab..17d4452b5d 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java
@@ -33,7 +33,7 @@ import org.jboss.netty.util.Timer;
  * <li>Add in your pipeline a new ChannelTrafficShapingHandler, before a recommended {@link ExecutionHandler} (like
  * {@link OrderedMemoryAwareThreadPoolExecutor} or {@link MemoryAwareThreadPoolExecutor}).<br>
  * <tt>ChannelTrafficShapingHandler myHandler = new ChannelTrafficShapingHandler(timer);</tt><br>
- * timer could be created using <tt>HashedWheelTimer<tt><br>
+ * timer could be created using <tt>HashedWheelTimer</tt><br>
  * <tt>pipeline.addLast("CHANNEL_TRAFFIC_SHAPING", myHandler);</tt><br><br>
  *
  * <b>Note that this handler has a Pipeline Coverage of "one" which means a new handler must be created
diff --git a/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
index b6f3f708f8..7a08385781 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
@@ -31,7 +31,7 @@ import org.jboss.netty.util.Timer;
  * <ul>
  * <li>Create your unique GlobalTrafficShapingHandler like:<br><br>
  * <tt>GlobalTrafficShapingHandler myHandler = new GlobalTrafficShapingHandler(timer);</tt><br><br>
- * timer could be created using <tt>HashedWheelTimer<tt><br>
+ * timer could be created using <tt>HashedWheelTimer</tt><br>
  * <tt>pipeline.addLast("GLOBAL_TRAFFIC_SHAPING", myHandler);</tt><br><br>
  *
  * <b>Note that this handler has a Pipeline Coverage of "all" which means only one such handler must be created
diff --git a/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java b/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java
index 9d19664799..28dc413f3f 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java
@@ -113,7 +113,7 @@ public class TrafficCounter {
     /**
      * used in stop() to cancel the timer
      */
-    volatile private Timeout timeout = null;
+   private volatile Timeout timeout;
 
     /**
      * Is Monitor active
diff --git a/src/main/java/org/jboss/netty/handler/traffic/package-info.java b/src/main/java/org/jboss/netty/handler/traffic/package-info.java
index 50ed87d3d5..f6d632243d 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/package-info.java
@@ -36,7 +36,7 @@
  *
  * The insertion in the pipeline of one of those handlers can be wherever you want, but
  * <b>it must be placed before any <tt>{@link MemoryAwareThreadPoolExecutor}</tt>
- * in your pipeline</b>.</li><br>
+ * in your pipeline</b>.<br>
  * <b><i>It is really recommended to have such a</i> <tt>{@link MemoryAwareThreadPoolExecutor}</tt>
  * <i>(either non ordered or </i> <tt>{@link OrderedMemoryAwareThreadPoolExecutor}</tt>
  * <i>) in your pipeline</i></b>
@@ -76,7 +76,7 @@
  *
  * <P>So in your application you will create your own TrafficShapingHandler and set the values to fit your needs.</P>
  * <tt>XXXXXTrafficShapingHandler myHandler = new XXXXXTrafficShapingHandler(timer);</tt><br><br>
- * timer could be created using <tt>HashedWheelTimer<tt> and XXXXX could be either
+ * timer could be created using <tt>HashedWheelTimer</tt> and XXXXX could be either
  * Global or Channel<br>
  * <tt>pipeline.addLast("XXXXX_TRAFFIC_SHAPING", myHandler);</tt><br>
  * <tt>...</tt><br>