Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html11
1 files changed, 8 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html
index be83745487..e3428948ee 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html
@@ -103,14 +103,19 @@ Class AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector</H2>
<HR>
<DL>
<DT><PRE>public static class <B>AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector</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.doc/javadoc/org/eclipse/net4j/util/event/IListener.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event">IListener</A></DL>
-</PRE>
+</PRE><map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" title="&#171;interface&#187; IListener (org.eclipse.net4j.util.event)" alt="" coords="131,6,311,61"/>
+<area shape="rect" id="node2" href="AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.html" title="AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector" alt="" coords="5,101,437,126"/>
+</map>
+
+<CENTER><IMG SRC="AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
-<DT><B>Author:</B></DT>
- <DD>Eike Stepper</DD>
</DL>
<HR>

Back to the top