diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html index 22de75b219..19c32cd539 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html @@ -9,6 +9,7 @@ CDOConflictResolver2 (CDO Model Repository Documentation) <META NAME="date" CONTENT="">
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../html/book.css" TITLE="Style">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
<SCRIPT type="text/javascript">
@@ -93,16 +94,12 @@ Interface CDOConflictResolver2</H2> <DL>
<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver</A></DD>
</DL>
-<DL>
-<DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.MergeLocalChangesPerFeature.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver.MergeLocalChangesPerFeature</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html" title="class in org.eclipse.emf.spi.cdo">AbstractObjectConflictResolver.ThreeWayMerge</A></DD>
-</DL>
<HR>
<DL>
<DT><PRE>public interface <B>CDOConflictResolver2</B><DT>extends <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver</A></DL>
</PRE><map id="APIVIZ" name="APIVIZ">
-<area shape="rect" id="node1" href="CDOConflictResolver2.html" title="«interface» CDOConflictResolver2" alt="" coords="33,84,183,124"/>
-<area shape="rect" id="node2" href="CDOConflictResolver.html" title="«interface» CDOConflictResolver" alt="" coords="37,5,179,45"/>
-<area shape="rect" id="node3" href="../../spi/cdo/AbstractObjectConflictResolver.html" title="AbstractObjectConflictResolver (org.eclipse.emf.spi.cdo)" alt="" coords="5,163,211,203"/>
+<area shape="rect" id="node1" href="CDOConflictResolver2.html" title="«interface» CDOConflictResolver2" alt="" coords="5,84,155,124"/>
+<area shape="rect" id="node2" href="CDOConflictResolver.html" title="«interface» CDOConflictResolver" alt="" coords="9,5,151,45"/>
</map>
<CENTER><IMG SRC="CDOConflictResolver2.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
|