diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html index 48d3bb6449..d7c04bf92b 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html @@ -178,6 +178,14 @@ If the meaning of this type isn't clear, there really should be more of a descri <BR> If the meaning of this type isn't clear, there really should be more of a description here...</TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static class</CODE></FONT></TD> +<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A></B></CODE> + +<BR> + Enumerates the possible resolution preferences that can be used with a <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo"><CODE>DefaultCDOMerger</CODE></A>.</TD> +</TR> </TABLE> <A NAME="nested_classes_inherited_from_class_org.eclipse.emf.cdo.transaction.CDOMerger"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> @@ -204,6 +212,12 @@ If the meaning of this type isn't clear, there really should be more of a descri <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#DefaultCDOMerger(org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference)">DefaultCDOMerger</A></B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A> resolutionPreference)</CODE> + +<BR> + </TD> +</TR> </TABLE> <!-- ========== METHOD SUMMARY =========== --> @@ -314,6 +328,14 @@ If the meaning of this type isn't clear, there really should be more of a descri </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A></CODE></FONT></TD> +<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResolutionPreference()">getResolutionPreference</A></B>()</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</A></CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResult()">getResult</A></B>()</CODE> @@ -384,6 +406,18 @@ DefaultCDOMerger</H3> public <B>DefaultCDOMerger</B>()</PRE> <DL> </DL> +<HR> + +<A NAME="DefaultCDOMerger(org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference)"><!-- --></A><H3> +DefaultCDOMerger</H3> +<PRE> +public <B>DefaultCDOMerger</B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A> resolutionPreference)</PRE> +<DL> +<DL> +<DT><B>Since:</B></DT> + <DD>4.2</DD> +</DL> +</DL> <!-- ============ METHOD DETAIL ========== --> @@ -395,6 +429,22 @@ public <B>DefaultCDOMerger</B>()</PRE> </TR> </TABLE> +<A NAME="getResolutionPreference()"><!-- --></A><H3> +getResolutionPreference</H3> +<PRE> +public final <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A> <B>getResolutionPreference</B>()</PRE> +<DL> +<DD><DL> +</DL> +</DD> +<DD><DL> +<DT><B>Since:</B></DT> + <DD>4.2</DD> +</DL> +</DD> +</DL> +<HR> + <A NAME="getResult()"><!-- --></A><H3> getResult</H3> <PRE> |