1 files changed, 11 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html
index 1d2f6cc74a..2919c8701f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html
@@ -104,14 +104,22 @@ Class AbstractObjectConflictResolver</H2>
 <HR>
 <DL>
 <DT><PRE>public abstract class <B>AbstractObjectConflictResolver</B><DT>extends <A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractConflictResolver</A><DT>implements <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver2</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="../../cdo/transaction/CDOConflictResolver2.html" title="&#171;interface&#187; CDOConflictResolver2 (org.eclipse.emf.cdo.transaction)" alt="" coords="149,6,360,61"/>
+<area shape="rect" id="node2" href="AbstractObjectConflictResolver.ThreeWayMerge.html" title="AbstractObjectConflictResolver.ThreeWayMerge" alt="" coords="5,166,307,191"/>
+<area shape="rect" id="node3" href="AbstractObjectConflictResolver.html" title="AbstractObjectConflictResolver" alt="" coords="261,101,467,126"/>
+<area shape="rect" id="node4" href="AbstractConflictResolver.html" title="AbstractConflictResolver" alt="" coords="390,21,556,46"/>
+<area shape="rect" id="node5" href="AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges.html" title="AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges" alt="" coords="337,166,809,191"/>
+</map>
+
+<CENTER><IMG SRC="AbstractObjectConflictResolver.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>