Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/compare/DelegatingComparison.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/compare/DelegatingComparison.html28
1 files changed, 14 insertions, 14 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/compare/DelegatingComparison.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/compare/DelegatingComparison.html
index a32ab764e8..aa4fbd03df 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/compare/DelegatingComparison.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/compare/DelegatingComparison.html
@@ -96,7 +96,7 @@ Class DelegatingComparison</H2>
<IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.emf.cdo.compare.DelegatingComparison</B>
</PRE>
<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../../org/eclipse/emf/cdo/compare/CDOCompareUtil.CDOComparison.html" title="class in org.eclipse.emf.cdo.compare">CDOCompareUtil.CDOComparison</A></DD>
+<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../../org/eclipse/emf/cdo/compare/CDOComparison.html" title="class in org.eclipse.emf.cdo.compare">CDOComparison</A></DD>
</DL>
<HR>
<DL>
@@ -105,8 +105,8 @@ Class DelegatingComparison</H2>
</DL>
<map id="APIVIZ" name="APIVIZ">
-<area shape="rect" id="node1" href="DelegatingComparison.html" title="DelegatingComparison" alt="" coords="40,6,192,31"/>
-<area shape="rect" id="node2" href="CDOCompareUtil.CDOComparison.html" title="CDOCompareUtil.CDOComparison" alt="" coords="5,71,227,97"/>
+<area shape="rect" id="node1" href="DelegatingComparison.html" title="DelegatingComparison" alt="" coords="5,6,157,31"/>
+<area shape="rect" id="node2" href="CDOComparison.html" title="CDOComparison" alt="" coords="22,71,140,97"/>
</map>
<CENTER><IMG SRC="DelegatingComparison.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
@@ -320,14 +320,6 @@ A <CODE>comparison</CODE> that delegates all methods to another comparison.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;EMFCompareConfiguration</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/compare/DelegatingComparison.html#getConfiguration()">getConfiguration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/common/util/EList.html?is-external=true" title="class or interface in org.eclipse.emf.common.util">EList</A>&lt;Conflict&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/compare/DelegatingComparison.html#getConflicts()">getConflicts</A></B>()</CODE>
@@ -360,6 +352,14 @@ A <CODE>comparison</CODE> that delegates all methods to another comparison.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;IEqualityHelper</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/compare/DelegatingComparison.html#getEqualityHelper()">getEqualityHelper</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/common/util/EList.html?is-external=true" title="class or interface in org.eclipse.emf.common.util">EList</A>&lt;Equivalence&gt;</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/compare/DelegatingComparison.html#getEquivalences()">getEquivalences</A></B>()</CODE>
@@ -597,10 +597,10 @@ public <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/e
</DL>
<HR>
-<A NAME="getConfiguration()"><!-- --></A><H3>
-getConfiguration</H3>
+<A NAME="getEqualityHelper()"><!-- --></A><H3>
+getEqualityHelper</H3>
<PRE>
-public EMFCompareConfiguration <B>getConfiguration</B>()</PRE>
+public IEqualityHelper <B>getEqualityHelper</B>()</PRE>
<DL>
<DD><DL>
</DL>

Back to the top