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 | 8 |
1 files changed, 6 insertions, 2 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 7792f7a0ba..c8fcbfc464 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 @@ -94,6 +94,9 @@ 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>public interface <B>CDOConflictResolver2</B> @@ -101,8 +104,9 @@ Interface CDOConflictResolver2</H2> </DL> <map id="APIVIZ" name="APIVIZ"> -<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"/> +<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"/> </map> <CENTER><IMG SRC="CDOConflictResolver2.png" USEMAP="#APIVIZ" BORDER="0"></CENTER> |