converted package.html to packe-info.java / added apiviz

author: Eike Stepper 2011-09-03 08:40:10 +0000
committer: Eike Stepper 2011-09-03 08:40:10 +0000
commit: d70c57c18b2e080ca322d93b5ef04a26b9d40d6b (patch)
tree: 30d3bb6a4f638ac470516f6e4e7a23c04c1eff38
parent: 036b35cf4e193f840a66431450da33267ce95e12 (diff)
download: cdo-d70c57c18b2e080ca322d93b5ef04a26b9d40d6b.tar.gz
cdo-d70c57c18b2e080ca322d93b5ef04a26b9d40d6b.tar.xz
cdo-d70c57c18b2e080ca322d93b5ef04a26b9d40d6b.zip
949 files changed, 4805 insertions, 3298 deletions
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
index 046494ff3b..611d1a92fb 100644
--- a/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.jvm/.settings/org.eclipse.jdt.core.prefs
@@ -4,7 +4,7 @@ org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
 org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html,package-info.java
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
index 62f7f943ff..268146ed36 100644
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.jvm;version="4.0.0";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests",
- org.eclipse.net4j.internal.jvm.bundle;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.internal.jvm.messages;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.jvm;version="4.0.0"
+Export-Package: org.eclipse.net4j.internal.jvm;version="4.0.100";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests",
+ org.eclipse.net4j.internal.jvm.bundle;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.internal.jvm.messages;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.jvm;version="4.0.100"
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java
new file mode 100644
index 0000000000..2a2a7e57a6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+
+/**
+ * Transport layer extension with support for JVM embedded connections. 
+ */
+package org.eclipse.net4j.jvm;
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package.html b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package.html
deleted file mode 100644
index 8d13571290..0000000000
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-	  Eike Stepper - initial API and implementation
-
--->
-</head>
-<body bgcolor="white">
-
-Transport layer extension with support for JVM embedded connections. 
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
index 046494ff3b..611d1a92fb 100644
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
@@ -4,7 +4,7 @@ org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
 org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html,package-info.java
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
index 5ed65127a0..612e7831e8 100644
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.tcp;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,9 +12,9 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.tcp;version="4.0.0";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples",
- org.eclipse.net4j.internal.tcp.bundle;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.internal.tcp.messages;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.internal.tcp.ssl;version="4.0.0";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples",
- org.eclipse.net4j.tcp;version="4.0.0",
- org.eclipse.net4j.tcp.ssl;version="4.0.0"
+Export-Package: org.eclipse.net4j.internal.tcp;version="4.0.100";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples",
+ org.eclipse.net4j.internal.tcp.bundle;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.internal.tcp.messages;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.internal.tcp.ssl;version="4.0.100";x-friends:="org.eclipse.net4j.tests,org.eclipse.net4j.defs,org.eclipse.emf.cdo.examples",
+ org.eclipse.net4j.tcp;version="4.0.100",
+ org.eclipse.net4j.tcp.ssl;version="4.0.100"
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java
new file mode 100644
index 0000000000..e24bb3fd99
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+
+/**
+ * Transport layer extension with support for TCP socket connections. 
+ */
+package org.eclipse.net4j.tcp;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package.html b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package.html
deleted file mode 100644
index b4862cb130..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/package.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-	  Eike Stepper - initial API and implementation
-
--->
-</head>
-<body bgcolor="white">
-
-Transport layer extension with support for TCP socket connections. 
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java
new file mode 100644
index 0000000000..109303f351
--- /dev/null
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+
+/**
+ * Transport layer extension with support for TCP/SSL socket connections. 
+ */
+package org.eclipse.net4j.tcp.ssl;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package.html b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package.html
deleted file mode 100644
index 5ea924f5ac..0000000000
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ssl/package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-	  Eike Stepper - initial API and implementation
-
--->
-</head>
-<body bgcolor="white">
-
-Transport layer extension with support for TCP/SSL socket connections. 
-<p>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
index 046494ff3b..611d1a92fb 100644
--- a/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.ui/.settings/org.eclipse.jdt.core.prefs
@@ -4,7 +4,7 @@ org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
 org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html,package-info.java
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index 805a650284..670ca85e31 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.ui;version="4.0.0",
- org.eclipse.net4j.internal.ui.bundle;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.internal.ui.container;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.internal.ui.messages;version="4.0.0";x-internal:=true,
- org.eclipse.net4j.internal.ui.views;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs"
+Export-Package: org.eclipse.net4j.ui;version="4.0.100",
+ org.eclipse.net4j.internal.ui.bundle;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.internal.ui.container;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.internal.ui.messages;version="4.0.100";x-internal:=true,
+ org.eclipse.net4j.internal.ui.views;version="4.0.100";x-friends:="org.eclipse.net4j.ui.defs"
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java
new file mode 100644
index 0000000000..884e7e799f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+
+/**
+ * Reusable UI components specific to the Net4j Signalling Platform.
+ */
+package org.eclipse.net4j.ui;
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package.html b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package.html
deleted file mode 100644
index 46480b1e1c..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-	Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-	
-	Contributors:
-	  Eike Stepper - initial API and implementation
-
--->
-</head>
-<body bgcolor="white">
-
-Reusable UI components specific to the Net4j Signalling Platform.
-<p>
-
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc.ant b/plugins/org.eclipse.net4j.util.doc/javadoc.ant
index 4ff895854c..99947d2faf 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc.ant
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc.ant
@@ -63,6 +63,16 @@
 		         overview="${javadoc.project}/javadocOverview.html"
 		         bottom="&lt;i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&lt;/i>">
 
+				<!--
+			<doclet name="org.jboss.apiviz.APIviz" path="${additional.jars}/apiviz-1.3.1.GA.jar">
+				-->
+			<doclet name="org.jboss.apiviz.APIviz" path="C:\develop\ws\cdo\APIVIZ\bin;${additional.jars}/jdepend-2.9.1.jar">
+				<!--
+				<param name="-foo" value="foovalue" />
+				<param name="-bar" value="barvalue" />
+				-->
+			</doclet>
+
 			<fileset dir="plugins" defaultexcludes="yes">
 				<include name="org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/*.java" />
 				<include name="org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/*.java" />
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.html
index ce558e2773..d5f7c2ea93 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.html
@@ -97,13 +97,15 @@ Class AdapterUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>AdapterUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="AdapterUtil.html" title="&#171;static&#187; AdapterUtil" alt="" coords="5,5,91,45"/>
+</map>
+
+<CENTER><IMG SRC="AdapterUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.png
new file mode 100644
index 0000000000..e7005129c2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/AdapterUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.html
index f843b516ff..23655782e8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.html
@@ -97,13 +97,15 @@ Class CheckUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>CheckUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CheckUtil.html" title="&#171;static&#187; CheckUtil" alt="" coords="5,5,83,45"/>
+</map>
+
+<CENTER><IMG SRC="CheckUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.png
new file mode 100644
index 0000000000..b2f1f7111d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/CheckUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.html
index 2870ad3715..ea9abd796f 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.html
@@ -97,13 +97,15 @@ Class HexUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>HexUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="HexUtil.html" title="&#171;static&#187; HexUtil" alt="" coords="5,5,72,45"/>
+</map>
+
+<CENTER><IMG SRC="HexUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.png
new file mode 100644
index 0000000000..89149683d6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/HexUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.html
index eeb64e4b1b..2c79962a94 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.html
@@ -93,14 +93,18 @@ Interface IErrorHandler</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IErrorHandler</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IErrorHandler.html" title="&#171;interface&#187; IErrorHandler" alt="" coords="5,5,101,45"/>
+</map>
+
+<CENTER><IMG SRC="IErrorHandler.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.png
new file mode 100644
index 0000000000..b048d379be
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/IErrorHandler.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.html
index 671960617f..aa4313273e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.html
@@ -102,12 +102,17 @@ Class ImplementationError</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ImplementationError</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Error.html?is-external=true" title="class or interface in java.lang">Error</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ImplementationError.html" title="&#171;exception&#187; ImplementationError" alt="" coords="5,100,144,140"/>
+<area shape="rect" id="node2" title="&#171;exception&#187; Error (java.lang)" alt="" coords="29,6,120,61"/>
+</map>
+
+<CENTER><IMG SRC="ImplementationError.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../serialized-form.html#org.eclipse.net4j.util.ImplementationError">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.png
new file mode 100644
index 0000000000..1f29980a33
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ImplementationError.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.html
index bedfc8240e..f5fb204704 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.html
@@ -97,13 +97,15 @@ Class ObjectUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ObjectUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ObjectUtil.html" title="&#171;static&#187; ObjectUtil" alt="" coords="5,5,83,45"/>
+</map>
+
+<CENTER><IMG SRC="ObjectUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.png
new file mode 100644
index 0000000000..6ebde26f0a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ObjectUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.html
index 1de489931a..2b643da9df 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.html
@@ -95,13 +95,15 @@ Annotation Type ReflectUtil.ExcludeFromDump</H2>
 <DT><PRE><FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Retention.html?is-external=true" title="class or interface in java.lang.annotation">@Retention</A>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Retention.html?is-external=true#value()" title="class or interface in java.lang.annotation">value</A>=<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME" title="class or interface in java.lang.annotation">RUNTIME</A>)
 <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Target.html?is-external=true" title="class or interface in java.lang.annotation">@Target</A>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/Target.html?is-external=true#value()" title="class or interface in java.lang.annotation">value</A>=<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD" title="class or interface in java.lang.annotation">FIELD</A>)
 </FONT>public static @interface <B>ReflectUtil.ExcludeFromDump</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ReflectUtil.ExcludeFromDump.html" title="&#171;annotation&#187; ReflectUtil.ExcludeFromDump" alt="" coords="5,5,200,45"/>
+</map>
+
+<CENTER><IMG SRC="ReflectUtil.ExcludeFromDump.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 
 <P>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.png
new file mode 100644
index 0000000000..d9d10a92dc
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.ExcludeFromDump.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.html
index 8b0293f226..b72981c82e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.html
@@ -97,13 +97,15 @@ Class ReflectUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ReflectUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ReflectUtil.html" title="&#171;static&#187; ReflectUtil" alt="" coords="5,5,85,45"/>
+</map>
+
+<CENTER><IMG SRC="ReflectUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.png
new file mode 100644
index 0000000000..14f1ef4c35
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ReflectUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.html
index 3136f52fb1..70b596264d 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.html
@@ -97,13 +97,15 @@ Class StringUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>StringUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="StringUtil.html" title="&#171;static&#187; StringUtil" alt="" coords="5,5,80,45"/>
+</map>
+
+<CENTER><IMG SRC="StringUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.png
new file mode 100644
index 0000000000..1c39bf25f6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/StringUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.html
index d5afea967c..39aa2937bc 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.html
@@ -97,7 +97,13 @@ Class UUIDGenerator</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>UUIDGenerator</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="UUIDGenerator.html" title="UUIDGenerator" alt="" coords="5,6,115,31"/>
+</map>
+
+<CENTER><IMG SRC="UUIDGenerator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Generates 16 byte UUID values and can encode them to Strings, decode from Strings respectively.
@@ -107,8 +113,6 @@ Generates 16 byte UUID values and can encode them to Strings, decode from String
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.2</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.png
new file mode 100644
index 0000000000..0c43b15ee6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/UUIDGenerator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.html
index d14da73ede..faba349721 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.html
@@ -103,12 +103,17 @@ Class WrappedException</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>WrappedException</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="WrappedException.html" title="&#171;exception&#187; WrappedException" alt="" coords="5,100,136,140"/>
+<area shape="rect" id="node2" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="7,6,135,61"/>
+</map>
+
+<CENTER><IMG SRC="WrappedException.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../serialized-form.html#org.eclipse.net4j.util.WrappedException">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.png
new file mode 100644
index 0000000000..dacf6dae07
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/WrappedException.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.html
index 6dc2749836..d6fc1e5e6f 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.html
@@ -103,13 +103,17 @@ Class Cache&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>Cache&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/concurrent/Worker.html" title="class in org.eclipse.net4j.util.concurrent">Worker</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/cache/ICache.html" title="interface in org.eclipse.net4j.util.cache">ICache</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICache.html" title="&#171;interface&#187; ICache" alt="" coords="5,5,91,45"/>
+<area shape="rect" id="node2" href="../concurrent/Worker.html" title="Worker (org.eclipse.net4j.util.concurrent)" alt="" coords="120,5,331,45"/>
+<area shape="rect" id="node3" href="Cache.html" title="Cache" alt="" coords="107,85,165,110"/>
+</map>
+
+<CENTER><IMG SRC="Cache.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.png
new file mode 100644
index 0000000000..13452722a0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/Cache.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.html
index 3ad8215cbe..6c149eaf3a 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.html
@@ -103,13 +103,17 @@ Class CacheMonitor</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>CacheMonitor</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/concurrent/Worker.html" title="class in org.eclipse.net4j.util.concurrent">Worker</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/cache/ICacheMonitor.html" title="interface in org.eclipse.net4j.util.cache">ICacheMonitor</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheMonitor.html" title="&#171;interface&#187; ICacheMonitor" alt="" coords="5,5,109,45"/>
+<area shape="rect" id="node2" href="../concurrent/Worker.html" title="Worker (org.eclipse.net4j.util.concurrent)" alt="" coords="140,5,351,45"/>
+<area shape="rect" id="node3" href="CacheMonitor.html" title="CacheMonitor" alt="" coords="99,85,201,110"/>
+</map>
+
+<CENTER><IMG SRC="CacheMonitor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.png
new file mode 100644
index 0000000000..bc0c4da7bf
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheMonitor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.html
index 9c2204823b..10c737fb97 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.html
@@ -100,13 +100,16 @@ Class CacheRegistration</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>CacheRegistration</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/cache/ICacheRegistration.html" title="interface in org.eclipse.net4j.util.cache">ICacheRegistration</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheRegistration.html" title="&#171;interface&#187; ICacheRegistration" alt="" coords="5,5,136,45"/>
+<area shape="rect" id="node2" href="CacheRegistration.html" title="CacheRegistration" alt="" coords="7,85,135,110"/>
+</map>
+
+<CENTER><IMG SRC="CacheRegistration.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.png
new file mode 100644
index 0000000000..91d67811c0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/CacheRegistration.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.html
index 11496ef341..e40e158978 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.html
@@ -101,13 +101,16 @@ Class HysteresisConditionPolicy</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>HysteresisConditionPolicy</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/cache/ThresholdConditionPolicy.html" title="class in org.eclipse.net4j.util.cache">ThresholdConditionPolicy</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ThresholdConditionPolicy.html" title="ThresholdConditionPolicy" alt="" coords="8,6,176,31"/>
+<area shape="rect" id="node2" href="HysteresisConditionPolicy.html" title="HysteresisConditionPolicy" alt="" coords="5,71,179,97"/>
+</map>
+
+<CENTER><IMG SRC="HysteresisConditionPolicy.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.png
new file mode 100644
index 0000000000..2f304320e4
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.html
index abab67e02b..057c989f8a 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.html
@@ -96,13 +96,16 @@ Interface ICache</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ICache</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICache.html" title="&#171;interface&#187; ICache" alt="" coords="5,5,91,45"/>
+<area shape="rect" id="node2" href="Cache.html" title="Cache" alt="" coords="19,85,77,110"/>
+</map>
+
+<CENTER><IMG SRC="ICache.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.png
new file mode 100644
index 0000000000..9735253406
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICache.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.html
index efa26bb082..396b536851 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.html
@@ -104,13 +104,15 @@ Enum ICacheMonitor.Condition</H2>
 <HR>
 <DL>
 <DT><PRE>public static enum <B>ICacheMonitor.Condition</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</A>&lt;<A HREF="../../../../../org/eclipse/net4j/util/cache/ICacheMonitor.Condition.html" title="enum in org.eclipse.net4j.util.cache">ICacheMonitor.Condition</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheMonitor.Condition.html" title="&#171;enum&#187; ICacheMonitor.Condition" alt="" coords="5,5,168,45"/>
+</map>
+
+<CENTER><IMG SRC="ICacheMonitor.Condition.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.png
new file mode 100644
index 0000000000..a918248fa8
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.Condition.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.html
index ba3b061ac6..b34cdadcc9 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.html
@@ -99,13 +99,16 @@ Interface ICacheMonitor.ConditionPolicy</H2>
 <HR>
 <DL>
 <DT><PRE>public static interface <B>ICacheMonitor.ConditionPolicy</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheMonitor.ConditionPolicy.html" title="&#171;interface&#187; ICacheMonitor.ConditionPolicy" alt="" coords="5,5,203,45"/>
+<area shape="rect" id="node2" href="ThresholdConditionPolicy.html" title="ThresholdConditionPolicy" alt="" coords="20,85,188,110"/>
+</map>
+
+<CENTER><IMG SRC="ICacheMonitor.ConditionPolicy.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.png
new file mode 100644
index 0000000000..28989bdfb7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.html
index 936416de87..7cce45a031 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.html
@@ -99,13 +99,17 @@ Interface ICacheMonitor</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ICacheMonitor</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/INotifier.html" title="interface in org.eclipse.net4j.util.event">INotifier</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../event/INotifier.html" title="&#171;interface&#187; INotifier (org.eclipse.net4j.util.event)" alt="" coords="5,6,184,61"/>
+<area shape="rect" id="node2" href="ICacheMonitor.html" title="&#171;interface&#187; ICacheMonitor" alt="" coords="42,100,147,140"/>
+<area shape="rect" id="node3" href="CacheMonitor.html" title="CacheMonitor" alt="" coords="43,179,145,205"/>
+</map>
+
+<CENTER><IMG SRC="ICacheMonitor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.png
new file mode 100644
index 0000000000..079e70fc29
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.html
index 7a0bb42c55..f05bc51161 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.html
@@ -96,12 +96,17 @@ Interface ICacheMonitorEvent</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ICacheMonitorEvent</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="interface in org.eclipse.net4j.util.event">IEvent</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../event/IEvent.html" title="&#171;interface&#187; IEvent (org.eclipse.net4j.util.event)" alt="" coords="5,6,184,61"/>
+<area shape="rect" id="node2" href="ICacheMonitorEvent.html" title="&#171;interface&#187; ICacheMonitorEvent" alt="" coords="26,100,163,140"/>
+</map>
+
+<CENTER><IMG SRC="ICacheMonitorEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.png
new file mode 100644
index 0000000000..177f124baf
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheMonitorEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.html
index cf98d1dd71..33b560f77d 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.html
@@ -99,13 +99,16 @@ Interface ICacheProbe</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ICacheProbe</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheRegistration.html" title="&#171;interface&#187; ICacheRegistration" alt="" coords="5,84,136,124"/>
+<area shape="rect" id="node2" href="ICacheProbe.html" title="&#171;interface&#187; ICacheProbe" alt="" coords="23,5,119,45"/>
+</map>
+
+<CENTER><IMG SRC="ICacheProbe.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.png
new file mode 100644
index 0000000000..29186ead4b
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheProbe.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.html
index 79b30ae9ea..5d75f48735 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.html
@@ -99,13 +99,17 @@ Interface ICacheRegistration</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ICacheRegistration</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/cache/ICacheProbe.html" title="interface in org.eclipse.net4j.util.cache">ICacheProbe</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheRegistration.html" title="&#171;interface&#187; ICacheRegistration" alt="" coords="5,84,136,124"/>
+<area shape="rect" id="node2" href="ICacheProbe.html" title="&#171;interface&#187; ICacheProbe" alt="" coords="23,5,119,45"/>
+<area shape="rect" id="node3" href="CacheRegistration.html" title="CacheRegistration" alt="" coords="7,163,135,189"/>
+</map>
+
+<CENTER><IMG SRC="ICacheRegistration.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.png
new file mode 100644
index 0000000000..b40ab6e7f0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ICacheRegistration.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.html
index 84b105bc33..c0da6912d3 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.html
@@ -103,13 +103,17 @@ Class ThresholdConditionPolicy</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ThresholdConditionPolicy</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/cache/ICacheMonitor.ConditionPolicy.html" title="interface in org.eclipse.net4j.util.cache">ICacheMonitor.ConditionPolicy</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICacheMonitor.ConditionPolicy.html" title="&#171;interface&#187; ICacheMonitor.ConditionPolicy" alt="" coords="5,5,203,45"/>
+<area shape="rect" id="node2" href="ThresholdConditionPolicy.html" title="ThresholdConditionPolicy" alt="" coords="20,85,188,110"/>
+<area shape="rect" id="node3" href="HysteresisConditionPolicy.html" title="HysteresisConditionPolicy" alt="" coords="17,150,191,175"/>
+</map>
+
+<CENTER><IMG SRC="ThresholdConditionPolicy.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.png
new file mode 100644
index 0000000000..ced16e7c23
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html
index 6c822b2288..3dce6175af 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html
@@ -88,6 +88,26 @@ A generic caching and memory monitoring framework.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CacheMonitor.html" title="CacheMonitor" alt="" coords="511,329,614,354"/>
+<area shape="rect" id="node2" href="CacheRegistration.html" title="CacheRegistration" alt="" coords="499,221,627,246"/>
+<area shape="rect" id="node3" href="HysteresisConditionPolicy.html" title="HysteresisConditionPolicy" alt="" coords="475,157,650,182"/>
+<area shape="rect" id="node4" href="ThresholdConditionPolicy.html" title="ThresholdConditionPolicy" alt="" coords="256,157,424,182"/>
+<area shape="rect" id="node5" href="Cache.html" title="Cache" alt="" coords="533,385,592,410"/>
+<area shape="rect" id="node6" href="../concurrent/Worker.html" title="Worker (org.eclipse.net4j.util.concurrent)" alt="" coords="235,349,445,389"/>
+<area shape="rect" id="node7" href="ICache.html" title="&#171;interface&#187; ICache" alt="" coords="297,413,383,453"/>
+<area shape="rect" id="node8" href="ICacheMonitor.html" title="&#171;interface&#187; ICacheMonitor" alt="" coords="287,285,393,325"/>
+<area shape="rect" id="node9" href="ICacheMonitor.ConditionPolicy.html" title="&#171;interface&#187; ICacheMonitor.ConditionPolicy" alt="" coords="6,149,205,189"/>
+<area shape="rect" id="node10" href="ICacheMonitorEvent.html" title="&#171;interface&#187; ICacheMonitorEvent" alt="" coords="271,77,409,117"/>
+<area shape="rect" id="node11" href="ICacheProbe.html" title="&#171;interface&#187; ICacheProbe" alt="" coords="57,213,153,253"/>
+<area shape="rect" id="node12" href="ICacheRegistration.html" title="&#171;interface&#187; ICacheRegistration" alt="" coords="275,213,405,253"/>
+<area shape="rect" id="node13" href="../event/IEvent.html" title="&#171;interface&#187; IEvent (org.eclipse.net4j.util.event)" alt="" coords="15,70,195,125"/>
+<area shape="rect" id="node14" href="../event/INotifier.html" title="&#171;interface&#187; INotifier (org.eclipse.net4j.util.event)" alt="" coords="15,278,195,333"/>
+<area shape="rect" id="node15" href="ICacheMonitor.Condition.html" title="&#171;enum&#187; ICacheMonitor.Condition" alt="" coords="24,5,187,45"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -171,27 +191,6 @@ Package org.eclipse.net4j.util.cache Description
 
 <P>
 A generic caching and memory monitoring framework.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.png
new file mode 100644
index 0000000000..c13dc0cdf0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.html
index 877faaddab..5f919b7667 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.html
@@ -100,7 +100,14 @@ Class ArrayIterator&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ArrayIterator&lt;T&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</A>&lt;T&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Iterator (java.util)" alt="" coords="9,6,95,61"/>
+<area shape="rect" id="node2" href="ArrayIterator.html" title="ArrayIterator" alt="" coords="5,101,99,126"/>
+</map>
+
+<CENTER><IMG SRC="ArrayIterator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 An object that iterates over the elements of an array
@@ -110,8 +117,6 @@ An object that iterates over the elements of an array
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.png
new file mode 100644
index 0000000000..95ed69d988
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ArrayIterator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.html
index 51a2b7a942..84a6326e31 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.html
@@ -97,14 +97,18 @@ Class BidiMapper&lt;T1,T2&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>BidiMapper&lt;T1,T2&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="BidiMapper.html" title="BidiMapper" alt="" coords="5,6,91,31"/>
+</map>
+
+<CENTER><IMG SRC="BidiMapper.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.png
new file mode 100644
index 0000000000..06a7c6078e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/BidiMapper.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.html
index 6eb34934f8..8eb51d79db 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.html
@@ -97,14 +97,18 @@ Class ByteArrayWrapper</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ByteArrayWrapper</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ByteArrayWrapper.html" title="ByteArrayWrapper" alt="" coords="5,6,133,31"/>
+</map>
+
+<CENTER><IMG SRC="ByteArrayWrapper.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.2</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.png
new file mode 100644
index 0000000000..ef7d3d83d2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/ByteArrayWrapper.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.html
index f5d27852c3..c93b5da7da 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.html
@@ -103,14 +103,19 @@ Class CaseInsensitiveStringSet</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>CaseInsensitiveStringSet</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/HashSet.html?is-external=true" title="class or interface in java.util">HashSet</A>&lt;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="HashSet (java.util)" alt="" coords="51,5,124,45"/>
+<area shape="rect" id="node2" href="CaseInsensitiveStringSet.html" title="CaseInsensitiveStringSet" alt="" coords="5,85,171,110"/>
+</map>
+
+<CENTER><IMG SRC="CaseInsensitiveStringSet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.2</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.collection.CaseInsensitiveStringSet">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.png
new file mode 100644
index 0000000000..0d2e717a59
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CaseInsensitiveStringSet.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html
index 05bf9e0610..f8fb826815 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.html
@@ -96,13 +96,16 @@ Interface Closeable</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>Closeable</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="CloseableIterator.html" title="&#171;interface&#187; CloseableIterator" alt="" coords="5,84,123,124"/>
+<area shape="rect" id="node2" href="Closeable.html" title="&#171;interface&#187; Closeable" alt="" coords="21,5,107,45"/>
+</map>
+
+<CENTER><IMG SRC="Closeable.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.png
new file mode 100644
index 0000000000..f86d41168c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Closeable.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.html
index e2d2bf54fe..e45bbaefec 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.html
@@ -96,13 +96,17 @@ Interface CloseableIterator&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>CloseableIterator&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</A>&lt;E&gt;, <A HREF="../../../../../org/eclipse/net4j/util/collection/Closeable.html" title="interface in org.eclipse.net4j.util.collection">Closeable</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Iterator (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="CloseableIterator.html" title="&#171;interface&#187; CloseableIterator" alt="" coords="46,100,164,140"/>
+<area shape="rect" id="node3" href="Closeable.html" title="&#171;interface&#187; Closeable" alt="" coords="120,13,205,53"/>
+</map>
+
+<CENTER><IMG SRC="CloseableIterator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.png
new file mode 100644
index 0000000000..f0ec3b2cf2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/CloseableIterator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.html
index 28edad6d29..c92e1aa236 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.html
@@ -97,14 +97,18 @@ Class DynamicArray&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>DynamicArray&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="DynamicArray.html" title="DynamicArray" alt="" coords="5,6,109,31"/>
+</map>
+
+<CENTER><IMG SRC="DynamicArray.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.png
new file mode 100644
index 0000000000..632e259baf
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/DynamicArray.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.html
index 3bbd5e8443..3866f4a583 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.html
@@ -97,14 +97,18 @@ Class FastList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>FastList&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="FastList.html" title="FastList" alt="" coords="5,6,75,31"/>
+</map>
+
+<CENTER><IMG SRC="FastList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.png
new file mode 100644
index 0000000000..b29ca75206
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/FastList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.html
index 2309f7beb4..eca6ce4a3e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.html
@@ -100,13 +100,16 @@ Class HashBag&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>HashBag&lt;T&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</A>&lt;T&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Set (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="HashBag.html" title="HashBag" alt="" coords="11,101,85,126"/>
+</map>
+
+<CENTER><IMG SRC="HashBag.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.png
new file mode 100644
index 0000000000..35b6635bf4
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HashBag.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.html
index 973df823a5..94ca725d70 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.html
@@ -104,13 +104,18 @@ Class History&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>History&lt;T&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/Notifier.html" title="class in org.eclipse.net4j.util.event">Notifier</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/collection/IHistory.html" title="interface in org.eclipse.net4j.util.collection">IHistory</A>&lt;T&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IHistory.html" title="&#171;interface&#187; IHistory" alt="" coords="5,5,91,45"/>
+<area shape="rect" id="node2" href="PreferenceHistory.html" title="PreferenceHistory" alt="" coords="67,150,192,175"/>
+<area shape="rect" id="node3" href="../event/Notifier.html" title="Notifier (org.eclipse.net4j.util.event)" alt="" coords="121,5,300,45"/>
+<area shape="rect" id="node4" href="History.html" title="History" alt="" coords="98,85,160,110"/>
+</map>
+
+<CENTER><IMG SRC="History.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.png
new file mode 100644
index 0000000000..e749d38bd0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/History.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.html
index dcd4b9f056..45f6fd2ab0 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.html
@@ -100,13 +100,16 @@ Class HistoryElement&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>HistoryElement&lt;T&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/collection/IHistoryElement.html" title="interface in org.eclipse.net4j.util.collection">IHistoryElement</A>&lt;T&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IHistoryElement.html" title="&#171;interface&#187; IHistoryElement" alt="" coords="5,5,120,45"/>
+<area shape="rect" id="node2" href="HistoryElement.html" title="HistoryElement" alt="" coords="7,85,117,110"/>
+</map>
+
+<CENTER><IMG SRC="HistoryElement.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.png
new file mode 100644
index 0000000000..3dba3fc32c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryElement.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.html
index 1802986669..fd620090eb 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.html
@@ -97,13 +97,15 @@ Class HistoryUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>HistoryUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="HistoryUtil.html" title="&#171;static&#187; HistoryUtil" alt="" coords="5,5,88,45"/>
+</map>
+
+<CENTER><IMG SRC="HistoryUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.png
new file mode 100644
index 0000000000..ae9c81c381
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/HistoryUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.html
index 83d8122986..001d08f77e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.html
@@ -99,13 +99,18 @@ Interface IHistory&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IHistory&lt;T&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/INotifier.html" title="interface in org.eclipse.net4j.util.event">INotifier</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</A>&lt;<A HREF="../../../../../org/eclipse/net4j/util/collection/IHistoryElement.html" title="interface in org.eclipse.net4j.util.collection">IHistoryElement</A>&lt;T&gt;&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Iterable (java.lang)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="../event/INotifier.html" title="&#171;interface&#187; INotifier (org.eclipse.net4j.util.event)" alt="" coords="121,6,300,61"/>
+<area shape="rect" id="node3" href="IHistory.html" title="&#171;interface&#187; IHistory" alt="" coords="87,100,172,140"/>
+<area shape="rect" id="node4" href="History.html" title="History" alt="" coords="98,179,160,205"/>
+</map>
+
+<CENTER><IMG SRC="IHistory.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.png
new file mode 100644
index 0000000000..c441b54d65
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistory.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.html
index d9a6e8143b..dd0e57fb60 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.html
@@ -96,12 +96,17 @@ Interface IHistoryChangeEvent</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IHistoryChangeEvent</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="interface in org.eclipse.net4j.util.event">IEvent</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IHistoryChangeEvent.html" title="&#171;interface&#187; IHistoryChangeEvent" alt="" coords="23,100,165,140"/>
+<area shape="rect" id="node2" href="../event/IEvent.html" title="&#171;interface&#187; IEvent (org.eclipse.net4j.util.event)" alt="" coords="5,6,184,61"/>
+</map>
+
+<CENTER><IMG SRC="IHistoryChangeEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.png
new file mode 100644
index 0000000000..3208f6ee47
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryChangeEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.html
index 92cecb93ae..6eb98bfb0c 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.html
@@ -96,13 +96,16 @@ Interface IHistoryElement&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IHistoryElement&lt;T&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IHistoryElement.html" title="&#171;interface&#187; IHistoryElement" alt="" coords="5,5,120,45"/>
+<area shape="rect" id="node2" href="HistoryElement.html" title="HistoryElement" alt="" coords="7,85,117,110"/>
+</map>
+
+<CENTER><IMG SRC="IHistoryElement.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.png
new file mode 100644
index 0000000000..52cf296c66
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IHistoryElement.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.html
index e361d66f87..1528f7f6cb 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.html
@@ -104,13 +104,16 @@ Class IndexedList.ArrayBacked&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract static class <B>IndexedList.ArrayBacked&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/collection/IndexedList.html" title="class in org.eclipse.net4j.util.collection">IndexedList</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IndexedList.ArrayBacked.html" title="IndexedList.ArrayBacked" alt="" coords="5,71,171,97"/>
+<area shape="rect" id="node2" href="IndexedList.html" title="IndexedList" alt="" coords="44,6,132,31"/>
+</map>
+
+<CENTER><IMG SRC="IndexedList.ArrayBacked.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.png
new file mode 100644
index 0000000000..56d26302d7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.ArrayBacked.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.html
index c45a247f30..9572f5e3d1 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.html
@@ -103,14 +103,20 @@ Class IndexedList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>IndexedList&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; List (java.util)" alt="" coords="45,6,131,61"/>
+<area shape="rect" id="node2" href="IndexedList.ArrayBacked.html" title="IndexedList.ArrayBacked" alt="" coords="5,166,171,191"/>
+<area shape="rect" id="node3" href="IndexedList.html" title="IndexedList" alt="" coords="44,101,132,126"/>
+</map>
+
+<CENTER><IMG SRC="IndexedList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.png
new file mode 100644
index 0000000000..203b81059a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/IndexedList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.html
index 04dae58347..7629c000b8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.html
@@ -100,13 +100,16 @@ Class MapEntry&lt;K,V&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>MapEntry&lt;K,V&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</A>&lt;K,V&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Map.Entry (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="MapEntry.html" title="MapEntry" alt="" coords="9,101,87,126"/>
+</map>
+
+<CENTER><IMG SRC="MapEntry.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.png
new file mode 100644
index 0000000000..dc39af7730
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MapEntry.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.html
index 87b9ad8c74..1d28e544d0 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.html
@@ -103,7 +103,15 @@ Class MoveableArrayList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>MoveableArrayList&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</A>&lt;E&gt;<DT>implements <A HREF="../../../../../org/eclipse/net4j/util/collection/MoveableList.html" title="interface in org.eclipse.net4j.util.collection">MoveableList</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="MoveableList.html" title="&#171;interface&#187; MoveableList" alt="" coords="5,5,101,45"/>
+<area shape="rect" id="node2" href="MoveableArrayList.html" title="MoveableArrayList" alt="" coords="47,85,175,110"/>
+<area shape="rect" id="node3" title="ArrayList (java.util)" alt="" coords="132,5,207,45"/>
+</map>
+
+<CENTER><IMG SRC="MoveableArrayList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 A list with O(1) effort for random access.
@@ -111,8 +119,6 @@ A list with O(1) effort for random access.
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.collection.MoveableArrayList">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.png
new file mode 100644
index 0000000000..373423bbdb
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableArrayList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.html
index 4204d60e95..87b6e4b14b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.html
@@ -99,13 +99,17 @@ Interface MoveableList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>MoveableList&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="MoveableList.html" title="&#171;interface&#187; MoveableList" alt="" coords="21,100,117,140"/>
+<area shape="rect" id="node2" title="&#171;interface&#187; List (java.util)" alt="" coords="27,6,112,61"/>
+<area shape="rect" id="node3" href="MoveableArrayList.html" title="MoveableArrayList" alt="" coords="5,179,133,205"/>
+</map>
+
+<CENTER><IMG SRC="MoveableList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.png
new file mode 100644
index 0000000000..f9c76a4442
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MoveableList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.html
index 14fa98446e..9c5834072a 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.html
@@ -104,13 +104,16 @@ Class MultiMap.ListBased&lt;K,V&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>MultiMap.ListBased&lt;K,V&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/collection/MultiMap.html" title="class in org.eclipse.net4j.util.collection">MultiMap</A>&lt;K,V&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="MultiMap.html" title="MultiMap" alt="" coords="37,6,109,31"/>
+<area shape="rect" id="node2" href="MultiMap.ListBased.html" title="MultiMap.ListBased" alt="" coords="5,71,141,97"/>
+</map>
+
+<CENTER><IMG SRC="MultiMap.ListBased.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.png
new file mode 100644
index 0000000000..1f8d8d410f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.ListBased.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.html
index 0d76fee831..b62330e936 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.html
@@ -103,13 +103,17 @@ Class MultiMap&lt;K,V&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>MultiMap&lt;K,V&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</A>&lt;K,V&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Map (java.util)" alt="" coords="31,6,116,61"/>
+<area shape="rect" id="node2" href="MultiMap.html" title="MultiMap" alt="" coords="37,101,109,126"/>
+<area shape="rect" id="node3" href="MultiMap.ListBased.html" title="MultiMap.ListBased" alt="" coords="5,166,141,191"/>
+</map>
+
+<CENTER><IMG SRC="MultiMap.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.png
new file mode 100644
index 0000000000..39f7965629
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/MultiMap.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html
index 3c29b4d753..cacaaf34ab 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.html
@@ -100,13 +100,16 @@ Class Pair&lt;T1,T2&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>Pair&lt;T1,T2&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Triplet.html" title="Triplet" alt="" coords="5,71,61,97"/>
+<area shape="rect" id="node2" href="Pair.html" title="Pair" alt="" coords="11,6,56,31"/>
+</map>
+
+<CENTER><IMG SRC="Pair.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.png
new file mode 100644
index 0000000000..a9c2f85e5e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Pair.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.html
index 91bed2de92..802e2cb021 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.html
@@ -102,13 +102,16 @@ Class PreferenceHistory</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>PreferenceHistory</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/collection/History.html" title="class in org.eclipse.net4j.util.collection">History</A>&lt;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="PreferenceHistory.html" title="PreferenceHistory" alt="" coords="5,71,131,97"/>
+<area shape="rect" id="node2" href="History.html" title="History" alt="" coords="37,6,99,31"/>
+</map>
+
+<CENTER><IMG SRC="PreferenceHistory.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.png
new file mode 100644
index 0000000000..05a1e4753f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/PreferenceHistory.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.html
index ebf3ff32ad..102df486c5 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.html
@@ -100,14 +100,19 @@ Class RoundRobinBlockingQueue&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>RoundRobinBlockingQueue&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">BlockingQueue</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; BlockingQueue (java.util.concurrent)" alt="" coords="25,6,164,61"/>
+<area shape="rect" id="node2" href="RoundRobinBlockingQueue.html" title="RoundRobinBlockingQueue" alt="" coords="5,101,184,126"/>
+</map>
+
+<CENTER><IMG SRC="RoundRobinBlockingQueue.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.png
new file mode 100644
index 0000000000..ed7ba00026
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/RoundRobinBlockingQueue.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.html
index c53998fa7e..966c9df29e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.html
@@ -98,14 +98,19 @@ Class Triplet&lt;T1,T2,T3&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>Triplet&lt;T1,T2,T3&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/collection/Pair.html" title="class in org.eclipse.net4j.util.collection">Pair</A>&lt;T1,T2&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Triplet.html" title="Triplet" alt="" coords="5,71,61,97"/>
+<area shape="rect" id="node2" href="Pair.html" title="Pair" alt="" coords="11,6,56,31"/>
+</map>
+
+<CENTER><IMG SRC="Triplet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Caspar De Groot</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.png
new file mode 100644
index 0000000000..d4b1f12f73
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/Triplet.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html
index 30e96da45d..681b9dea4c 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html
@@ -88,6 +88,49 @@ Additional collection-like interfaces and classes.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ArrayIterator.html" title="ArrayIterator" alt="" coords="260,1098,353,1123"/>
+<area shape="rect" id="node2" title="ArrayList (java.util)" alt="" coords="269,892,344,932"/>
+<area shape="rect" id="node3" href="BidiMapper.html" title="BidiMapper" alt="" coords="53,954,139,979"/>
+<area shape="rect" id="node4" href="ByteArrayWrapper.html" title="ByteArrayWrapper" alt="" coords="31,901,161,926"/>
+<area shape="rect" id="node5" href="CaseInsensitiveStringSet.html" title="CaseInsensitiveStringSet" alt="" coords="223,842,390,867"/>
+<area shape="rect" id="node6" href="DynamicArray.html" title="DynamicArray" alt="" coords="44,785,148,810"/>
+<area shape="rect" id="node7" href="HashBag.html" title="HashBag" alt="" coords="269,721,344,746"/>
+<area shape="rect" id="node8" title="HashSet (java.util)" alt="" coords="59,835,133,875"/>
+<area shape="rect" id="node9" href="History.html" title="History" alt="" coords="479,595,542,621"/>
+<area shape="rect" id="node10" href="HistoryElement.html" title="HistoryElement" alt="" coords="251,491,362,517"/>
+<area shape="rect" id="node11" href="MapEntry.html" title="MapEntry" alt="" coords="267,419,346,445"/>
+<area shape="rect" id="node12" href="MoveableArrayList.html" title="MoveableArrayList" alt="" coords="447,931,575,957"/>
+<area shape="rect" id="node13" href="MultiMap.ListBased.html" title="MultiMap.ListBased" alt="" coords="442,341,579,366"/>
+<area shape="rect" id="node14" href="../event/Notifier.html" title="Notifier (org.eclipse.net4j.util.event)" alt="" coords="217,556,397,596"/>
+<area shape="rect" id="node15" href="Pair.html" title="Pair" alt="" coords="73,277,119,302"/>
+<area shape="rect" id="node16" href="PreferenceHistory.html" title="PreferenceHistory" alt="" coords="624,595,749,621"/>
+<area shape="rect" id="node17" href="RoundRobinBlockingQueue.html" title="RoundRobinBlockingQueue" alt="" coords="217,213,397,238"/>
+<area shape="rect" id="node18" href="Triplet.html" title="Triplet" alt="" coords="278,277,335,302"/>
+<area shape="rect" id="node19" href="FastList.html" title="FastList" alt="" coords="61,149,131,174"/>
+<area shape="rect" id="node20" href="IndexedList.html" title="IndexedList" alt="" coords="263,1021,351,1046"/>
+<area shape="rect" id="node21" href="IndexedList.ArrayBacked.html" title="IndexedList.ArrayBacked" alt="" coords="427,1021,594,1046"/>
+<area shape="rect" id="node22" href="MultiMap.html" title="MultiMap" alt="" coords="270,341,343,366"/>
+<area shape="rect" id="node23" title="&#171;interface&#187; BlockingQueue (java.util.concurrent)" alt="" coords="27,198,165,253"/>
+<area shape="rect" id="node24" href="Closeable.html" title="&#171;interface&#187; Closeable" alt="" coords="53,1163,139,1203"/>
+<area shape="rect" id="node25" href="CloseableIterator.html" title="&#171;interface&#187; CloseableIterator" alt="" coords="247,1156,366,1196"/>
+<area shape="rect" id="node26" href="../event/IEvent.html" title="&#171;interface&#187; IEvent (org.eclipse.net4j.util.event)" alt="" coords="6,70,186,125"/>
+<area shape="rect" id="node27" href="IHistory.html" title="&#171;interface&#187; IHistory" alt="" coords="264,620,349,660"/>
+<area shape="rect" id="node28" href="IHistoryChangeEvent.html" title="&#171;interface&#187; IHistoryChangeEvent" alt="" coords="235,77,378,117"/>
+<area shape="rect" id="node29" href="IHistoryElement.html" title="&#171;interface&#187; IHistoryElement" alt="" coords="39,484,153,524"/>
+<area shape="rect" id="node30" href="../event/INotifier.html" title="&#171;interface&#187; INotifier (org.eclipse.net4j.util.event)" alt="" coords="6,549,186,603"/>
+<area shape="rect" id="node31" title="&#171;interface&#187; Iterable (java.lang)" alt="" coords="53,627,139,682"/>
+<area shape="rect" id="node32" title="&#171;interface&#187; Iterator (java.util)" alt="" coords="53,1083,139,1138"/>
+<area shape="rect" id="node33" title="&#171;interface&#187; List (java.util)" alt="" coords="53,1005,139,1059"/>
+<area shape="rect" id="node34" title="&#171;interface&#187; Map (java.util)" alt="" coords="53,326,139,381"/>
+<area shape="rect" id="node35" title="&#171;interface&#187; Map.Entry (java.util)" alt="" coords="53,405,139,459"/>
+<area shape="rect" id="node36" href="MoveableList.html" title="&#171;interface&#187; MoveableList" alt="" coords="258,956,355,996"/>
+<area shape="rect" id="node37" title="&#171;interface&#187; Set (java.util)" alt="" coords="53,706,139,761"/>
+<area shape="rect" id="node38" href="HistoryUtil.html" title="&#171;static&#187; HistoryUtil" alt="" coords="55,5,137,45"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -217,27 +260,6 @@ Package org.eclipse.net4j.util.collection Description
 
 <P>
 Additional collection-like interfaces and classes.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.png
new file mode 100644
index 0000000000..a60ac50d50
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.html
index b5e9cb4e16..a74a314b61 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.html
@@ -100,13 +100,17 @@ Class AsynchronousWorkSerializer</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>AsynchronousWorkSerializer</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IWorkSerializer.html" title="interface in org.eclipse.net4j.util.concurrent">IWorkSerializer</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Runnable (java.lang)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="IWorkSerializer.html" title="&#171;interface&#187; IWorkSerializer" alt="" coords="121,13,231,53"/>
+<area shape="rect" id="node3" href="AsynchronousWorkSerializer.html" title="AsynchronousWorkSerializer" alt="" coords="17,101,207,126"/>
+</map>
+
+<CENTER><IMG SRC="AsynchronousWorkSerializer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.png
new file mode 100644
index 0000000000..d62358d2a3
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/AsynchronousWorkSerializer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.html
index b70ca7fe98..786469b015 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.html
@@ -100,13 +100,16 @@ Class CompletionWorkSerializer</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>CompletionWorkSerializer</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IWorkSerializer.html" title="interface in org.eclipse.net4j.util.concurrent">IWorkSerializer</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IWorkSerializer.html" title="&#171;interface&#187; IWorkSerializer" alt="" coords="35,5,145,45"/>
+<area shape="rect" id="node2" href="CompletionWorkSerializer.html" title="CompletionWorkSerializer" alt="" coords="5,85,176,110"/>
+</map>
+
+<CENTER><IMG SRC="CompletionWorkSerializer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.png
new file mode 100644
index 0000000000..17a1072aba
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/CompletionWorkSerializer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.html
index f401b11c29..6c97af5076 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.html
@@ -97,13 +97,15 @@ Class ConcurrencyUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ConcurrencyUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ConcurrencyUtil.html" title="&#171;static&#187; ConcurrencyUtil" alt="" coords="5,5,120,45"/>
+</map>
+
+<CENTER><IMG SRC="ConcurrencyUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.png
new file mode 100644
index 0000000000..9cb3be653d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrencyUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.html
index ee44ad052a..b4fab18399 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.html
@@ -97,7 +97,13 @@ Class ConcurrentValue&lt;T&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ConcurrentValue&lt;T&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ConcurrentValue.html" title="ConcurrentValue" alt="" coords="5,6,123,31"/>
+</map>
+
+<CENTER><IMG SRC="ConcurrentValue.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Allow synchronization between many threads for a specific value, e.g.:
@@ -130,8 +136,6 @@ Allow synchronization between many threads for a specific value, e.g.:
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Simon McDuff</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.png
new file mode 100644
index 0000000000..3e9a62f167
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ConcurrentValue.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.html
index ae84fa960f..3792e56a82 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.html
@@ -101,14 +101,19 @@ Class ExecutorServiceFactory</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ExecutorServiceFactory</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/factory/Factory.html" title="class in org.eclipse.net4j.util.factory">Factory</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../factory/Factory.html" title="Factory (org.eclipse.net4j.util.factory)" alt="" coords="5,5,195,45"/>
+<area shape="rect" id="node2" href="ExecutorServiceFactory.html" title="ExecutorServiceFactory" alt="" coords="20,85,180,110"/>
+</map>
+
+<CENTER><IMG SRC="ExecutorServiceFactory.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.png
new file mode 100644
index 0000000000..161de304fa
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ExecutorServiceFactory.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.html
index 5dbedb9a70..2c9dc76d7e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.html
@@ -96,13 +96,16 @@ Interface ICorrelator&lt;CORRELATION,VALUE&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ICorrelator&lt;CORRELATION,VALUE&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICorrelator.html" title="&#171;interface&#187; ICorrelator" alt="" coords="43,5,128,45"/>
+<area shape="rect" id="node2" href="SynchronizingCorrelator.html" title="SynchronizingCorrelator" alt="" coords="5,85,165,110"/>
+</map>
+
+<CENTER><IMG SRC="ICorrelator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.png
new file mode 100644
index 0000000000..3c56cbfb29
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ICorrelator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html
index d64a0f6406..10634f76da 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html
@@ -104,13 +104,15 @@ Enum IRWLockManager.LockType</H2>
 <HR>
 <DL>
 <DT><PRE>public static enum <B>IRWLockManager.LockType</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</A>&lt;<A HREF="../../../../../org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html" title="enum in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IRWLockManager.LockType.html" title="&#171;enum&#187; IRWLockManager.LockType" alt="" coords="5,5,189,45"/>
+</map>
+
+<CENTER><IMG SRC="IRWLockManager.LockType.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Simon McDuff</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.png
new file mode 100644
index 0000000000..3dc7cd7033
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.html
index 82880fd255..172164ffc8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.html
@@ -99,7 +99,15 @@ Interface IRWLockManager&lt;OBJECT,CONTEXT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IRWLockManager&lt;OBJECT,CONTEXT&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IRWOLockManager.html" title="&#171;interface&#187; IRWOLockManager" alt="" coords="5,84,139,124"/>
+<area shape="rect" id="node2" href="IRWLockManager.html" title="&#171;interface&#187; IRWLockManager" alt="" coords="88,5,213,45"/>
+<area shape="rect" id="node3" href="RWLockManager.html" title="RWLockManager" alt="" coords="169,91,292,117"/>
+</map>
+
+<CENTER><IMG SRC="IRWLockManager.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Support Multiple reads/no write and upgrade lock from read to write. Many context could request
@@ -111,8 +119,6 @@ Support Multiple reads/no write and upgrade lock from read to write. Many contex
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.png
new file mode 100644
index 0000000000..cdf13deb51
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.html
index ea0f99855b..4d92dbd642 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.html
@@ -99,14 +99,20 @@ Interface IRWOLockManager&lt;OBJECT,CONTEXT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IRWOLockManager&lt;OBJECT,CONTEXT&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IRWLockManager.html" title="interface in org.eclipse.net4j.util.concurrent">IRWLockManager</A>&lt;OBJECT,CONTEXT&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IRWOLockManager.html" title="&#171;interface&#187; IRWOLockManager" alt="" coords="5,84,139,124"/>
+<area shape="rect" id="node2" href="IRWLockManager.html" title="&#171;interface&#187; IRWLockManager" alt="" coords="9,5,135,45"/>
+<area shape="rect" id="node3" href="RWOLockManager.html" title="RWOLockManager" alt="" coords="6,163,137,189"/>
+</map>
+
+<CENTER><IMG SRC="IRWOLockManager.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.2</DD>
-<DT><B>Author:</B></DT>
-  <DD>Caspar De Groot</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.png
new file mode 100644
index 0000000000..702ca3cfbe
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWOLockManager.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.html
index 918e2c755a..bea5cfbba9 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.html
@@ -96,7 +96,14 @@ Interface ISynchronizer&lt;RESULT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ISynchronizer&lt;RESULT&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ISynchronizer.html" title="&#171;interface&#187; ISynchronizer" alt="" coords="21,5,123,45"/>
+<area shape="rect" id="node2" href="ResultSynchronizer.html" title="ResultSynchronizer" alt="" coords="5,85,139,110"/>
+</map>
+
+<CENTER><IMG SRC="ISynchronizer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Synchronizes a producer and a consumer thread letting the producer pass a value to the consumer. Both producer and
@@ -106,10 +113,6 @@ Synchronizes a producer and a consumer thread letting the producer pass a value
 <P>
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.png
new file mode 100644
index 0000000000..7f873de326
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ISynchronizer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.html
index d596458b3e..1874405016 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.html
@@ -96,13 +96,19 @@ Interface IWorkSerializer</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IWorkSerializer</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IWorkSerializer.html" title="&#171;interface&#187; IWorkSerializer" alt="" coords="359,5,469,45"/>
+<area shape="rect" id="node2" href="SynchronousWorkSerializer.html" title="SynchronousWorkSerializer" alt="" coords="5,85,187,110"/>
+<area shape="rect" id="node3" href="QueueWorkerWorkSerializer.html" title="QueueWorkerWorkSerializer" alt="" coords="217,85,404,110"/>
+<area shape="rect" id="node4" href="CompletionWorkSerializer.html" title="CompletionWorkSerializer" alt="" coords="434,85,605,110"/>
+<area shape="rect" id="node5" href="AsynchronousWorkSerializer.html" title="AsynchronousWorkSerializer" alt="" coords="635,85,825,110"/>
+</map>
+
+<CENTER><IMG SRC="IWorkSerializer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.png
new file mode 100644
index 0000000000..f5c0da528d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IWorkSerializer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.html
index 9814045483..1f318e1402 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.html
@@ -103,13 +103,17 @@ Class MonitoredThread.MultiThreadMonitor</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>MonitoredThread.MultiThreadMonitor</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.html" title="interface in org.eclipse.net4j.util.concurrent">MonitoredThread.ThreadMonitor</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Runnable (java.lang)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="MonitoredThread.ThreadMonitor.html" title="&#171;interface&#187; MonitoredThread.ThreadMonitor" alt="" coords="121,13,324,53"/>
+<area shape="rect" id="node3" href="MonitoredThread.MultiThreadMonitor.html" title="MonitoredThread.MultiThreadMonitor" alt="" coords="19,101,251,126"/>
+</map>
+
+<CENTER><IMG SRC="MonitoredThread.MultiThreadMonitor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.png
new file mode 100644
index 0000000000..7351a63aa7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.MultiThreadMonitor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.html
index 5edb71ed9b..20239d9f20 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.html
@@ -99,13 +99,16 @@ Interface MonitoredThread.ThreadMonitor</H2>
 <HR>
 <DL>
 <DT><PRE>public static interface <B>MonitoredThread.ThreadMonitor</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="MonitoredThread.ThreadMonitor.html" title="&#171;interface&#187; MonitoredThread.ThreadMonitor" alt="" coords="19,5,223,45"/>
+<area shape="rect" id="node2" href="MonitoredThread.MultiThreadMonitor.html" title="MonitoredThread.MultiThreadMonitor" alt="" coords="5,85,237,110"/>
+</map>
+
+<CENTER><IMG SRC="MonitoredThread.ThreadMonitor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.png
new file mode 100644
index 0000000000..28e7d6aa15
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.ThreadMonitor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.html
index 42b5431faa..7b73542ecc 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.html
@@ -101,14 +101,19 @@ Class MonitoredThread</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>MonitoredThread</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Thread.html?is-external=true" title="class or interface in java.lang">Thread</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="MonitoredThread.html" title="MonitoredThread" alt="" coords="5,85,123,110"/>
+<area shape="rect" id="node2" title="Thread (java.lang)" alt="" coords="24,5,104,45"/>
+</map>
+
+<CENTER><IMG SRC="MonitoredThread.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.png
new file mode 100644
index 0000000000..1f2bcb13f7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/MonitoredThread.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.html
index 92fa26b997..1e669373c9 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.html
@@ -97,13 +97,15 @@ Class NonBlockingIntCounter</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>NonBlockingIntCounter</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="NonBlockingIntCounter.html" title="NonBlockingIntCounter" alt="" coords="5,6,160,31"/>
+</map>
+
+<CENTER><IMG SRC="NonBlockingIntCounter.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.png
new file mode 100644
index 0000000000..ebb50feba7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingIntCounter.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.html
index 80d914aaf4..610650d7a8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.html
@@ -97,13 +97,15 @@ Class NonBlockingLongCounter</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>NonBlockingLongCounter</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="NonBlockingLongCounter.html" title="NonBlockingLongCounter" alt="" coords="5,6,173,31"/>
+</map>
+
+<CENTER><IMG SRC="NonBlockingLongCounter.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.png
new file mode 100644
index 0000000000..469fd68d7f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.html
index 3a9e611e50..d036903a38 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.html
@@ -100,7 +100,14 @@ Class OnePendingExecutor</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>OnePendingExecutor</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/Executor.html?is-external=true" title="class or interface in java.util.concurrent">Executor</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Executor (java.util.concurrent)" alt="" coords="8,6,147,61"/>
+<area shape="rect" id="node2" href="OnePendingExecutor.html" title="OnePendingExecutor" alt="" coords="5,101,149,126"/>
+</map>
+
+<CENTER><IMG SRC="OnePendingExecutor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <HR>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.png
new file mode 100644
index 0000000000..faebd29876
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/OnePendingExecutor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.html
index bbe7c8f6fd..6d22531b1c 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.html
@@ -107,14 +107,21 @@ Class QueueRunner</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>QueueRunner</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/concurrent/QueueWorker.html" title="class in org.eclipse.net4j.util.concurrent">QueueWorker</A>&lt;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="QueueWorker.html" title="QueueWorker" alt="" coords="135,6,237,31"/>
+<area shape="rect" id="node2" href="../ui/UIQueueRunner.html" title="UIQueueRunner (org.eclipse.net4j.util.ui)" alt="" coords="5,136,165,176"/>
+<area shape="rect" id="node3" href="QueueWorkerWorkSerializer.html" title="QueueWorkerWorkSerializer" alt="" coords="195,143,381,169"/>
+<area shape="rect" id="node4" href="QueueRunner.html" title="QueueRunner" alt="" coords="136,71,237,97"/>
+</map>
+
+<CENTER><IMG SRC="QueueRunner.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.png
new file mode 100644
index 0000000000..b06047ba4a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueRunner.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.html
index a6ecab6fd4..cf0ece428b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.html
@@ -106,14 +106,20 @@ Class QueueWorker&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>QueueWorker&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/concurrent/Worker.html" title="class in org.eclipse.net4j.util.concurrent">Worker</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Worker.html" title="Worker" alt="" coords="23,6,88,31"/>
+<area shape="rect" id="node2" href="QueueWorker.html" title="QueueWorker" alt="" coords="5,71,107,97"/>
+<area shape="rect" id="node3" href="QueueRunner.html" title="QueueRunner" alt="" coords="5,137,107,162"/>
+</map>
+
+<CENTER><IMG SRC="QueueWorker.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.png
new file mode 100644
index 0000000000..218d33229f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorker.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.html
index a5982f5d25..ade4658c4b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.html
@@ -105,13 +105,17 @@ Class QueueWorkerWorkSerializer</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>QueueWorkerWorkSerializer</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/concurrent/QueueRunner.html" title="class in org.eclipse.net4j.util.concurrent">QueueRunner</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IWorkSerializer.html" title="interface in org.eclipse.net4j.util.concurrent">IWorkSerializer</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IWorkSerializer.html" title="&#171;interface&#187; IWorkSerializer" alt="" coords="5,5,115,45"/>
+<area shape="rect" id="node2" href="QueueWorkerWorkSerializer.html" title="QueueWorkerWorkSerializer" alt="" coords="35,85,221,110"/>
+<area shape="rect" id="node3" href="QueueRunner.html" title="QueueRunner" alt="" coords="145,13,247,38"/>
+</map>
+
+<CENTER><IMG SRC="QueueWorkerWorkSerializer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.png
new file mode 100644
index 0000000000..928a86d7f9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/QueueWorkerWorkSerializer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.html
index 481f2deacf..41a83983c2 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.html
@@ -101,12 +101,17 @@ Class RWLock</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>RWLock</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/locks/ReentrantReadWriteLock.html?is-external=true" title="class or interface in java.util.concurrent.locks">ReentrantReadWriteLock</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="ReentrantReadWriteLock (java.util.concurrent.locks)" alt="" coords="5,5,179,45"/>
+<area shape="rect" id="node2" href="RWLock.html" title="RWLock" alt="" coords="56,85,128,110"/>
+</map>
+
+<CENTER><IMG SRC="RWLock.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.concurrent.RWLock">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.png
new file mode 100644
index 0000000000..a22c73ca60
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLock.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.html
index a930206317..84874edcfd 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.html
@@ -99,14 +99,18 @@ Interface RWLockManager.LockEntry&lt;OBJECT,CONTEXT&gt;</H2>
 <DL>
 <DT><PRE><FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
 </FONT>protected static interface <B>RWLockManager.LockEntry&lt;OBJECT,CONTEXT&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="RWLockManager.LockEntry.html" title="&#171;interface&#187; RWLockManager.LockEntry" alt="" coords="5,5,189,45"/>
+</map>
+
+<CENTER><IMG SRC="RWLockManager.LockEntry.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Simon McDuff</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.png
new file mode 100644
index 0000000000..d73d66240f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntry.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.html
index 26857d7faa..e00ea738bd 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.html
@@ -99,14 +99,18 @@ Interface RWLockManager.LockEntryHandler&lt;OBJECT,CONTEXT&gt;</H2>
 <DL>
 <DT><PRE><FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
 </FONT>protected static interface <B>RWLockManager.LockEntryHandler&lt;OBJECT,CONTEXT&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="RWLockManager.LockEntryHandler.html" title="&#171;interface&#187; RWLockManager.LockEntryHandler" alt="" coords="5,5,235,45"/>
+</map>
+
+<CENTER><IMG SRC="RWLockManager.LockEntryHandler.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.png
new file mode 100644
index 0000000000..2af51423ff
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockEntryHandler.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.html
index 7024ddc04f..af9e1760d8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.html
@@ -99,14 +99,18 @@ Interface RWLockManager.LockStrategy&lt;OBJECT,CONTEXT&gt;</H2>
 <DL>
 <DT><PRE><FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
 </FONT>protected static interface <B>RWLockManager.LockStrategy&lt;OBJECT,CONTEXT&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="RWLockManager.LockStrategy.html" title="&#171;interface&#187; RWLockManager.LockStrategy" alt="" coords="5,5,208,45"/>
+</map>
+
+<CENTER><IMG SRC="RWLockManager.LockStrategy.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Simon McDuff</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.png
new file mode 100644
index 0000000000..0b03c87251
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.LockStrategy.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.html
index 2cadb18786..a24ae0b8c8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.html
@@ -105,7 +105,15 @@ Class RWLockManager&lt;OBJECT,CONTEXT&gt;</H2>
 <DL>
 <DT><PRE><FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
 </FONT>public class <B>RWLockManager&lt;OBJECT,CONTEXT&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/Lifecycle.html" title="class in org.eclipse.net4j.util.lifecycle">Lifecycle</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IRWLockManager.html" title="interface in org.eclipse.net4j.util.concurrent">IRWLockManager</A>&lt;OBJECT,CONTEXT&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IRWLockManager.html" title="&#171;interface&#187; IRWLockManager" alt="" coords="5,5,131,45"/>
+<area shape="rect" id="node2" href="RWLockManager.html" title="RWLockManager" alt="" coords="101,85,224,110"/>
+<area shape="rect" id="node3" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="160,5,357,45"/>
+</map>
+
+<CENTER><IMG SRC="RWLockManager.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Support Multiple reads/no write and upgrade lock from read to write. Many context could request
@@ -117,8 +125,6 @@ Support Multiple reads/no write and upgrade lock from read to write. Many contex
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Simon McDuff</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.png
new file mode 100644
index 0000000000..247bf2b557
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWLockManager.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.html
index 7a61cb4d7b..136d41bfb5 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.html
@@ -100,7 +100,13 @@ Class RWOLockManager.LockState&lt;OBJECT,CONTEXT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>RWOLockManager.LockState&lt;OBJECT,CONTEXT&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="RWOLockManager.LockState.html" title="RWOLockManager.LockState" alt="" coords="5,6,200,31"/>
+</map>
+
+<CENTER><IMG SRC="RWOLockManager.LockState.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Represents a combination of locks for one OBJECT. The different lock types are represented by the values of the
@@ -120,8 +126,6 @@ Represents a combination of locks for one OBJECT. The different lock types are r
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.2</DD>
-<DT><B>Author:</B></DT>
-  <DD>Caspar De Groot</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.png
new file mode 100644
index 0000000000..cf0225469f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.LockState.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.html
index 899a1e46a8..1c0cc3aafd 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.html
@@ -102,7 +102,15 @@ Class RWOLockManager&lt;OBJECT,CONTEXT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>RWOLockManager&lt;OBJECT,CONTEXT&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/Lifecycle.html" title="class in org.eclipse.net4j.util.lifecycle">Lifecycle</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IRWOLockManager.html" title="interface in org.eclipse.net4j.util.concurrent">IRWOLockManager</A>&lt;OBJECT,CONTEXT&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IRWOLockManager.html" title="&#171;interface&#187; IRWOLockManager" alt="" coords="5,5,139,45"/>
+<area shape="rect" id="node2" href="RWOLockManager.html" title="RWOLockManager" alt="" coords="103,85,235,110"/>
+<area shape="rect" id="node3" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="169,5,367,45"/>
+</map>
+
+<CENTER><IMG SRC="RWOLockManager.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 Keeps track of locks on objects. Locks are owned by contexts. A particular combination of locks and their owners, for
@@ -114,8 +122,6 @@ Keeps track of locks on objects. Locks are owned by contexts. A particular combi
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.2</DD>
-<DT><B>Author:</B></DT>
-  <DD>Caspar De Groot</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.png
new file mode 100644
index 0000000000..de526eb847
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RWOLockManager.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.html
index 8a04f1a955..0452ec32ef 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.html
@@ -100,13 +100,16 @@ Class ResultSynchronizer&lt;RESULT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ResultSynchronizer&lt;RESULT&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/ISynchronizer.html" title="interface in org.eclipse.net4j.util.concurrent">ISynchronizer</A>&lt;RESULT&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ISynchronizer.html" title="&#171;interface&#187; ISynchronizer" alt="" coords="21,5,123,45"/>
+<area shape="rect" id="node2" href="ResultSynchronizer.html" title="ResultSynchronizer" alt="" coords="5,85,139,110"/>
+</map>
+
+<CENTER><IMG SRC="ResultSynchronizer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.png
new file mode 100644
index 0000000000..aa5c3e8501
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/ResultSynchronizer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.html
index 7600b42540..40f1420719 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.html
@@ -104,12 +104,17 @@ Class RoundRobinList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>RoundRobinList&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/LinkedList.html?is-external=true" title="class or interface in java.util">LinkedList</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="RoundRobinList.html" title="RoundRobinList" alt="" coords="5,85,117,110"/>
+<area shape="rect" id="node2" title="LinkedList (java.util)" alt="" coords="21,5,101,45"/>
+</map>
+
+<CENTER><IMG SRC="RoundRobinList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.concurrent.RoundRobinList">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.png
new file mode 100644
index 0000000000..af81346c77
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/RoundRobinList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.html
index cd69f05b65..a6ed9a6b03 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.html
@@ -97,13 +97,15 @@ Class Sleeper</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>Sleeper</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Sleeper.html" title="Sleeper" alt="" coords="5,6,72,31"/>
+</map>
+
+<CENTER><IMG SRC="Sleeper.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.png
new file mode 100644
index 0000000000..706ccc9823
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Sleeper.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.html
index 61be186293..25ed937d5a 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.html
@@ -100,13 +100,16 @@ Class SynchronizingCorrelator&lt;CORRELATION,RESULT&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>SynchronizingCorrelator&lt;CORRELATION,RESULT&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/ICorrelator.html" title="interface in org.eclipse.net4j.util.concurrent">ICorrelator</A>&lt;CORRELATION,<A HREF="../../../../../org/eclipse/net4j/util/concurrent/ISynchronizer.html" title="interface in org.eclipse.net4j.util.concurrent">ISynchronizer</A>&lt;RESULT&gt;&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ICorrelator.html" title="&#171;interface&#187; ICorrelator" alt="" coords="43,5,128,45"/>
+<area shape="rect" id="node2" href="SynchronizingCorrelator.html" title="SynchronizingCorrelator" alt="" coords="5,85,165,110"/>
+</map>
+
+<CENTER><IMG SRC="SynchronizingCorrelator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.png
new file mode 100644
index 0000000000..021235ce5e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.html
index b4a0bbe6ec..92be5036c9 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.html
@@ -100,13 +100,16 @@ Class SynchronousWorkSerializer</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>SynchronousWorkSerializer</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/concurrent/IWorkSerializer.html" title="interface in org.eclipse.net4j.util.concurrent">IWorkSerializer</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IWorkSerializer.html" title="&#171;interface&#187; IWorkSerializer" alt="" coords="41,5,151,45"/>
+<area shape="rect" id="node2" href="SynchronousWorkSerializer.html" title="SynchronousWorkSerializer" alt="" coords="5,85,187,110"/>
+</map>
+
+<CENTER><IMG SRC="SynchronousWorkSerializer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.png
new file mode 100644
index 0000000000..35a921a582
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/SynchronousWorkSerializer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.html
index ee3fa03d9d..2a9f027bab 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.html
@@ -103,12 +103,17 @@ Class TimeoutRuntimeException</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>TimeoutRuntimeException</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="TimeoutRuntimeException.html" title="&#171;exception&#187; TimeoutRuntimeException" alt="" coords="5,100,179,140"/>
+<area shape="rect" id="node2" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="28,6,156,61"/>
+</map>
+
+<CENTER><IMG SRC="TimeoutRuntimeException.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.concurrent.TimeoutRuntimeException">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.png
new file mode 100644
index 0000000000..34c01714f9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimeoutRuntimeException.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.html
index 97be20e8d8..2fbd91db57 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.html
@@ -97,14 +97,18 @@ Class Timeouter</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>Timeouter</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Timeouter.html" title="Timeouter" alt="" coords="5,6,85,31"/>
+</map>
+
+<CENTER><IMG SRC="Timeouter.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.png
new file mode 100644
index 0000000000..7cdb44ed26
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Timeouter.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.html
index 446efb2abd..0f0ac902f3 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.html
@@ -104,13 +104,16 @@ Class TimerLifecycle.DaemonFactory</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>TimerLifecycle.DaemonFactory</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/factory/Factory.html" title="class in org.eclipse.net4j.util.factory">Factory</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../factory/Factory.html" title="Factory (org.eclipse.net4j.util.factory)" alt="" coords="11,5,200,45"/>
+<area shape="rect" id="node2" href="TimerLifecycle.DaemonFactory.html" title="TimerLifecycle.DaemonFactory" alt="" coords="5,85,205,110"/>
+</map>
+
+<CENTER><IMG SRC="TimerLifecycle.DaemonFactory.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.png
new file mode 100644
index 0000000000..e08b328d35
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.DaemonFactory.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.html
index 407638beda..8746415fd4 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.html
@@ -101,14 +101,20 @@ Class TimerLifecycle</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>TimerLifecycle</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Timer.html?is-external=true" title="class or interface in java.util">Timer</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/ILifecycle.html" title="interface in org.eclipse.net4j.util.lifecycle">ILifecycle</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../lifecycle/ILifecycle.html" title="&#171;interface&#187; ILifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="5,6,203,61"/>
+<area shape="rect" id="node2" href="TimerLifecycle.html" title="TimerLifecycle" alt="" coords="134,101,239,126"/>
+<area shape="rect" id="node3" title="Timer (java.util)" alt="" coords="233,13,305,53"/>
+</map>
+
+<CENTER><IMG SRC="TimerLifecycle.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.png
new file mode 100644
index 0000000000..e2bf4c873f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/TimerLifecycle.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.html
index 8234dc0d10..9d3f38c2da 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.html
@@ -100,13 +100,15 @@ Class Worker.WorkContext</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>Worker.WorkContext</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Worker.WorkContext.html" title="Worker.WorkContext" alt="" coords="5,6,149,31"/>
+</map>
+
+<CENTER><IMG SRC="Worker.WorkContext.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.png
new file mode 100644
index 0000000000..8bd0ac686d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.WorkContext.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.html
index 4f15bf3853..d6df3e4a12 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.html
@@ -105,14 +105,23 @@ Class Worker</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>Worker</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/Lifecycle.html" title="class in org.eclipse.net4j.util.lifecycle">Lifecycle</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Worker.html" title="Worker" alt="" coords="306,85,371,110"/>
+<area shape="rect" id="node2" href="../ref/ReferenceQueueWorker.html" title="ReferenceQueueWorker (org.eclipse.net4j.util.ref)" alt="" coords="5,149,171,189"/>
+<area shape="rect" id="node3" href="QueueWorker.html" title="QueueWorker" alt="" coords="201,157,303,182"/>
+<area shape="rect" id="node4" href="../cache/Cache.html" title="Cache (org.eclipse.net4j.util.cache)" alt="" coords="333,149,517,189"/>
+<area shape="rect" id="node5" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="240,5,437,45"/>
+<area shape="rect" id="node6" href="../cache/CacheMonitor.html" title="CacheMonitor (org.eclipse.net4j.util.cache)" alt="" coords="547,149,732,189"/>
+</map>
+
+<CENTER><IMG SRC="Worker.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.png
new file mode 100644
index 0000000000..0402c1f808
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/Worker.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html
index 062b1ab1b4..efd3c6059d 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html
@@ -88,6 +88,63 @@ Utility interfaces and classes commonly useful in concurrent programming.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="56,1475,184,1530"/>
+<area shape="rect" id="node2" href="TimeoutRuntimeException.html" title="&#171;exception&#187; TimeoutRuntimeException" alt="" coords="278,1483,453,1523"/>
+<area shape="rect" id="node3" href="AsynchronousWorkSerializer.html" title="AsynchronousWorkSerializer" alt="" coords="967,1249,1158,1274"/>
+<area shape="rect" id="node4" href="../cache/CacheMonitor.html" title="CacheMonitor (org.eclipse.net4j.util.cache)" alt="" coords="497,1269,682,1309"/>
+<area shape="rect" id="node5" href="CompletionWorkSerializer.html" title="CompletionWorkSerializer" alt="" coords="977,1101,1149,1126"/>
+<area shape="rect" id="node6" href="ConcurrentValue.html" title="ConcurrentValue" alt="" coords="61,1254,179,1279"/>
+<area shape="rect" id="node7" href="ExecutorServiceFactory.html" title="ExecutorServiceFactory" alt="" coords="285,1169,445,1194"/>
+<area shape="rect" id="node8" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="21,1311,219,1351"/>
+<area shape="rect" id="node9" title="LinkedList (java.util)" alt="" coords="79,1105,161,1145"/>
+<area shape="rect" id="node10" href="MonitoredThread.MultiThreadMonitor.html" title="MonitoredThread.MultiThreadMonitor" alt="" coords="947,1363,1179,1389"/>
+<area shape="rect" id="node11" href="NonBlockingIntCounter.html" title="NonBlockingIntCounter" alt="" coords="43,1055,197,1081"/>
+<area shape="rect" id="node12" href="NonBlockingLongCounter.html" title="NonBlockingLongCounter" alt="" coords="36,1006,204,1031"/>
+<area shape="rect" id="node13" href="OnePendingExecutor.html" title="OnePendingExecutor" alt="" coords="293,942,438,967"/>
+<area shape="rect" id="node14" href="QueueRunner.html" title="QueueRunner" alt="" coords="764,1219,865,1245"/>
+<area shape="rect" id="node15" href="QueueWorkerWorkSerializer.html" title="QueueWorkerWorkSerializer" alt="" coords="969,1199,1156,1225"/>
+<area shape="rect" id="node16" href="RWLock.html" title="RWLock" alt="" coords="329,870,401,895"/>
+<area shape="rect" id="node17" href="RWLockManager.html" title="RWLockManager" alt="" coords="304,1369,427,1394"/>
+<area shape="rect" id="node18" href="RWOLockManager.html" title="RWOLockManager" alt="" coords="523,1417,655,1442"/>
+<area shape="rect" id="node19" href="RWOLockManager.LockState.html" title="RWOLockManager.LockState" alt="" coords="23,813,217,838"/>
+<area shape="rect" id="node20" title="ReentrantReadWriteLock (java.util.concurrent.locks)" alt="" coords="33,863,207,903"/>
+<area shape="rect" id="node21" href="ResultSynchronizer.html" title="ResultSynchronizer" alt="" coords="298,755,433,781"/>
+<area shape="rect" id="node22" href="RoundRobinList.html" title="RoundRobinList" alt="" coords="309,1113,422,1138"/>
+<area shape="rect" id="node23" href="Sleeper.html" title="Sleeper" alt="" coords="87,698,153,723"/>
+<area shape="rect" id="node24" href="SynchronizingCorrelator.html" title="SynchronizingCorrelator" alt="" coords="285,641,445,666"/>
+<area shape="rect" id="node25" href="SynchronousWorkSerializer.html" title="SynchronousWorkSerializer" alt="" coords="971,1150,1154,1175"/>
+<area shape="rect" id="node26" title="Thread (java.lang)" alt="" coords="80,569,160,609"/>
+<area shape="rect" id="node27" title="Timer (java.util)" alt="" coords="83,425,157,465"/>
+<area shape="rect" id="node28" href="TimerLifecycle.html" title="TimerLifecycle" alt="" coords="313,469,418,494"/>
+<area shape="rect" id="node29" href="TimerLifecycle.DaemonFactory.html" title="TimerLifecycle.DaemonFactory" alt="" coords="265,1218,466,1243"/>
+<area shape="rect" id="node30" href="../ui/UIQueueRunner.html" title="UIQueueRunner (org.eclipse.net4j.util.ui)" alt="" coords="983,1299,1143,1339"/>
+<area shape="rect" id="node31" href="Worker.WorkContext.html" title="Worker.WorkContext" alt="" coords="48,375,192,401"/>
+<area shape="rect" id="node32" href="../cache/Cache.html" title="Cache (org.eclipse.net4j.util.cache)" alt="" coords="497,1333,682,1373"/>
+<area shape="rect" id="node33" href="../factory/Factory.html" title="Factory (org.eclipse.net4j.util.factory)" alt="" coords="25,1176,215,1216"/>
+<area shape="rect" id="node34" href="MonitoredThread.html" title="MonitoredThread" alt="" coords="306,577,425,602"/>
+<area shape="rect" id="node35" href="QueueWorker.html" title="QueueWorker" alt="" coords="538,1219,641,1245"/>
+<area shape="rect" id="node36" href="../ref/ReferenceQueueWorker.html" title="ReferenceQueueWorker (org.eclipse.net4j.util.ref)" alt="" coords="507,1155,672,1195"/>
+<area shape="rect" id="node37" href="Timeouter.html" title="Timeouter" alt="" coords="80,326,160,351"/>
+<area shape="rect" id="node38" href="Worker.html" title="Worker" alt="" coords="333,1267,398,1293"/>
+<area shape="rect" id="node39" title="&#171;interface&#187; Executor (java.util.concurrent)" alt="" coords="51,927,189,982"/>
+<area shape="rect" id="node40" href="ICorrelator.html" title="&#171;interface&#187; ICorrelator" alt="" coords="77,633,163,673"/>
+<area shape="rect" id="node41" href="../lifecycle/ILifecycle.html" title="&#171;interface&#187; ILifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="21,490,219,545"/>
+<area shape="rect" id="node42" href="IRWLockManager.html" title="&#171;interface&#187; IRWLockManager" alt="" coords="57,1392,183,1432"/>
+<area shape="rect" id="node43" href="IRWOLockManager.html" title="&#171;interface&#187; IRWOLockManager" alt="" coords="298,1419,433,1459"/>
+<area shape="rect" id="node44" href="ISynchronizer.html" title="&#171;interface&#187; ISynchronizer" alt="" coords="69,748,171,788"/>
+<area shape="rect" id="node45" href="IWorkSerializer.html" title="&#171;interface&#187; IWorkSerializer" alt="" coords="759,1145,870,1185"/>
+<area shape="rect" id="node46" href="MonitoredThread.ThreadMonitor.html" title="&#171;interface&#187; MonitoredThread.ThreadMonitor" alt="" coords="713,1356,917,1396"/>
+<area shape="rect" id="node47" href="RWLockManager.LockEntry.html" title="&#171;interface&#187; RWLockManager.LockEntry" alt="" coords="27,261,213,301"/>
+<area shape="rect" id="node48" href="RWLockManager.LockEntryHandler.html" title="&#171;interface&#187; RWLockManager.LockEntryHandler" alt="" coords="5,197,235,237"/>
+<area shape="rect" id="node49" href="RWLockManager.LockStrategy.html" title="&#171;interface&#187; RWLockManager.LockStrategy" alt="" coords="19,133,221,173"/>
+<area shape="rect" id="node50" title="&#171;interface&#187; Runnable (java.lang)" alt="" coords="772,1274,857,1329"/>
+<area shape="rect" id="node51" href="ConcurrencyUtil.html" title="&#171;static&#187; ConcurrencyUtil" alt="" coords="63,69,177,109"/>
+<area shape="rect" id="node52" href="IRWLockManager.LockType.html" title="&#171;enum&#187; IRWLockManager.LockType" alt="" coords="27,5,213,45"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -298,27 +355,6 @@ Package org.eclipse.net4j.util.concurrent Description
 
 <P>
 Utility interfaces and classes commonly useful in concurrent programming.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.png
new file mode 100644
index 0000000000..c87721c487
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.html
index cfeeb5bf1c..a851ce287b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.html
@@ -105,13 +105,18 @@ Class Container&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>Container&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/Lifecycle.html" title="class in org.eclipse.net4j.util.lifecycle">Lifecycle</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container">IContainer</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainer.html" title="&#171;interface&#187; IContainer" alt="" coords="5,5,91,45"/>
+<area shape="rect" id="node2" href="../registry/Registry.html" title="Registry (org.eclipse.net4j.util.registry)" alt="" coords="37,149,229,189"/>
+<area shape="rect" id="node3" href="Container.html" title="Container" alt="" coords="95,85,172,110"/>
+<area shape="rect" id="node4" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="120,5,317,45"/>
+</map>
+
+<CENTER><IMG SRC="Container.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.png
new file mode 100644
index 0000000000..a34c4ec2bd
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/Container.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.html
index c7b9ff8751..f8c4faf934 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.html
@@ -100,13 +100,16 @@ Class ContainerDelta&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerDelta&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/container/IContainerDelta.html" title="interface in org.eclipse.net4j.util.container">IContainerDelta</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerDelta.html" title="&#171;interface&#187; IContainerDelta" alt="" coords="5,5,115,45"/>
+<area shape="rect" id="node2" href="ContainerDelta.html" title="ContainerDelta" alt="" coords="7,85,113,110"/>
+</map>
+
+<CENTER><IMG SRC="ContainerDelta.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.png
new file mode 100644
index 0000000000..bc5e8c7d38
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerDelta.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.html
index 008be31991..93f5d05a40 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.html
@@ -102,12 +102,18 @@ Class ContainerEvent&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerEvent&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/Event.html" title="class in org.eclipse.net4j.util.event">Event</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/container/IContainerEvent.html" title="interface in org.eclipse.net4j.util.container">IContainerEvent</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerEvent.html" title="&#171;interface&#187; IContainerEvent" alt="" coords="5,5,117,45"/>
+<area shape="rect" id="node2" href="../event/Event.html" title="Event (org.eclipse.net4j.util.event)" alt="" coords="147,5,327,45"/>
+<area shape="rect" id="node3" href="ContainerEvent.html" title="ContainerEvent" alt="" coords="95,85,204,110"/>
+</map>
+
+<CENTER><IMG SRC="ContainerEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.container.ContainerEvent">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.png
new file mode 100644
index 0000000000..e40539f6da
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.html
index 6c085e7ef2..cfbc3de753 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.html
@@ -100,13 +100,16 @@ Class ContainerEventAdapter&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerEventAdapter&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/event/IListener.html" title="interface in org.eclipse.net4j.util.event">IListener</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../event/IListener.html" title="&#171;interface&#187; IListener (org.eclipse.net4j.util.event)" alt="" coords="5,6,184,61"/>
+<area shape="rect" id="node2" href="ContainerEventAdapter.html" title="ContainerEventAdapter" alt="" coords="17,101,172,126"/>
+</map>
+
+<CENTER><IMG SRC="ContainerEventAdapter.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.png
new file mode 100644
index 0000000000..5585bc035d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerEventAdapter.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.html
index 8545eef74d..8e946d47f9 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.html
@@ -97,13 +97,15 @@ Class ContainerUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>ContainerUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ContainerUtil.html" title="&#171;static&#187; ContainerUtil" alt="" coords="5,5,101,45"/>
+</map>
+
+<CENTER><IMG SRC="ContainerUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.png
new file mode 100644
index 0000000000..cfc3fb1dab
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ContainerUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.html
index 1cf3de4b2a..2486c18541 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.html
@@ -103,12 +103,17 @@ Class FactoryNotFoundException</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>FactoryNotFoundException</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="31,6,159,61"/>
+<area shape="rect" id="node2" href="FactoryNotFoundException.html" title="&#171;exception&#187; FactoryNotFoundException" alt="" coords="5,100,184,140"/>
+</map>
+
+<CENTER><IMG SRC="FactoryNotFoundException.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.container.FactoryNotFoundException">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.png
new file mode 100644
index 0000000000..e4c92c7f46
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/FactoryNotFoundException.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.html
index 5486f57a41..0664750af8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.html
@@ -99,14 +99,19 @@ Interface IContainer.Modifiable&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public static interface <B>IContainer.Modifiable&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container">IContainer</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainer.Modifiable.html" title="&#171;interface&#187; IContainer.Modifiable" alt="" coords="5,84,147,124"/>
+<area shape="rect" id="node2" href="IContainer.html" title="&#171;interface&#187; IContainer" alt="" coords="33,5,119,45"/>
+</map>
+
+<CENTER><IMG SRC="IContainer.Modifiable.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.png
new file mode 100644
index 0000000000..68a2389cd2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.Modifiable.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html
index bf558226b6..c1dc3d2714 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html
@@ -102,13 +102,23 @@ Interface IContainer&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainer&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/INotifier.html" title="interface in org.eclipse.net4j.util.event">INotifier</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="delegate/AbstractDelegator.html" title="AbstractDelegator (org.eclipse.net4j.util.container.delegate)" alt="" coords="464,5,720,45"/>
+<area shape="rect" id="node2" href="Container.html" title="Container" alt="" coords="553,65,631,90"/>
+<area shape="rect" id="node3" href="IContainer.html" title="&#171;interface&#187; IContainer" alt="" coords="283,176,368,216"/>
+<area shape="rect" id="node4" href="IContainer.Modifiable.html" title="&#171;interface&#187; IContainer.Modifiable" alt="" coords="521,109,663,149"/>
+<area shape="rect" id="node5" href="delegate/IContainerCollection.html" title="&#171;interface&#187; IContainerCollection (org.eclipse.net4j.util.container.delegate)" alt="" coords="464,169,720,223"/>
+<area shape="rect" id="node6" href="delegate/IContainerMap.html" title="&#171;interface&#187; IContainerMap (org.eclipse.net4j.util.container.delegate)" alt="" coords="464,242,720,297"/>
+<area shape="rect" id="node7" href="IManagedContainer.html" title="&#171;interface&#187; IManagedContainer" alt="" coords="525,316,659,356"/>
+<area shape="rect" id="node8" href="../event/INotifier.html" title="&#171;interface&#187; INotifier (org.eclipse.net4j.util.event)" alt="" coords="6,169,186,223"/>
+<area shape="rect" id="node9" href="../registry/IRegistry.html" title="&#171;interface&#187; IRegistry (org.eclipse.net4j.util.registry)" alt="" coords="495,375,689,430"/>
+</map>
+
+<CENTER><IMG SRC="IContainer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.png
new file mode 100644
index 0000000000..472d7a78b3
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.html
index f00523f8d5..efe7429b09 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.html
@@ -104,13 +104,15 @@ Enum IContainerDelta.Kind</H2>
 <HR>
 <DL>
 <DT><PRE>public static enum <B>IContainerDelta.Kind</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang">Enum</A>&lt;<A HREF="../../../../../org/eclipse/net4j/util/container/IContainerDelta.Kind.html" title="enum in org.eclipse.net4j.util.container">IContainerDelta.Kind</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerDelta.Kind.html" title="&#171;enum&#187; IContainerDelta.Kind" alt="" coords="5,5,144,45"/>
+</map>
+
+<CENTER><IMG SRC="IContainerDelta.Kind.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.png
new file mode 100644
index 0000000000..e48ed15355
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.Kind.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.html
index e2e034f3ca..2cb94541fc 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.html
@@ -96,13 +96,16 @@ Interface IContainerDelta&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerDelta&lt;E&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerDelta.html" title="&#171;interface&#187; IContainerDelta" alt="" coords="5,5,115,45"/>
+<area shape="rect" id="node2" href="ContainerDelta.html" title="ContainerDelta" alt="" coords="7,85,113,110"/>
+</map>
+
+<CENTER><IMG SRC="IContainerDelta.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.png
new file mode 100644
index 0000000000..c3848d7188
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerDelta.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.html
index d85ddd039d..af783b4900 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.html
@@ -99,7 +99,16 @@ Interface IContainerEvent&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerEvent&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="interface in org.eclipse.net4j.util.event">IEvent</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../event/IEvent.html" title="&#171;interface&#187; IEvent (org.eclipse.net4j.util.event)" alt="" coords="87,6,267,61"/>
+<area shape="rect" id="node2" href="IContainerEvent.html" title="&#171;interface&#187; IContainerEvent" alt="" coords="121,100,233,140"/>
+<area shape="rect" id="node3" href="SingleDeltaContainerEvent.html" title="SingleDeltaContainerEvent" alt="" coords="5,179,179,205"/>
+<area shape="rect" id="node4" href="ContainerEvent.html" title="ContainerEvent" alt="" coords="209,179,319,205"/>
+</map>
+
+<CENTER><IMG SRC="IContainerEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 An <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="interface in org.eclipse.net4j.util.event"><CODE>event</CODE></A> fired from a <A HREF="../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container"><CODE>container</CODE></A> when its contents have changed.
@@ -107,8 +116,6 @@ An <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="inte
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.png
new file mode 100644
index 0000000000..51274c790a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.html
index ddfaa69050..77e005ce1e 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.html
@@ -99,13 +99,16 @@ Interface IContainerEventVisitor.Filtered&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public static interface <B>IContainerEventVisitor.Filtered&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/container/IContainerEventVisitor.html" title="interface in org.eclipse.net4j.util.container">IContainerEventVisitor</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerEventVisitor.Filtered.html" title="&#171;interface&#187; IContainerEventVisitor.Filtered" alt="" coords="5,84,200,124"/>
+<area shape="rect" id="node2" href="IContainerEventVisitor.html" title="&#171;interface&#187; IContainerEventVisitor" alt="" coords="28,5,177,45"/>
+</map>
+
+<CENTER><IMG SRC="IContainerEventVisitor.Filtered.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.png
new file mode 100644
index 0000000000..61c08eb98c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.Filtered.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.html
index 5cda4a4457..15c074ab38 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.html
@@ -96,13 +96,16 @@ Interface IContainerEventVisitor&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerEventVisitor&lt;E&gt;</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerEventVisitor.Filtered.html" title="&#171;interface&#187; IContainerEventVisitor.Filtered" alt="" coords="5,84,200,124"/>
+<area shape="rect" id="node2" href="IContainerEventVisitor.html" title="&#171;interface&#187; IContainerEventVisitor" alt="" coords="28,5,177,45"/>
+</map>
+
+<CENTER><IMG SRC="IContainerEventVisitor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.png
new file mode 100644
index 0000000000..d9c0dffd40
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainerEventVisitor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.html
index 4901c7b4e6..d8d3eae267 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.html
@@ -96,13 +96,17 @@ Interface IElementProcessor</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IElementProcessor</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IElementProcessor.html" title="&#171;interface&#187; IElementProcessor" alt="" coords="149,5,280,45"/>
+<area shape="rect" id="node2" href="../security/ResponseNegotiatorInjector.html" title="ResponseNegotiatorInjector (org.eclipse.net4j.util.security)" alt="" coords="5,84,200,124"/>
+<area shape="rect" id="node3" href="../security/ChallengeNegotiatorConfigurer.html" title="ChallengeNegotiatorConfigurer (org.eclipse.net4j.util.security)" alt="" coords="230,84,425,124"/>
+</map>
+
+<CENTER><IMG SRC="IElementProcessor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.png
new file mode 100644
index 0000000000..f1a5fa70d7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IElementProcessor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.html
index 48f63a8c0d..fe34cf30aa 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.html
@@ -102,12 +102,20 @@ Interface IManagedContainer</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IManagedContainer</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container">IContainer</A>&lt;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>&gt;, <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/ILifecycle.html" title="interface in org.eclipse.net4j.util.lifecycle">ILifecycle</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IPluginContainer.html" title="&#171;interface&#187; IPluginContainer" alt="" coords="55,179,171,219"/>
+<area shape="rect" id="node2" href="IManagedContainer.html" title="&#171;interface&#187; IManagedContainer" alt="" coords="123,100,256,140"/>
+<area shape="rect" id="node3" href="../lifecycle/ILifecycle.html" title="&#171;interface&#187; ILifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="5,6,203,61"/>
+<area shape="rect" id="node4" href="IContainer.html" title="&#171;interface&#187; IContainer" alt="" coords="232,13,317,53"/>
+<area shape="rect" id="node5" href="ManagedContainer.html" title="ManagedContainer" alt="" coords="201,186,332,211"/>
+</map>
+
+<CENTER><IMG SRC="IManagedContainer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.png
new file mode 100644
index 0000000000..1abbf432f9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.html
index e3dc5c463e..95752da073 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.html
@@ -96,12 +96,17 @@ Interface IPluginContainer</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IPluginContainer</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/container/IManagedContainer.html" title="interface in org.eclipse.net4j.util.container">IManagedContainer</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IPluginContainer.html" title="&#171;interface&#187; IPluginContainer" alt="" coords="14,84,129,124"/>
+<area shape="rect" id="node2" href="IManagedContainer.html" title="&#171;interface&#187; IManagedContainer" alt="" coords="5,5,139,45"/>
+</map>
+
+<CENTER><IMG SRC="IPluginContainer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.png
new file mode 100644
index 0000000000..2d02cf001c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IPluginContainer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.html
index 1e4e99fe81..86b895a42f 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.html
@@ -93,7 +93,13 @@ Interface ISlow</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>ISlow</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ISlow.html" title="&#171;interface&#187; ISlow" alt="" coords="5,5,91,45"/>
+</map>
+
+<CENTER><IMG SRC="ISlow.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 A marker interface to indicate that some method calls may be slow.
@@ -103,8 +109,6 @@ A marker interface to indicate that some method calls may be slow.
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.png
new file mode 100644
index 0000000000..f45d451d43
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ISlow.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.html
index f31d6a8407..642475c8f8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.html
@@ -100,13 +100,16 @@ Class LifecycleEventConverter&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>LifecycleEventConverter&lt;E&gt;</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/event/IListener.html" title="interface in org.eclipse.net4j.util.event">IListener</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../event/IListener.html" title="&#171;interface&#187; IListener (org.eclipse.net4j.util.event)" alt="" coords="5,6,184,61"/>
+<area shape="rect" id="node2" href="LifecycleEventConverter.html" title="LifecycleEventConverter" alt="" coords="15,101,173,126"/>
+</map>
+
+<CENTER><IMG SRC="LifecycleEventConverter.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.png
new file mode 100644
index 0000000000..3fda26a74f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/LifecycleEventConverter.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.html
index 30bc7c7b39..f4ced937ad 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.html
@@ -102,13 +102,17 @@ Class ManagedContainer</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ManagedContainer</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/lifecycle/Lifecycle.html" title="class in org.eclipse.net4j.util.lifecycle">Lifecycle</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/container/IManagedContainer.html" title="interface in org.eclipse.net4j.util.container">IManagedContainer</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IManagedContainer.html" title="&#171;interface&#187; IManagedContainer" alt="" coords="5,5,139,45"/>
+<area shape="rect" id="node2" href="ManagedContainer.html" title="ManagedContainer" alt="" coords="104,85,235,110"/>
+<area shape="rect" id="node3" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="168,5,365,45"/>
+</map>
+
+<CENTER><IMG SRC="ManagedContainer.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.png
new file mode 100644
index 0000000000..3f32ad28e7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/ManagedContainer.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.html
index fffac10188..9535934b39 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.html
@@ -102,12 +102,18 @@ Class SingleDeltaContainerEvent&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>SingleDeltaContainerEvent&lt;E&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/Event.html" title="class in org.eclipse.net4j.util.event">Event</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/container/IContainerEvent.html" title="interface in org.eclipse.net4j.util.container">IContainerEvent</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerEvent.html" title="&#171;interface&#187; IContainerEvent" alt="" coords="5,5,117,45"/>
+<area shape="rect" id="node2" href="SingleDeltaContainerEvent.html" title="SingleDeltaContainerEvent" alt="" coords="62,85,236,110"/>
+<area shape="rect" id="node3" href="../event/Event.html" title="Event (org.eclipse.net4j.util.event)" alt="" coords="147,5,327,45"/>
+</map>
+
+<CENTER><IMG SRC="SingleDeltaContainerEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.container.SingleDeltaContainerEvent">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.png
new file mode 100644
index 0000000000..88dbfc0443
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.html
index 6e9d58fc9f..b976edb641 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.html
@@ -106,13 +106,17 @@ Class AbstractDelegator.DelegatingIterator</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>AbstractDelegator.DelegatingIterator</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Iterator (java.util)" alt="" coords="77,6,163,61"/>
+<area shape="rect" id="node2" href="ContainerList.DelegatingListIterator.html" title="ContainerList.DelegatingListIterator" alt="" coords="8,166,232,191"/>
+<area shape="rect" id="node3" href="AbstractDelegator.DelegatingIterator.html" title="AbstractDelegator.DelegatingIterator" alt="" coords="5,101,235,126"/>
+</map>
+
+<CENTER><IMG SRC="AbstractDelegator.DelegatingIterator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.png
new file mode 100644
index 0000000000..8afe1ad758
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.html
index 9c81423ea1..0e1946aaf4 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.html
@@ -104,13 +104,19 @@ Class AbstractDelegator&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>AbstractDelegator&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/event/Notifier.html" title="class in org.eclipse.net4j.util.event">Notifier</A><DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container">IContainer</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../IContainer.html" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="5,6,208,61"/>
+<area shape="rect" id="node2" href="AbstractDelegator.html" title="AbstractDelegator" alt="" coords="154,101,280,126"/>
+<area shape="rect" id="node3" href="../../event/Notifier.html" title="Notifier (org.eclipse.net4j.util.event)" alt="" coords="238,13,417,53"/>
+<area shape="rect" id="node4" href="ContainerMap.html" title="ContainerMap" alt="" coords="93,166,195,191"/>
+<area shape="rect" id="node5" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="225,166,359,191"/>
+</map>
+
+<CENTER><IMG SRC="AbstractDelegator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.png
new file mode 100644
index 0000000000..b338f2c53c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/AbstractDelegator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.html
index 00724aaa7b..86d8377473 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.html
@@ -104,13 +104,17 @@ Class ContainerBlockingQueue&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerBlockingQueue&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/ContainerQueue.html" title="class in org.eclipse.net4j.util.container.delegate">ContainerQueue</A>&lt;E&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerBlockingQueue</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerBlockingQueue.html" title="&#171;interface&#187; IContainerBlockingQueue" alt="" coords="5,5,173,45"/>
+<area shape="rect" id="node2" href="ContainerQueue.html" title="ContainerQueue" alt="" coords="203,13,317,38"/>
+<area shape="rect" id="node3" href="ContainerBlockingQueue.html" title="ContainerBlockingQueue" alt="" coords="92,85,257,110"/>
+</map>
+
+<CENTER><IMG SRC="ContainerBlockingQueue.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.png
new file mode 100644
index 0000000000..fd5c1cca07
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerBlockingQueue.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.html
index 5dfdf6abdf..71add2b70c 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.html
@@ -105,13 +105,20 @@ Class ContainerCollection&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerCollection&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/AbstractDelegator.html" title="class in org.eclipse.net4j.util.container.delegate">AbstractDelegator</A>&lt;E&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerCollection.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerCollection</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerCollection.html" title="&#171;interface&#187; IContainerCollection" alt="" coords="41,5,177,45"/>
+<area shape="rect" id="node2" href="AbstractDelegator.html" title="AbstractDelegator" alt="" coords="207,13,333,38"/>
+<area shape="rect" id="node3" href="ContainerSet.html" title="ContainerSet" alt="" coords="5,150,101,175"/>
+<area shape="rect" id="node4" href="ContainerQueue.html" title="ContainerQueue" alt="" coords="132,150,247,175"/>
+<area shape="rect" id="node5" href="ContainerList.html" title="ContainerList" alt="" coords="276,150,375,175"/>
+<area shape="rect" id="node6" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="122,85,256,110"/>
+</map>
+
+<CENTER><IMG SRC="ContainerCollection.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.png
new file mode 100644
index 0000000000..15b4552c1f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerCollection.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.html
index 2c467c3cb7..b4b45ebc78 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.html
@@ -104,13 +104,17 @@ Class ContainerList.DelegatingListIterator</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerList.DelegatingListIterator</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/AbstractDelegator.DelegatingIterator.html" title="class in org.eclipse.net4j.util.container.delegate">AbstractDelegator.DelegatingIterator</A><DT>implements <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/ListIterator.html?is-external=true" title="class or interface in java.util">ListIterator</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; ListIterator (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="ContainerList.DelegatingListIterator.html" title="ContainerList.DelegatingListIterator" alt="" coords="29,101,253,126"/>
+<area shape="rect" id="node3" href="AbstractDelegator.DelegatingIterator.html" title="AbstractDelegator.DelegatingIterator" alt="" coords="121,21,351,46"/>
+</map>
+
+<CENTER><IMG SRC="ContainerList.DelegatingListIterator.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.png
new file mode 100644
index 0000000000..baf83f02e4
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.DelegatingListIterator.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.html
index 233839e38b..1474ed3721 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.html
@@ -103,13 +103,17 @@ Class ContainerList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerList&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/ContainerCollection.html" title="class in org.eclipse.net4j.util.container.delegate">ContainerCollection</A>&lt;E&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerList.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerList</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerList.html" title="&#171;interface&#187; IContainerList" alt="" coords="5,5,107,45"/>
+<area shape="rect" id="node2" href="ContainerList.html" title="ContainerList" alt="" coords="80,85,179,110"/>
+<area shape="rect" id="node3" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="137,13,271,38"/>
+</map>
+
+<CENTER><IMG SRC="ContainerList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.png
new file mode 100644
index 0000000000..441b795775
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.html
index 40808811bf..adb34f16e0 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.html
@@ -102,13 +102,17 @@ Class ContainerMap&lt;K,V&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerMap&lt;K,V&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/AbstractDelegator.html" title="class in org.eclipse.net4j.util.container.delegate">AbstractDelegator</A>&lt;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</A>&lt;K,V&gt;&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerMap.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerMap</A>&lt;K,V&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerMap.html" title="&#171;interface&#187; IContainerMap" alt="" coords="5,5,109,45"/>
+<area shape="rect" id="node2" href="AbstractDelegator.html" title="AbstractDelegator" alt="" coords="139,13,265,38"/>
+<area shape="rect" id="node3" href="ContainerMap.html" title="ContainerMap" alt="" coords="78,85,180,110"/>
+</map>
+
+<CENTER><IMG SRC="ContainerMap.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.png
new file mode 100644
index 0000000000..722c94e719
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerMap.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.html
index abd2853436..25dc9e8661 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.html
@@ -106,13 +106,18 @@ Class ContainerQueue&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerQueue&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/ContainerCollection.html" title="class in org.eclipse.net4j.util.container.delegate">ContainerCollection</A>&lt;E&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerQueue.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerQueue</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerQueue.html" title="&#171;interface&#187; IContainerQueue" alt="" coords="5,5,123,45"/>
+<area shape="rect" id="node2" href="ContainerQueue.html" title="ContainerQueue" alt="" coords="84,85,199,110"/>
+<area shape="rect" id="node3" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="153,13,287,38"/>
+<area shape="rect" id="node4" href="ContainerBlockingQueue.html" title="ContainerBlockingQueue" alt="" coords="59,150,224,175"/>
+</map>
+
+<CENTER><IMG SRC="ContainerQueue.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.png
new file mode 100644
index 0000000000..232e52df15
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerQueue.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.html
index a6beae4d59..4abea62f83 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.html
@@ -106,13 +106,18 @@ Class ContainerSet&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerSet&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/ContainerCollection.html" title="class in org.eclipse.net4j.util.container.delegate">ContainerCollection</A>&lt;E&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerSet.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerSet</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerSet.html" title="&#171;interface&#187; IContainerSet" alt="" coords="5,5,104,45"/>
+<area shape="rect" id="node2" href="ContainerSortedSet.html" title="ContainerSortedSet" alt="" coords="61,150,195,175"/>
+<area shape="rect" id="node3" href="ContainerSet.html" title="ContainerSet" alt="" coords="79,85,176,110"/>
+<area shape="rect" id="node4" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="134,13,268,38"/>
+</map>
+
+<CENTER><IMG SRC="ContainerSet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.png
new file mode 100644
index 0000000000..d347987acd
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSet.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.html
index 836f6fd18e..846d8d15cb 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.html
@@ -104,13 +104,17 @@ Class ContainerSortedSet&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ContainerSortedSet&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/ContainerSet.html" title="class in org.eclipse.net4j.util.container.delegate">ContainerSet</A>&lt;E&gt;<DT>implements <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerSortedSet.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerSortedSet</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerSortedSet.html" title="&#171;interface&#187; IContainerSortedSet" alt="" coords="5,5,144,45"/>
+<area shape="rect" id="node2" href="ContainerSortedSet.html" title="ContainerSortedSet" alt="" coords="81,85,215,110"/>
+<area shape="rect" id="node3" href="ContainerSet.html" title="ContainerSet" alt="" coords="174,13,271,38"/>
+</map>
+
+<CENTER><IMG SRC="ContainerSortedSet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.png
new file mode 100644
index 0000000000..5317437718
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/ContainerSortedSet.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.html
index be1c0eff67..e737e41671 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.html
@@ -99,13 +99,18 @@ Interface IContainerBlockingQueue&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerBlockingQueue&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerQueue.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerQueue</A>&lt;E&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true" title="class or interface in java.util.concurrent">BlockingQueue</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerQueue.html" title="&#171;interface&#187; IContainerQueue" alt="" coords="5,13,123,53"/>
+<area shape="rect" id="node2" href="IContainerBlockingQueue.html" title="&#171;interface&#187; IContainerBlockingQueue" alt="" coords="59,100,227,140"/>
+<area shape="rect" id="node3" title="&#171;interface&#187; BlockingQueue (java.util.concurrent)" alt="" coords="153,6,292,61"/>
+<area shape="rect" id="node4" href="ContainerBlockingQueue.html" title="ContainerBlockingQueue" alt="" coords="60,179,225,205"/>
+</map>
+
+<CENTER><IMG SRC="IContainerBlockingQueue.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.png
new file mode 100644
index 0000000000..02de7ca5f6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.html
index 83712c7ecb..dddb8a84d8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.html
@@ -102,13 +102,21 @@ Interface IContainerCollection&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerCollection&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container">IContainer</A>&lt;E&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IContainerSet.html" title="&#171;interface&#187; IContainerSet" alt="" coords="5,179,104,219"/>
+<area shape="rect" id="node2" href="IContainerQueue.html" title="&#171;interface&#187; IContainerQueue" alt="" coords="134,179,252,219"/>
+<area shape="rect" id="node3" href="IContainerList.html" title="&#171;interface&#187; IContainerList" alt="" coords="283,179,384,219"/>
+<area shape="rect" id="node4" href="IContainerCollection.html" title="&#171;interface&#187; IContainerCollection" alt="" coords="194,100,331,140"/>
+<area shape="rect" id="node5" href="../IContainer.html" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="75,6,277,61"/>
+<area shape="rect" id="node6" title="&#171;interface&#187; Collection (java.util)" alt="" coords="307,6,392,61"/>
+<area shape="rect" id="node7" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="414,186,548,211"/>
+</map>
+
+<CENTER><IMG SRC="IContainerCollection.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.png
new file mode 100644
index 0000000000..4a64d94b4a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerCollection.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.html
index ffe0e1212b..75089e464c 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.html
@@ -99,13 +99,18 @@ Interface IContainerList&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerList&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerCollection.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerCollection</A>&lt;E&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; List (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="IContainerList.html" title="&#171;interface&#187; IContainerList" alt="" coords="68,100,169,140"/>
+<area shape="rect" id="node3" href="IContainerCollection.html" title="&#171;interface&#187; IContainerCollection" alt="" coords="121,13,257,53"/>
+<area shape="rect" id="node4" href="ContainerList.html" title="ContainerList" alt="" coords="69,179,168,205"/>
+</map>
+
+<CENTER><IMG SRC="IContainerList.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.png
new file mode 100644
index 0000000000..ab30730f47
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerList.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.html
index 877051b8d5..918b71410b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.html
@@ -99,13 +99,18 @@ Interface IContainerMap&lt;K,V&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerMap&lt;K,V&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/IContainer.html" title="interface in org.eclipse.net4j.util.container">IContainer</A>&lt;<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.Entry.html?is-external=true" title="class or interface in java.util">Map.Entry</A>&lt;K,V&gt;&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</A>&lt;K,V&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Map (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="IContainerMap.html" title="&#171;interface&#187; IContainerMap" alt="" coords="82,100,187,140"/>
+<area shape="rect" id="node3" href="../IContainer.html" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="120,6,323,61"/>
+<area shape="rect" id="node4" href="ContainerMap.html" title="ContainerMap" alt="" coords="83,179,185,205"/>
+</map>
+
+<CENTER><IMG SRC="IContainerMap.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.png
new file mode 100644
index 0000000000..25bb747bcf
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerMap.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.html
index 1dd1d82c39..fab2eeb2de 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.html
@@ -102,13 +102,19 @@ Interface IContainerQueue&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerQueue&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerCollection.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerCollection</A>&lt;E&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Queue.html?is-external=true" title="class or interface in java.util">Queue</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Queue (java.util)" alt="" coords="61,6,147,61"/>
+<area shape="rect" id="node2" href="IContainerQueue.html" title="&#171;interface&#187; IContainerQueue" alt="" coords="115,100,233,140"/>
+<area shape="rect" id="node3" href="IContainerCollection.html" title="&#171;interface&#187; IContainerCollection" alt="" coords="177,13,313,53"/>
+<area shape="rect" id="node4" href="IContainerBlockingQueue.html" title="&#171;interface&#187; IContainerBlockingQueue" alt="" coords="5,179,173,219"/>
+<area shape="rect" id="node5" href="ContainerQueue.html" title="ContainerQueue" alt="" coords="203,186,317,211"/>
+</map>
+
+<CENTER><IMG SRC="IContainerQueue.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.png
new file mode 100644
index 0000000000..bbf3985d1a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerQueue.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.html
index 95e0bbed72..2d3d53b9ad 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.html
@@ -102,13 +102,19 @@ Interface IContainerSet&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerSet&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerCollection.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerCollection</A>&lt;E&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Set (java.util)" alt="" coords="35,6,120,61"/>
+<area shape="rect" id="node2" href="IContainerSortedSet.html" title="&#171;interface&#187; IContainerSortedSet" alt="" coords="5,179,144,219"/>
+<area shape="rect" id="node3" href="IContainerSet.html" title="&#171;interface&#187; IContainerSet" alt="" coords="98,100,197,140"/>
+<area shape="rect" id="node4" href="IContainerCollection.html" title="&#171;interface&#187; IContainerCollection" alt="" coords="150,13,287,53"/>
+<area shape="rect" id="node5" href="ContainerSet.html" title="ContainerSet" alt="" coords="174,186,271,211"/>
+</map>
+
+<CENTER><IMG SRC="IContainerSet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.png
new file mode 100644
index 0000000000..fea3ae43f2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSet.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.html
index 7d38de8d20..07f517b46d 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.html
@@ -99,13 +99,18 @@ Interface IContainerSortedSet&lt;E&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IContainerSortedSet&lt;E&gt;</B><DT>extends <A HREF="../../../../../../org/eclipse/net4j/util/container/delegate/IContainerSet.html" title="interface in org.eclipse.net4j.util.container.delegate">IContainerSet</A>&lt;E&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/SortedSet.html?is-external=true" title="class or interface in java.util">SortedSet</A>&lt;E&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; SortedSet (java.util)" alt="" coords="5,6,91,61"/>
+<area shape="rect" id="node2" href="IContainerSortedSet.html" title="&#171;interface&#187; IContainerSortedSet" alt="" coords="40,100,179,140"/>
+<area shape="rect" id="node3" href="IContainerSet.html" title="&#171;interface&#187; IContainerSet" alt="" coords="121,13,220,53"/>
+<area shape="rect" id="node4" href="ContainerSortedSet.html" title="ContainerSortedSet" alt="" coords="42,179,176,205"/>
+</map>
+
+<CENTER><IMG SRC="IContainerSortedSet.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.png
new file mode 100644
index 0000000000..5bf094accf
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html
index c67451eb68..d49ed18d25 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html
@@ -88,6 +88,39 @@ Hybrid interfaces of notifying containers and the Java Collection Framework.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="AbstractDelegator.DelegatingIterator.html" title="AbstractDelegator.DelegatingIterator" alt="" coords="238,542,469,567"/>
+<area shape="rect" id="node2" href="ContainerBlockingQueue.html" title="ContainerBlockingQueue" alt="" coords="949,93,1115,118"/>
+<area shape="rect" id="node3" href="ContainerCollection.html" title="ContainerCollection" alt="" coords="543,213,678,238"/>
+<area shape="rect" id="node4" href="ContainerList.html" title="ContainerList" alt="" coords="787,191,885,217"/>
+<area shape="rect" id="node5" href="ContainerList.DelegatingListIterator.html" title="ContainerList.DelegatingListIterator" alt="" coords="499,510,723,535"/>
+<area shape="rect" id="node6" href="ContainerMap.html" title="ContainerMap" alt="" coords="559,406,662,431"/>
+<area shape="rect" id="node7" href="ContainerQueue.html" title="ContainerQueue" alt="" coords="779,121,893,146"/>
+<area shape="rect" id="node8" href="ContainerSet.html" title="ContainerSet" alt="" coords="787,245,885,270"/>
+<area shape="rect" id="node9" href="ContainerSortedSet.html" title="ContainerSortedSet" alt="" coords="965,273,1099,298"/>
+<area shape="rect" id="node10" href="../../event/Notifier.html" title="Notifier (org.eclipse.net4j.util.event)" alt="" coords="17,331,197,371"/>
+<area shape="rect" id="node11" href="AbstractDelegator.html" title="AbstractDelegator" alt="" coords="290,270,417,295"/>
+<area shape="rect" id="node12" title="&#171;interface&#187; BlockingQueue (java.util.concurrent)" alt="" coords="541,5,680,59"/>
+<area shape="rect" id="node13" title="&#171;interface&#187; Collection (java.util)" alt="" coords="64,173,149,227"/>
+<area shape="rect" id="node14" href="../IContainer.html" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="5,251,208,306"/>
+<area shape="rect" id="node15" href="IContainerBlockingQueue.html" title="&#171;interface&#187; IContainerBlockingQueue" alt="" coords="752,56,920,96"/>
+<area shape="rect" id="node16" href="IContainerCollection.html" title="&#171;interface&#187; IContainerCollection" alt="" coords="285,205,422,245"/>
+<area shape="rect" id="node17" href="IContainerList.html" title="&#171;interface&#187; IContainerList" alt="" coords="560,148,661,188"/>
+<area shape="rect" id="node18" href="IContainerMap.html" title="&#171;interface&#187; IContainerMap" alt="" coords="301,399,406,439"/>
+<area shape="rect" id="node19" href="IContainerQueue.html" title="&#171;interface&#187; IContainerQueue" alt="" coords="551,84,670,124"/>
+<area shape="rect" id="node20" href="IContainerSet.html" title="&#171;interface&#187; IContainerSet" alt="" coords="561,263,661,303"/>
+<area shape="rect" id="node21" href="IContainerSortedSet.html" title="&#171;interface&#187; IContainerSortedSet" alt="" coords="767,295,905,335"/>
+<area shape="rect" id="node22" title="&#171;interface&#187; Iterator (java.util)" alt="" coords="64,527,149,582"/>
+<area shape="rect" id="node23" title="&#171;interface&#187; List (java.util)" alt="" coords="311,126,396,181"/>
+<area shape="rect" id="node24" title="&#171;interface&#187; ListIterator (java.util)" alt="" coords="311,463,396,518"/>
+<area shape="rect" id="node25" title="&#171;interface&#187; Map (java.util)" alt="" coords="64,395,149,450"/>
+<area shape="rect" id="node26" title="&#171;interface&#187; Queue (java.util)" alt="" coords="311,47,396,102"/>
+<area shape="rect" id="node27" title="&#171;interface&#187; Set (java.util)" alt="" coords="311,319,396,374"/>
+<area shape="rect" id="node28" title="&#171;interface&#187; SortedSet (java.util)" alt="" coords="568,327,653,382"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -173,27 +206,6 @@ Package org.eclipse.net4j.util.container.delegate Description
 
 <P>
 Hybrid interfaces of notifying containers and the Java Collection Framework.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.png
new file mode 100644
index 0000000000..d64d2aa23c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html
index e6c6f6ed56..f61c5b6270 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html
@@ -88,6 +88,45 @@ A framework of notifying collections and wiring containers.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="FactoryNotFoundException.html" title="&#171;exception&#187; FactoryNotFoundException" alt="" coords="225,1217,405,1257"/>
+<area shape="rect" id="node2" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="32,1210,160,1265"/>
+<area shape="rect" id="node3" href="../security/ChallengeNegotiatorConfigurer.html" title="ChallengeNegotiatorConfigurer (org.eclipse.net4j.util.security)" alt="" coords="217,1073,413,1113"/>
+<area shape="rect" id="node4" href="ContainerDelta.html" title="ContainerDelta" alt="" coords="261,1023,368,1049"/>
+<area shape="rect" id="node5" href="ContainerEvent.html" title="ContainerEvent" alt="" coords="516,891,625,917"/>
+<area shape="rect" id="node6" href="ContainerEventAdapter.html" title="ContainerEventAdapter" alt="" coords="237,781,392,806"/>
+<area shape="rect" id="node7" href="../event/Event.html" title="Event (org.eclipse.net4j.util.event)" alt="" coords="225,880,405,920"/>
+<area shape="rect" id="node8" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="216,261,413,301"/>
+<area shape="rect" id="node9" href="LifecycleEventConverter.html" title="LifecycleEventConverter" alt="" coords="235,830,394,855"/>
+<area shape="rect" id="node10" href="ManagedContainer.html" title="ManagedContainer" alt="" coords="759,243,889,269"/>
+<area shape="rect" id="node11" href="SingleDeltaContainerEvent.html" title="SingleDeltaContainerEvent" alt="" coords="483,947,658,973"/>
+<area shape="rect" id="node12" href="delegate/AbstractDelegator.html" title="AbstractDelegator (org.eclipse.net4j.util.container.delegate)" alt="" coords="443,501,699,541"/>
+<area shape="rect" id="node13" href="Container.html" title="Container" alt="" coords="532,294,609,319"/>
+<area shape="rect" id="node14" href="../registry/Registry.html" title="Registry (org.eclipse.net4j.util.registry)" alt="" coords="728,293,920,333"/>
+<area shape="rect" id="node15" href="../security/ResponseNegotiatorInjector.html" title="ResponseNegotiatorInjector (org.eclipse.net4j.util.security)" alt="" coords="217,1137,412,1177"/>
+<area shape="rect" id="node16" href="IContainer.html" title="&#171;interface&#187; IContainer" alt="" coords="272,501,357,541"/>
+<area shape="rect" id="node17" href="IContainer.Modifiable.html" title="&#171;interface&#187; IContainer.Modifiable" alt="" coords="499,565,642,605"/>
+<area shape="rect" id="node18" href="delegate/IContainerCollection.html" title="&#171;interface&#187; IContainerCollection (org.eclipse.net4j.util.container.delegate)" alt="" coords="443,630,699,685"/>
+<area shape="rect" id="node19" href="IContainerDelta.html" title="&#171;interface&#187; IContainerDelta" alt="" coords="41,1016,151,1056"/>
+<area shape="rect" id="node20" href="IContainerEvent.html" title="&#171;interface&#187; IContainerEvent" alt="" coords="259,944,371,984"/>
+<area shape="rect" id="node21" href="IContainerEventVisitor.html" title="&#171;interface&#187; IContainerEventVisitor" alt="" coords="21,197,171,237"/>
+<area shape="rect" id="node22" href="IContainerEventVisitor.Filtered.html" title="&#171;interface&#187; IContainerEventVisitor.Filtered" alt="" coords="217,197,413,237"/>
+<area shape="rect" id="node23" href="delegate/IContainerMap.html" title="&#171;interface&#187; IContainerMap (org.eclipse.net4j.util.container.delegate)" alt="" coords="443,343,699,398"/>
+<area shape="rect" id="node24" href="IElementProcessor.html" title="&#171;interface&#187; IElementProcessor" alt="" coords="30,1121,162,1161"/>
+<area shape="rect" id="node25" href="../event/IEvent.html" title="&#171;interface&#187; IEvent (org.eclipse.net4j.util.event)" alt="" coords="6,937,186,991"/>
+<area shape="rect" id="node26" href="../lifecycle/ILifecycle.html" title="&#171;interface&#187; ILifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="216,702,413,757"/>
+<area shape="rect" id="node27" href="../event/IListener.html" title="&#171;interface&#187; IListener (org.eclipse.net4j.util.event)" alt="" coords="6,791,186,846"/>
+<area shape="rect" id="node28" href="IManagedContainer.html" title="&#171;interface&#187; IManagedContainer" alt="" coords="504,709,637,749"/>
+<area shape="rect" id="node29" href="../event/INotifier.html" title="&#171;interface&#187; INotifier (org.eclipse.net4j.util.event)" alt="" coords="6,494,186,549"/>
+<area shape="rect" id="node30" href="IPluginContainer.html" title="&#171;interface&#187; IPluginContainer" alt="" coords="766,709,882,749"/>
+<area shape="rect" id="node31" href="../registry/IRegistry.html" title="&#171;interface&#187; IRegistry (org.eclipse.net4j.util.registry)" alt="" coords="474,422,667,477"/>
+<area shape="rect" id="node32" href="ISlow.html" title="&#171;interface&#187; ISlow" alt="" coords="53,133,139,173"/>
+<area shape="rect" id="node33" href="ContainerUtil.html" title="&#171;static&#187; ContainerUtil" alt="" coords="48,69,144,109"/>
+<area shape="rect" id="node34" href="IContainerDelta.Kind.html" title="&#171;enum&#187; IContainerDelta.Kind" alt="" coords="26,5,166,45"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -213,27 +252,6 @@ Package org.eclipse.net4j.util.container Description
 
 <P>
 A framework of notifying collections and wiring containers.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.png
new file mode 100644
index 0000000000..e21cb67bd6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.html
index aae5b21b59..97813b59bf 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.html
@@ -104,12 +104,25 @@ Class Event</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>Event</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/EventObject.html?is-external=true" title="class or interface in java.util">EventObject</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="interface in org.eclipse.net4j.util.event">IEvent</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../container/ContainerEvent.html" title="ContainerEvent (org.eclipse.net4j.util.container)" alt="" coords="377,5,580,45"/>
+<area shape="rect" id="node2" href="Event.html" title="Event" alt="" coords="195,189,250,214"/>
+<area shape="rect" id="node3" title="EventObject (java.util)" alt="" coords="6,152,98,192"/>
+<area shape="rect" id="node4" href="../lifecycle/LifecycleEvent.html" title="LifecycleEvent (org.eclipse.net4j.util.lifecycle)" alt="" coords="380,64,577,104"/>
+<area shape="rect" id="node5" href="../om/monitor/NotifyingMonitor.ProgressEvent.html" title="NotifyingMonitor.ProgressEvent (org.eclipse.net4j.util.om.monitor)" alt="" coords="371,123,586,163"/>
+<area shape="rect" id="node6" href="../options/OptionsEvent.html" title="OptionsEvent (org.eclipse.net4j.util.options)" alt="" coords="383,181,575,221"/>
+<area shape="rect" id="node7" href="../ui/widgets/SashComposite.OrientationChangedEvent.html" title="SashComposite.OrientationChangedEvent (org.eclipse.net4j.util.ui.widgets)" alt="" coords="347,240,611,280"/>
+<area shape="rect" id="node8" href="../container/SingleDeltaContainerEvent.html" title="SingleDeltaContainerEvent (org.eclipse.net4j.util.container)" alt="" coords="377,299,580,339"/>
+<area shape="rect" id="node9" href="ValueEvent.html" title="ValueEvent" alt="" coords="435,358,522,383"/>
+<area shape="rect" id="node10" href="IEvent.html" title="&#171;interface&#187; IEvent" alt="" coords="9,211,95,251"/>
+</map>
+
+<CENTER><IMG SRC="Event.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.event.Event">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.png
new file mode 100644
index 0000000000..bbd4ffadec
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Event.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.html
index 489a700399..c374bd2dfe 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.html
@@ -97,13 +97,15 @@ Class EventUtil</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>EventUtil</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="EventUtil.html" title="&#171;static&#187; EventUtil" alt="" coords="5,5,77,45"/>
+</map>
+
+<CENTER><IMG SRC="EventUtil.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.png
new file mode 100644
index 0000000000..13dd89783d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/EventUtil.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.html
index bc02688c47..1858f07169 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.html
@@ -105,13 +105,16 @@ Class ExecutorServiceNotifier.ThreadPool</H2>
 <HR>
 <DL>
 <DT><PRE>public static class <B>ExecutorServiceNotifier.ThreadPool</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/ExecutorServiceNotifier.html" title="class in org.eclipse.net4j.util.event">ExecutorServiceNotifier</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ExecutorServiceNotifier.ThreadPool.html" title="ExecutorServiceNotifier.ThreadPool" alt="" coords="5,71,229,97"/>
+<area shape="rect" id="node2" href="ExecutorServiceNotifier.html" title="ExecutorServiceNotifier" alt="" coords="39,6,195,31"/>
+</map>
+
+<CENTER><IMG SRC="ExecutorServiceNotifier.ThreadPool.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.png
new file mode 100644
index 0000000000..a3ce943f9e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.ThreadPool.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.html
index 3286f73a60..659dc43038 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.html
@@ -104,14 +104,20 @@ Class ExecutorServiceNotifier</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ExecutorServiceNotifier</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/Notifier.html" title="class in org.eclipse.net4j.util.event">Notifier</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Notifier.html" title="Notifier" alt="" coords="86,6,148,31"/>
+<area shape="rect" id="node2" href="ExecutorServiceNotifier.ThreadPool.html" title="ExecutorServiceNotifier.ThreadPool" alt="" coords="5,137,229,162"/>
+<area shape="rect" id="node3" href="ExecutorServiceNotifier.html" title="ExecutorServiceNotifier" alt="" coords="39,71,195,97"/>
+</map>
+
+<CENTER><IMG SRC="ExecutorServiceNotifier.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>2.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.png
new file mode 100644
index 0000000000..2b8f4571d5
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ExecutorServiceNotifier.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html
index c0902bf3e7..8683230ce4 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html
@@ -99,13 +99,23 @@ Interface IEvent</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IEvent</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Event.html" title="Event" alt="" coords="286,5,341,30"/>
+<area shape="rect" id="node2" href="../fsm/FiniteStateMachine.StateChangedEvent.html" title="FiniteStateMachine.StateChangedEvent (org.eclipse.net4j.util.fsm)" alt="" coords="187,49,439,89"/>
+<area shape="rect" id="node3" href="../cache/ICacheMonitorEvent.html" title="&#171;interface&#187; ICacheMonitorEvent (org.eclipse.net4j.util.cache)" alt="" coords="221,109,406,163"/>
+<area shape="rect" id="node4" href="../container/IContainerEvent.html" title="&#171;interface&#187; IContainerEvent (org.eclipse.net4j.util.container)" alt="" coords="212,182,415,237"/>
+<area shape="rect" id="node5" href="IEvent.html" title="&#171;interface&#187; IEvent" alt="" coords="5,227,91,267"/>
+<area shape="rect" id="node6" href="../collection/IHistoryChangeEvent.html" title="&#171;interface&#187; IHistoryChangeEvent (org.eclipse.net4j.util.collection)" alt="" coords="211,255,416,310"/>
+<area shape="rect" id="node7" href="../lifecycle/ILifecycleEvent.html" title="&#171;interface&#187; ILifecycleEvent (org.eclipse.net4j.util.lifecycle)" alt="" coords="215,329,412,383"/>
+<area shape="rect" id="node8" href="../options/IOptionsEvent.html" title="&#171;interface&#187; IOptionsEvent (org.eclipse.net4j.util.options)" alt="" coords="217,402,409,457"/>
+<area shape="rect" id="node9" href="../om/pref/OMPreferencesChangeEvent.html" title="&#171;interface&#187; OMPreferencesChangeEvent (org.eclipse.net4j.util.om.pref)" alt="" coords="217,475,410,530"/>
+</map>
+
+<CENTER><IMG SRC="IEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.png
new file mode 100644
index 0000000000..1aff99a0d0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.html
index 37d1d59a5e..d1ccb43b37 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.html
@@ -99,13 +99,23 @@ Interface IListener</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IListener</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/EventListener.html?is-external=true" title="class or interface in java.util">EventListener</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../container/ContainerEventAdapter.html" title="ContainerEventAdapter (org.eclipse.net4j.util.container)" alt="" coords="392,5,595,45"/>
+<area shape="rect" id="node2" href="../ui/views/ContainerItemProvider.LeafNode.html" title="ContainerItemProvider.LeafNode (org.eclipse.net4j.util.ui.views)" alt="" coords="390,64,597,104"/>
+<area shape="rect" id="node3" href="../lifecycle/LifecycleEventAdapter.html" title="LifecycleEventAdapter (org.eclipse.net4j.util.lifecycle)" alt="" coords="395,123,592,163"/>
+<area shape="rect" id="node4" href="../container/LifecycleEventConverter.html" title="LifecycleEventConverter (org.eclipse.net4j.util.container)" alt="" coords="392,181,595,221"/>
+<area shape="rect" id="node5" href="../ui/container/ElementWizardComposite.html" title="ElementWizardComposite (org.eclipse.net4j.util.ui.container)" alt="" coords="385,240,602,280"/>
+<area shape="rect" id="node6" href="../ui/actions/SashLayoutAction.html" title="SashLayoutAction (org.eclipse.net4j.util.ui.actions)" alt="" coords="390,299,597,339"/>
+<area shape="rect" id="node7" href="../ui/StructuredContentProvider.html" title="StructuredContentProvider (org.eclipse.net4j.util.ui)" alt="" coords="406,357,581,397"/>
+<area shape="rect" id="node8" title="&#171;interface&#187; EventListener (java.util)" alt="" coords="6,174,106,229"/>
+<area shape="rect" id="node9" href="IListener.html" title="&#171;interface&#187; IListener" alt="" coords="203,181,288,221"/>
+</map>
+
+<CENTER><IMG SRC="IListener.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.png
new file mode 100644
index 0000000000..ff7fa23df5
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IListener.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html
index d93c784321..d8ef2b1cbe 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.html
@@ -99,7 +99,22 @@ Interface INotifier</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>INotifier</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Notifier.html" title="Notifier" alt="" coords="263,5,326,30"/>
+<area shape="rect" id="node2" href="../om/monitor/NotifyingMonitor.html" title="NotifyingMonitor (org.eclipse.net4j.util.om.monitor)" alt="" coords="187,49,402,89"/>
+<area shape="rect" id="node3" href="../ui/widgets/SashComposite.html" title="SashComposite (org.eclipse.net4j.util.ui.widgets)" alt="" coords="191,108,398,148"/>
+<area shape="rect" id="node4" href="../cache/ICacheMonitor.html" title="&#171;interface&#187; ICacheMonitor (org.eclipse.net4j.util.cache)" alt="" coords="202,167,387,222"/>
+<area shape="rect" id="node5" href="../container/IContainer.html" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="193,241,396,295"/>
+<area shape="rect" id="node6" href="../collection/IHistory.html" title="&#171;interface&#187; IHistory (org.eclipse.net4j.util.collection)" alt="" coords="192,314,397,369"/>
+<area shape="rect" id="node7" href="../lifecycle/ILifecycle.html" title="&#171;interface&#187; ILifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="196,387,393,442"/>
+<area shape="rect" id="node8" href="INotifier.html" title="&#171;interface&#187; INotifier" alt="" coords="5,248,91,288"/>
+<area shape="rect" id="node9" href="../options/IOptions.html" title="&#171;interface&#187; IOptions (org.eclipse.net4j.util.options)" alt="" coords="199,461,391,515"/>
+<area shape="rect" id="node10" href="../om/pref/OMPreferences.html" title="&#171;interface&#187; OMPreferences (org.eclipse.net4j.util.om.pref)" alt="" coords="198,534,391,589"/>
+</map>
+
+<CENTER><IMG SRC="INotifier.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 An entity that a number of <A HREF="../../../../../org/eclipse/net4j/util/event/IListener.html" title="interface in org.eclipse.net4j.util.event"><CODE>listeners</CODE></A> can be registered with and that can fire <A HREF="../../../../../org/eclipse/net4j/util/event/IEvent.html" title="interface in org.eclipse.net4j.util.event"><CODE>events</CODE></A>
@@ -112,10 +127,6 @@ An entity that a number of <A HREF="../../../../../org/eclipse/net4j/util/event/
 <P>
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.png
new file mode 100644
index 0000000000..350f31f6fd
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/INotifier.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.html
index 36f0bc55d2..070ea651c7 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.html
@@ -103,14 +103,25 @@ Class Notifier</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>Notifier</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/event/INotifier.html" title="interface in org.eclipse.net4j.util.event">INotifier</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ExecutorServiceNotifier.html" title="ExecutorServiceNotifier" alt="" coords="397,5,553,30"/>
+<area shape="rect" id="node2" href="../collection/History.html" title="History (org.eclipse.net4j.util.collection)" alt="" coords="372,49,577,89"/>
+<area shape="rect" id="node3" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="376,108,573,148"/>
+<area shape="rect" id="node4" href="Notifier.html" title="Notifier" alt="" coords="187,142,250,167"/>
+<area shape="rect" id="node5" href="ValueNotifier.html" title="ValueNotifier" alt="" coords="427,167,522,193"/>
+<area shape="rect" id="node6" href="../container/delegate/AbstractDelegator.html" title="AbstractDelegator (org.eclipse.net4j.util.container.delegate)" alt="" coords="347,212,603,252"/>
+<area shape="rect" id="node7" href="../ui/container/ElementWizard.html" title="ElementWizard (org.eclipse.net4j.util.ui.container)" alt="" coords="366,271,583,311"/>
+<area shape="rect" id="node8" href="INotifier.html" title="&#171;interface&#187; INotifier" alt="" coords="5,135,91,175"/>
+</map>
+
+<CENTER><IMG SRC="Notifier.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.0</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.png
new file mode 100644
index 0000000000..4d0440c260
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/Notifier.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.html
index 8668f58c63..d2a4e7db08 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.html
@@ -102,14 +102,19 @@ Class ValueEvent&lt;VALUE&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ValueEvent&lt;VALUE&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/Event.html" title="class in org.eclipse.net4j.util.event">Event</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ValueEvent.html" title="ValueEvent" alt="" coords="5,71,91,97"/>
+<area shape="rect" id="node2" href="Event.html" title="Event" alt="" coords="21,6,75,31"/>
+</map>
+
+<CENTER><IMG SRC="ValueEvent.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.event.ValueEvent">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.png
new file mode 100644
index 0000000000..53259c3646
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueEvent.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.html
index 2611c4b691..f916ccd67b 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.html
@@ -101,14 +101,19 @@ Class ValueNotifier&lt;VALUE&gt;</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ValueNotifier&lt;VALUE&gt;</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/event/Notifier.html" title="class in org.eclipse.net4j.util.event">Notifier</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="ValueNotifier.html" title="ValueNotifier" alt="" coords="5,71,99,97"/>
+<area shape="rect" id="node2" href="Notifier.html" title="Notifier" alt="" coords="21,6,83,31"/>
+</map>
+
+<CENTER><IMG SRC="ValueNotifier.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
 <DT><B>Since:</B></DT>
   <DD>3.1</DD>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 </DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.png
new file mode 100644
index 0000000000..7c80b8ba6e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/ValueNotifier.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html
index d2ddfc4dce..a46af2c2a5 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html
@@ -88,6 +88,55 @@ A framework for sending of and listening to events.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../container/ContainerEvent.html" title="ContainerEvent (org.eclipse.net4j.util.container)" alt="" coords="449,1061,652,1101"/>
+<area shape="rect" id="node2" href="../container/ContainerEventAdapter.html" title="ContainerEventAdapter (org.eclipse.net4j.util.container)" alt="" coords="449,613,652,653"/>
+<area shape="rect" id="node3" href="../ui/views/ContainerItemProvider.LeafNode.html" title="ContainerItemProvider.LeafNode (org.eclipse.net4j.util.ui.views)" alt="" coords="447,677,654,717"/>
+<area shape="rect" id="node4" href="Event.html" title="Event" alt="" coords="235,1261,290,1286"/>
+<area shape="rect" id="node5" title="EventObject (java.util)" alt="" coords="10,1253,102,1293"/>
+<area shape="rect" id="node6" href="ExecutorServiceNotifier.html" title="ExecutorServiceNotifier" alt="" coords="473,5,629,30"/>
+<area shape="rect" id="node7" href="ExecutorServiceNotifier.ThreadPool.html" title="ExecutorServiceNotifier.ThreadPool" alt="" coords="713,5,938,30"/>
+<area shape="rect" id="node8" href="../fsm/FiniteStateMachine.StateChangedEvent.html" title="FiniteStateMachine.StateChangedEvent (org.eclipse.net4j.util.fsm)" alt="" coords="137,1311,389,1351"/>
+<area shape="rect" id="node9" href="../collection/History.html" title="History (org.eclipse.net4j.util.collection)" alt="" coords="448,55,653,95"/>
+<area shape="rect" id="node10" href="../lifecycle/Lifecycle.html" title="Lifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="452,119,649,159"/>
+<area shape="rect" id="node11" href="../lifecycle/LifecycleEvent.html" title="LifecycleEvent (org.eclipse.net4j.util.lifecycle)" alt="" coords="452,1125,649,1165"/>
+<area shape="rect" id="node12" href="../lifecycle/LifecycleEventAdapter.html" title="LifecycleEventAdapter (org.eclipse.net4j.util.lifecycle)" alt="" coords="452,741,649,781"/>
+<area shape="rect" id="node13" href="../container/LifecycleEventConverter.html" title="LifecycleEventConverter (org.eclipse.net4j.util.container)" alt="" coords="449,805,652,845"/>
+<area shape="rect" id="node14" href="Notifier.html" title="Notifier" alt="" coords="231,154,294,179"/>
+<area shape="rect" id="node15" href="../om/monitor/NotifyingMonitor.html" title="NotifyingMonitor (org.eclipse.net4j.util.om.monitor)" alt="" coords="155,204,370,244"/>
+<area shape="rect" id="node16" href="../om/monitor/NotifyingMonitor.ProgressEvent.html" title="NotifyingMonitor.ProgressEvent (org.eclipse.net4j.util.om.monitor)" alt="" coords="443,1189,658,1229"/>
+<area shape="rect" id="node17" href="../options/OptionsEvent.html" title="OptionsEvent (org.eclipse.net4j.util.options)" alt="" coords="455,1253,647,1293"/>
+<area shape="rect" id="node18" href="../ui/widgets/SashComposite.OrientationChangedEvent.html" title="SashComposite.OrientationChangedEvent (org.eclipse.net4j.util.ui.widgets)" alt="" coords="419,1317,683,1357"/>
+<area shape="rect" id="node19" href="../container/SingleDeltaContainerEvent.html" title="SingleDeltaContainerEvent (org.eclipse.net4j.util.container)" alt="" coords="449,1381,652,1421"/>
+<area shape="rect" id="node20" href="ValueEvent.html" title="ValueEvent" alt="" coords="507,1446,594,1471"/>
+<area shape="rect" id="node21" href="ValueNotifier.html" title="ValueNotifier" alt="" coords="503,183,598,209"/>
+<area shape="rect" id="node22" href="../container/delegate/AbstractDelegator.html" title="AbstractDelegator (org.eclipse.net4j.util.container.delegate)" alt="" coords="423,233,679,273"/>
+<area shape="rect" id="node23" href="../ui/container/ElementWizard.html" title="ElementWizard (org.eclipse.net4j.util.ui.container)" alt="" coords="442,297,659,337"/>
+<area shape="rect" id="node24" href="../ui/container/ElementWizardComposite.html" title="ElementWizardComposite (org.eclipse.net4j.util.ui.container)" alt="" coords="442,869,659,909"/>
+<area shape="rect" id="node25" href="../ui/widgets/SashComposite.html" title="SashComposite (org.eclipse.net4j.util.ui.widgets)" alt="" coords="159,268,366,308"/>
+<area shape="rect" id="node26" href="../ui/actions/SashLayoutAction.html" title="SashLayoutAction (org.eclipse.net4j.util.ui.actions)" alt="" coords="447,933,654,973"/>
+<area shape="rect" id="node27" href="../ui/StructuredContentProvider.html" title="StructuredContentProvider (org.eclipse.net4j.util.ui)" alt="" coords="463,997,638,1037"/>
+<area shape="rect" id="node28" title="&#171;interface&#187; EventListener (java.util)" alt="" coords="6,798,106,853"/>
+<area shape="rect" id="node29" href="../cache/ICacheMonitor.html" title="&#171;interface&#187; ICacheMonitor (org.eclipse.net4j.util.cache)" alt="" coords="170,333,355,387"/>
+<area shape="rect" id="node30" href="../cache/ICacheMonitorEvent.html" title="&#171;interface&#187; ICacheMonitorEvent (org.eclipse.net4j.util.cache)" alt="" coords="170,1375,355,1430"/>
+<area shape="rect" id="node31" href="../container/IContainer.html" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="161,411,364,466"/>
+<area shape="rect" id="node32" href="../container/IContainerEvent.html" title="&#171;interface&#187; IContainerEvent (org.eclipse.net4j.util.container)" alt="" coords="161,1454,364,1509"/>
+<area shape="rect" id="node33" href="IEvent.html" title="&#171;interface&#187; IEvent" alt="" coords="13,1501,99,1541"/>
+<area shape="rect" id="node34" href="../collection/IHistory.html" title="&#171;interface&#187; IHistory (org.eclipse.net4j.util.collection)" alt="" coords="160,490,365,545"/>
+<area shape="rect" id="node35" href="../collection/IHistoryChangeEvent.html" title="&#171;interface&#187; IHistoryChangeEvent (org.eclipse.net4j.util.collection)" alt="" coords="160,1533,365,1587"/>
+<area shape="rect" id="node36" href="../lifecycle/ILifecycle.html" title="&#171;interface&#187; ILifecycle (org.eclipse.net4j.util.lifecycle)" alt="" coords="164,569,361,623"/>
+<area shape="rect" id="node37" href="../lifecycle/ILifecycleEvent.html" title="&#171;interface&#187; ILifecycleEvent (org.eclipse.net4j.util.lifecycle)" alt="" coords="164,1611,361,1666"/>
+<area shape="rect" id="node38" href="IListener.html" title="&#171;interface&#187; IListener" alt="" coords="220,805,305,845"/>
+<area shape="rect" id="node39" href="INotifier.html" title="&#171;interface&#187; INotifier" alt="" coords="13,419,99,459"/>
+<area shape="rect" id="node40" href="../options/IOptions.html" title="&#171;interface&#187; IOptions (org.eclipse.net4j.util.options)" alt="" coords="167,647,359,702"/>
+<area shape="rect" id="node41" href="../options/IOptionsEvent.html" title="&#171;interface&#187; IOptionsEvent (org.eclipse.net4j.util.options)" alt="" coords="167,1690,359,1745"/>
+<area shape="rect" id="node42" href="../om/pref/OMPreferences.html" title="&#171;interface&#187; OMPreferences (org.eclipse.net4j.util.om.pref)" alt="" coords="166,726,359,781"/>
+<area shape="rect" id="node43" href="../om/pref/OMPreferencesChangeEvent.html" title="&#171;interface&#187; OMPreferencesChangeEvent (org.eclipse.net4j.util.om.pref)" alt="" coords="166,1769,359,1823"/>
+<area shape="rect" id="node44" href="EventUtil.html" title="&#171;static&#187; EventUtil" alt="" coords="19,355,93,395"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -154,27 +203,6 @@ Package org.eclipse.net4j.util.event Description
 
 <P>
 A framework for sending of and listening to events.
-<p>
-
-<!--
-
-<h2>Package Specification</h2>
-
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
-<ul>
-  <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
-</ul>
-
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
-
--->
-
-<!-- Put @see and @since tags down here. -->
 <P>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.png
new file mode 100644
index 0000000000..78a261e41c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.html
index 8060516e38..de90b5f12c 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.html
@@ -103,13 +103,24 @@ Class Factory</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>Factory</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/factory/IFactory.html" title="interface in org.eclipse.net4j.util.factory">IFactory</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../concurrent/ExecutorServiceFactory.html" title="ExecutorServiceFactory (org.eclipse.net4j.util.concurrent)" alt="" coords="353,5,564,45"/>
+<area shape="rect" id="node2" href="FactoryDescriptor.html" title="FactoryDescriptor" alt="" coords="396,65,521,90"/>
+<area shape="rect" id="node3" href="../security/RandomizerFactory.html" title="RandomizerFactory (org.eclipse.net4j.util.security)" alt="" coords="361,109,557,149"/>
+<area shape="rect" id="node4" href="../concurrent/TimerLifecycle.DaemonFactory.html" title="TimerLifecycle.DaemonFactory (org.eclipse.net4j.util.concurrent)" alt="" coords="353,168,564,208"/>
+<area shape="rect" id="node5" href="../security/CredentialsProviderFactory.html" title="CredentialsProviderFactory (org.eclipse.net4j.util.security)" alt="" coords="361,227,556,267"/>
+<area shape="rect" id="node6" href="../ui/container/ElementWizardFactory.html" title="ElementWizardFactory (org.eclipse.net4j.util.ui.container)" alt="" coords="350,285,567,325"/>
+<area shape="rect" id="node7" href="Factory.html" title="Factory" alt="" coords="187,205,253,230"/>
+<area shape="rect" id="node8" href="../security/NegotiatorFactory.html" title="NegotiatorFactory (org.eclipse.net4j.util.security)" alt="" coords="361,344,556,384"/>
+<area shape="rect" id="node9" href="../security/UserManagerFactory.html" title="UserManagerFactory (org.eclipse.net4j.util.security)" alt="" coords="361,403,556,443"/>
+<area shape="rect" id="node10" href="IFactory.html" title="&#171;interface&#187; IFactory" alt="" coords="5,197,91,237"/>
+</map>
+
+<CENTER><IMG SRC="Factory.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.png
new file mode 100644
index 0000000000..315f03ef0e
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/Factory.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.html
index 8fc1a7eded..76000341e1 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.html
@@ -103,12 +103,17 @@ Class FactoryCreationException</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>FactoryCreationException</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="27,6,155,61"/>
+<area shape="rect" id="node2" href="FactoryCreationException.html" title="&#171;exception&#187; FactoryCreationException" alt="" coords="5,100,176,140"/>
+</map>
+
+<CENTER><IMG SRC="FactoryCreationException.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.factory.FactoryCreationException">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.png
new file mode 100644
index 0000000000..bdaf88ec21
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryCreationException.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.html
index 5472973281..075455a135 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.html
@@ -101,12 +101,17 @@ Class FactoryDescriptor</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>FactoryDescriptor</B><DT>extends <A HREF="../../../../../org/eclipse/net4j/util/factory/Factory.html" title="class in org.eclipse.net4j.util.factory">Factory</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="Factory.html" title="Factory" alt="" coords="35,6,100,31"/>
+<area shape="rect" id="node2" href="FactoryDescriptor.html" title="FactoryDescriptor" alt="" coords="5,71,131,97"/>
+</map>
+
+<CENTER><IMG SRC="FactoryDescriptor.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.png
new file mode 100644
index 0000000000..b9cccb647d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryDescriptor.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.html
index 36236574ba..2ce8fc6c2a 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.html
@@ -100,12 +100,19 @@ Class FactoryKey</H2>
 <HR>
 <DL>
 <DT><PRE>public final class <B>FactoryKey</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A><DT>implements <A HREF="../../../../../org/eclipse/net4j/util/factory/IFactoryKey.html" title="interface in org.eclipse.net4j.util.factory">IFactoryKey</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;<A HREF="../../../../../org/eclipse/net4j/util/factory/FactoryKey.html" title="class in org.eclipse.net4j.util.factory">FactoryKey</A>&gt;</DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; Serializable (java.io)" alt="" coords="5,6,93,61"/>
+<area shape="rect" id="node2" href="IFactoryKey.html" title="&#171;interface&#187; IFactoryKey" alt="" coords="123,13,215,53"/>
+<area shape="rect" id="node3" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="245,6,336,61"/>
+<area shape="rect" id="node4" href="FactoryKey.html" title="FactoryKey" alt="" coords="125,101,213,126"/>
+</map>
+
+<CENTER><IMG SRC="FactoryKey.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.factory.FactoryKey">Serialized Form</A></DL>
 <HR>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.png
new file mode 100644
index 0000000000..222a4b10d9
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/FactoryKey.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.html
index c5efd1e0db..1325d7fe31 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.html
@@ -96,13 +96,16 @@ Interface IFactory</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IFactory</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IFactory.html" title="&#171;interface&#187; IFactory" alt="" coords="5,5,91,45"/>
+<area shape="rect" id="node2" href="Factory.html" title="Factory" alt="" coords="15,85,80,110"/>
+</map>
+
+<CENTER><IMG SRC="IFactory.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
-</DL>
 <HR>
 
 <P>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.png
new file mode 100644
index 0000000000..0f96244c51
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactory.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.html
index e864d250e3..dba1af2404 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.html
@@ -96,12 +96,17 @@ Interface IFactoryKey</H2>
 <HR>
 <DL>
 <DT><PRE>public interface <B>IFactoryKey</B></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="IFactoryKey.html" title="&#171;interface&#187; IFactoryKey" alt="" coords="5,5,96,45"/>
+<area shape="rect" id="node2" href="FactoryKey.html" title="FactoryKey" alt="" coords="6,85,95,110"/>
+</map>
+
+<CENTER><IMG SRC="IFactoryKey.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>No Implement</B></DT>
   <DD>This interface is not intended to be implemented by clients.</DD>
 <DT><B>No Extend</B></DT>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.png
new file mode 100644
index 0000000000..a63bff6c93
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/IFactoryKey.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.html
index f41a5cb3c6..80dc2316b8 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.html
@@ -103,12 +103,17 @@ Class ProductCreationException</H2>
 <HR>
 <DL>
 <DT><PRE>public class <B>ProductCreationException</B><DT>extends <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang">RuntimeException</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="28,6,156,61"/>
+<area shape="rect" id="node2" href="ProductCreationException.html" title="&#171;exception&#187; ProductCreationException" alt="" coords="5,100,179,140"/>
+</map>
+
+<CENTER><IMG SRC="ProductCreationException.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Eike Stepper</DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#org.eclipse.net4j.util.factory.ProductCreationException">Serialized Form</A><DT><B>No Extend</B></DT>
   <DD>This class is not intended to be subclassed by clients.</DD>
 </DL>
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.png b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.png
new file mode 100644
index 0000000000..0712a7bec0
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/ProductCreationException.png
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html
index 5b35838be3..d966583419 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html
@@ -88,6 +88,28 @@ A framework for factory based instance creation.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
 <P>
 
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="FactoryCreationException.html" title="&#171;exception&#187; FactoryCreationException" alt="" coords="163,285,335,325"/>
+<area shape="rect" id="node2" href="ProductCreationException.html" title="&#171;exception&#187; ProductCreationException" alt="" coords="163,349,336,389"/>
+<area shape="rect" id="node3" title="&#171;exception&#187; RuntimeException (java.lang)" alt="" coords="5,318,133,373"/>
+<area shape="rect" id="node4" href="../concurrent/ExecutorServiceFactory.html" title="ExecutorServiceFactory (org.eclipse.net4j.util.concurrent)" alt="" coords="369,17,580,57"/>
+<area shape="rect" id="node5" href="FactoryDescriptor.html" title="FactoryDescriptor" alt="" coords="412,82,537,107"/>
+<area shape="rect" id="node6" href="FactoryKey.html" title="FactoryKey" alt="" coords="205,91,294,117"/>
+<area shape="rect" id="node7" href="../security/RandomizerFactory.html" title="RandomizerFactory (org.eclipse.net4j.util.security)" alt="" coords="377,132,573,172"/>
+<area shape="rect" id="node8" href="../concurrent/TimerLifecycle.DaemonFactory.html" title="TimerLifecycle.DaemonFactory (org.eclipse.net4j.util.concurrent)" alt="" coords="369,196,580,236"/>
+<area shape="rect" id="node9" href="../security/CredentialsProviderFactory.html" title="CredentialsProviderFactory (org.eclipse.net4j.util.security)" alt="" coords="377,260,572,300"/>
+<area shape="rect" id="node10" href="../ui/container/ElementWizardFactory.html" title="ElementWizardFactory (org.eclipse.net4j.util.ui.container)" alt="" coords="366,324,583,364"/>
+<area shape="rect" id="node11" href="Factory.html" title="Factory" alt="" coords="217,235,282,261"/>
+<area shape="rect" id="node12" href="../security/NegotiatorFactory.html" title="NegotiatorFactory (org.eclipse.net4j.util.security)" alt="" coords="377,388,572,428"/>
+<area shape="rect" id="node13" href="../security/UserManagerFactory.html" title="UserManagerFactory (org.eclipse.net4j.util.security)" alt="" coords="377,452,572,492"/>
+<area shape="rect" id="node14" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="24,5,115,59"/>
+<area shape="rect" id="node15" href="IFactory.html" title="&#171;interface&#187; IFactory" alt="" coords="27,228,112,268"/>
+<area shape="rect" id="node16" href="IFactoryKey.html" title="&#171;interface&#187; IFactoryKey" alt="" coords="23,84,115,124"/>
+<area shape="rect" id="node17" title="&#171;interface&#187; Serializable (java.io)" alt="" coords="25,149,114,203"/>
+</map>
+
+<CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+<BR>
 <TABLE BORDER="1" WIDTH="100%" CE
author	Eike Stepper	2011-09-03 08:40:10 +0000
committer	Eike Stepper	2011-09-03 08:40:10 +0000
commit	d70c57c18b2e080ca322d93b5ef04a26b9d40d6b (patch)
tree	30d3bb6a4f638ac470516f6e4e7a23c04c1eff38
parent	036b35cf4e193f840a66431450da33267ce95e12 (diff)
download	cdo-d70c57c18b2e080ca322d93b5ef04a26b9d40d6b.tar.gz cdo-d70c57c18b2e080ca322d93b5ef04a26b9d40d6b.tar.xz cdo-d70c57c18b2e080ca322d93b5ef04a26b9d40d6b.zip