From 0277a68c4920413d0a89f8d2adedbda4d70091e0 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Mon, 20 Jul 2009 04:50:03 +0000
Subject: [PATCH] Updated APIviz tags

---
 .../org/jboss/netty/handler/codec/oneone/package-info.java   | 2 +-
 .../org/jboss/netty/handler/codec/protobuf/package-info.java | 2 ++
 .../jboss/netty/handler/codec/replay/ReplayingDecoder.java   | 1 +
 .../org/jboss/netty/handler/codec/replay/package-info.java   | 5 +++++
 .../netty/handler/codec/serialization/ObjectDecoder.java     | 1 +
 .../netty/handler/codec/serialization/ObjectEncoder.java     | 1 +
 .../netty/handler/codec/serialization/package-info.java      | 4 +++-
 .../org/jboss/netty/handler/codec/string/package-info.java   | 2 ++
 .../handler/execution/MemoryAwareThreadPoolExecutor.java     | 4 ++--
 .../java/org/jboss/netty/handler/execution/package-info.java | 4 ++++
 .../java/org/jboss/netty/handler/logging/LoggingHandler.java | 2 ++
 .../java/org/jboss/netty/handler/logging/package-info.java   | 1 +
 src/main/java/org/jboss/netty/handler/ssl/package-info.java  | 2 ++
 .../java/org/jboss/netty/handler/stream/ChunkedInput.java    | 2 ++
 .../org/jboss/netty/handler/stream/ChunkedWriteHandler.java  | 3 +++
 .../java/org/jboss/netty/handler/stream/package-info.java    | 2 ++
 .../netty/handler/timeout/IdleStateAwareChannelHandler.java  | 2 ++
 .../timeout/IdleStateAwareChannelUpstreamHandler.java        | 2 ++
 .../java/org/jboss/netty/handler/timeout/IdleStateEvent.java | 3 +++
 .../org/jboss/netty/handler/timeout/IdleStateHandler.java    | 4 ++++
 .../org/jboss/netty/handler/timeout/ReadTimeoutHandler.java  | 4 ++++
 .../org/jboss/netty/handler/timeout/WriteTimeoutHandler.java | 4 ++++
 .../java/org/jboss/netty/handler/timeout/package-info.java   | 4 ++++
 .../org/jboss/netty/util/ExternalResourceReleasable.java     | 2 ++
 src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java  | 3 +++
 .../java/org/jboss/netty/util/ThreadRenamingRunnable.java    | 3 +++
 src/main/java/org/jboss/netty/util/Timer.java                | 4 ++++
 .../java/org/jboss/netty/util/VirtualExecutorService.java    | 2 ++
 src/main/java/org/jboss/netty/util/package-info.java         | 4 ++++
 29 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java b/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java
index 4861d94aec..a7d46e39b7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java
@@ -25,6 +25,6 @@
  * Simplistic abstract classes which help implement encoder and decoder that
  * transform an object into another object and vice versa.
  *
- * @apiviz.exclude
+ * @apiviz.exclude \.codec\.(?!oneone)[a-z0-9]+\.
  */
 package org.jboss.netty.handler.codec.oneone;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java
index 5437c0c3c0..471bfb774f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java
@@ -26,5 +26,7 @@
  * <a href="http://code.google.com/p/protobuf/">Google Protocol Buffers</a>
  * {@link com.google.protobuf.Message} into a {@link org.jboss.netty.buffer.ChannelBuffer}
  * and vice versa.
+ *
+ * @apiviz.exclude \.oneone\.
  */
 package org.jboss.netty.handler.codec.protobuf;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
index b9ca930c50..ed44df09df 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
@@ -250,6 +250,7 @@ import org.jboss.netty.handler.codec.frame.FrameDecoder;
  *        the state type; use {@link VoidEnum} if state management is unused
  *
  * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.handler.codec.replay.UnreplayableOperationException oneway - - throws
  */
 @ChannelPipelineCoverage("one")
 public abstract class ReplayingDecoder<T extends Enum<T>>
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java b/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
index 2ac7ddeb1d..ee6d47024d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
@@ -25,6 +25,11 @@
  * Specialized variation of {@link org.jboss.netty.handler.codec.frame.FrameDecoder}
  * which enables implementation of a non-blocking decoder in the blocking I/O
  * paradigm.
+ *
+ * @apiviz.exclude ^java\.lang\.
+ * @apiviz.exclude \.SimpleChannelUpstreamHandler$
+ * @apiviz.exclude \.VoidEnum$
+ * @apiviz.exclude \.codec\.(?!replay)[a-z0-9]+\.
  */
 package org.jboss.netty.handler.codec.replay;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
index e56ae97769..2dfc6f7258 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
@@ -46,6 +46,7 @@ import org.jboss.netty.handler.codec.frame.FrameDecoder;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.handler.codec.serialization.ObjectDecoderInputStream - - - compatible with
  */
 public class ObjectDecoder extends FrameDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
index 65e228ebe9..cfe326f3e7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
@@ -48,6 +48,7 @@ import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
  * @version $Rev:231 $, $Date:2008-06-12 16:44:50 +0900 (목, 12 6월 2008) $
  *
  * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.handler.codec.serialization.ObjectEncoderOutputStream - - - compatible with
  */
 @ChannelPipelineCoverage("all")
 public class ObjectEncoder extends OneToOneEncoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java b/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
index e598cfbdb1..71b659128f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
@@ -26,6 +26,8 @@
  * transform a {@link java.io.Serializable} object into a byte buffer and
  * vice versa.
  *
- * @apiviz.exclude ^java\..*Stream$
+ * @apiviz.exclude ^java\.io\.
+ * @apiviz.exclude \.codec\.(?!serialization)[a-z0-9]+\.
+ * @apiviz.exclude \.CompatibleObjectDecoder$
  */
 package org.jboss.netty.handler.codec.serialization;
diff --git a/src/main/java/org/jboss/netty/handler/codec/string/package-info.java b/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
index 7e942554cf..5b6632f331 100644
--- a/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
@@ -24,5 +24,7 @@
 /**
  * Encoder and decoder which transform a {@link java.lang.String} into a
  * {@link org.jboss.netty.buffer.ChannelBuffer} and vice versa.
+ *
+ * @apiviz.exclude \.oneone\.
  */
 package org.jboss.netty.handler.codec.string;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
index 660bb8ae84..ec84672fe7 100644
--- a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
@@ -85,8 +85,8 @@ import org.jboss.netty.util.internal.LinkedTransferQueue;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.uses org.jboss.netty.util.ObjectSizeEstimator
- * @apiviz.uses org.jboss.netty.handler.execution.ChannelEventRunnable
+ * @apiviz.has org.jboss.netty.util.ObjectSizeEstimator oneway - -
+ * @apiviz.has org.jboss.netty.handler.execution.ChannelEventRunnable - - executes
  */
 public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor {
 
diff --git a/src/main/java/org/jboss/netty/handler/execution/package-info.java b/src/main/java/org/jboss/netty/handler/execution/package-info.java
index 57c506e3d8..b825387910 100644
--- a/src/main/java/org/jboss/netty/handler/execution/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/execution/package-info.java
@@ -26,5 +26,9 @@
  * thread models and memory overload prevention mechanisms.
  *
  * @apiviz.exclude ^java\.lang\.
+ * @apiviz.exclude \.netty\.channel\.
+ * @apiviz.exclude \.ExternalResourceReleasable$
+ * @apiviz.exclude \.ChannelEventRunnable$
+ *
  */
 package org.jboss.netty.handler.execution;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java b/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java
index e6a8a28524..e20f8e8c16 100644
--- a/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java
@@ -46,6 +46,8 @@ import org.jboss.netty.logging.InternalLoggerFactory;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
  */
 @ChannelPipelineCoverage("all")
 public class LoggingHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler {
diff --git a/src/main/java/org/jboss/netty/handler/logging/package-info.java b/src/main/java/org/jboss/netty/handler/logging/package-info.java
index aaa309dc2e..f7e63c9c1a 100644
--- a/src/main/java/org/jboss/netty/handler/logging/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/logging/package-info.java
@@ -26,5 +26,6 @@
  * using an {@link org.jboss.netty.logging.InternalLogger}.
  *
  * @apiviz.hidden
+ * @apiviz.exclude \.channel\.
  */
 package org.jboss.netty.handler.logging;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/ssl/package-info.java b/src/main/java/org/jboss/netty/handler/ssl/package-info.java
index e7fb4398de..5d4d58dd19 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/package-info.java
@@ -24,5 +24,7 @@
 /**
  * <a href="http://en.wikipedia.org/wiki/Transport_Layer_Security">SSL &middot;
  * TLS</a> implementation based on {@link javax.net.ssl.SSLEngine}
+ *
+ * @apiviz.exclude \.(channel|codec)\.
  */
 package org.jboss.netty.handler.ssl;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java
index a945ef4b2f..e96e0578d6 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java
@@ -30,6 +30,8 @@ import org.jboss.netty.buffer.ChannelBuffer;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
  */
 public interface ChunkedInput {
 
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
index 031cddaa17..6ce505247f 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
@@ -69,6 +69,9 @@ import org.jboss.netty.util.internal.LinkedTransferQueue;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.handler.stream.ChunkedInput oneway - - reads from
  */
 @ChannelPipelineCoverage("one")
 public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler {
diff --git a/src/main/java/org/jboss/netty/handler/stream/package-info.java b/src/main/java/org/jboss/netty/handler/stream/package-info.java
index 9d1bdf0ad8..7db90265b3 100644
--- a/src/main/java/org/jboss/netty/handler/stream/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/stream/package-info.java
@@ -25,5 +25,7 @@
  * Writes very large data stream asynchronously neither spending a lot of
  * memory nor getting {@link java.lang.OutOfMemoryError}.  For a detailed
  * example, please refer to {@code org.jboss.netty.example.http.file}.
+ *
+ * @apiviz.exclude \.channel\.
  */
 package org.jboss.netty.handler.stream;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java
index 7afad34c39..5a7bc884a1 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java
@@ -34,6 +34,8 @@ import org.jboss.netty.channel.SimpleChannelHandler;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.uses org.jboss.netty.handler.timeout.IdleStateEvent
  */
 public class IdleStateAwareChannelHandler extends SimpleChannelHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
index e3e719ea95..5388856a1d 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
@@ -34,6 +34,8 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.uses org.jboss.netty.handler.timeout.IdleStateEvent
  */
 public class IdleStateAwareChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java
index 60c4d55efa..819c488d7f 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java
@@ -32,6 +32,9 @@ import org.jboss.netty.channel.ChannelEvent;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.handler.timeout.IdleState oneway - -
  */
 public interface IdleStateEvent extends ChannelEvent {
     /**
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
index b46ddb5cfd..3da25d8e54 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
@@ -76,6 +76,10 @@ import org.jboss.netty.util.TimerTask;
  * @see HashedWheelTimer
  * @see ReadTimeoutHandler
  * @see WriteTimeoutHandler
+ *
+ * @apiviz.landmark
+ * @apiviz.uses org.jboss.netty.util.HashedWheelTimer
+ * @apiviz.has org.jboss.netty.handler.timeout.IdleStateEvent oneway - - triggers
  */
 @ChannelPipelineCoverage("one")
 public class IdleStateHandler extends SimpleChannelUpstreamHandler
diff --git a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
index 7e6a7eebb8..4fd0d8592e 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
@@ -50,6 +50,10 @@ import org.jboss.netty.util.TimerTask;
  * @see HashedWheelTimer
  * @see WriteTimeoutHandler
  * @see IdleStateHandler
+ *
+ * @apiviz.landmark
+ * @apiviz.uses org.jboss.netty.util.HashedWheelTimer
+ * @apiviz.has org.jboss.netty.handler.timeout.TimeoutException oneway - - raises
  */
 @ChannelPipelineCoverage("one")
 public class ReadTimeoutHandler extends SimpleChannelUpstreamHandler
diff --git a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
index edd8479230..221c0a1049 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
@@ -50,6 +50,10 @@ import org.jboss.netty.util.TimerTask;
  * @see HashedWheelTimer
  * @see ReadTimeoutHandler
  * @see IdleStateHandler
+ *
+ * @apiviz.landmark
+ * @apiviz.uses org.jboss.netty.util.HashedWheelTimer
+ * @apiviz.has org.jboss.netty.handler.timeout.TimeoutException oneway - - raises
  */
 @ChannelPipelineCoverage("all")
 public class WriteTimeoutHandler extends SimpleChannelDownstreamHandler
diff --git a/src/main/java/org/jboss/netty/handler/timeout/package-info.java b/src/main/java/org/jboss/netty/handler/timeout/package-info.java
index eab4cd8cd6..8e08654fa3 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/package-info.java
@@ -24,5 +24,9 @@
 /**
  * Adds support for read and write timeout and idle connection notification
  * using a {@link org.jboss.netty.util.Timer}.
+ *
+ * @apiviz.exclude \.channel\.
+ * @apiviz.exclude \.DefaultIdleStateEvent$
+ * @apiviz.exclude \.ExternalResourceReleasable$
  */
 package org.jboss.netty.handler.timeout;
\ No newline at end of file
diff --git a/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java b/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java
index c02e951024..77adbb7c1c 100644
--- a/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java
+++ b/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java
@@ -29,6 +29,8 @@ package org.jboss.netty.util;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
  */
 public interface ExternalResourceReleasable {
 
diff --git a/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java b/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
index bbb3c721e1..ae74f5aff0 100644
--- a/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
+++ b/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
@@ -30,6 +30,9 @@ package org.jboss.netty.util;
  * @author Trustin Lee (tlee@redhat.com)
  *
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
+ * @apiviz.uses org.jboss.netty.util.EstimatableObjectWrapper
  */
 public interface ObjectSizeEstimator {
 
diff --git a/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java b/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java
index 95779e6c7a..72accb378a 100644
--- a/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java
+++ b/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java
@@ -35,6 +35,9 @@ import org.jboss.netty.logging.InternalLoggerFactory;
  *
  * @version $Rev$, $Date$
  *
+ * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.util.ThreadNameDeterminer oneway - -
+ *
  */
 public class ThreadRenamingRunnable implements Runnable {
 
diff --git a/src/main/java/org/jboss/netty/util/Timer.java b/src/main/java/org/jboss/netty/util/Timer.java
index c0e7a56602..69ad28b133 100644
--- a/src/main/java/org/jboss/netty/util/Timer.java
+++ b/src/main/java/org/jboss/netty/util/Timer.java
@@ -32,6 +32,10 @@ import java.util.concurrent.TimeUnit;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
+ * @apiviz.has org.jboss.netty.util.TimerTask oneway - - executes
+ * @apiviz.has org.jboss.netty.util.Timeout oneway - - creates
  */
 public interface Timer {
 
diff --git a/src/main/java/org/jboss/netty/util/VirtualExecutorService.java b/src/main/java/org/jboss/netty/util/VirtualExecutorService.java
index 023817413d..b695c80a2f 100644
--- a/src/main/java/org/jboss/netty/util/VirtualExecutorService.java
+++ b/src/main/java/org/jboss/netty/util/VirtualExecutorService.java
@@ -80,6 +80,8 @@ import org.jboss.netty.util.internal.MapBackedSet;
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
  * @version $Rev$, $Date$
+ *
+ * @apiviz.landmark
  */
 public class VirtualExecutorService extends AbstractExecutorService {
 
diff --git a/src/main/java/org/jboss/netty/util/package-info.java b/src/main/java/org/jboss/netty/util/package-info.java
index 131187bfd0..e6294f59b9 100644
--- a/src/main/java/org/jboss/netty/util/package-info.java
+++ b/src/main/java/org/jboss/netty/util/package-info.java
@@ -25,5 +25,9 @@
  * Utility classes used across multiple packages.
  *
  * @apiviz.exclude
+ * @apiviz.exclude ^java\.(lang|util)\.
+ * @apiviz.exclude \.netty\.(?!util)[a-z0-9]+\.
+ * @apiviz.exclude Util$
+ * @apiviz.exclude \.EstimatableObjectWrapper$
  */
 package org.jboss.netty.util;
\ No newline at end of file