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/DefaultCDOMerger.PerFeature.ManyValued.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html185
1 files changed, 139 insertions, 46 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html
index 53204064c1..f79e5cf7d0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html
@@ -56,7 +56,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html" title="class in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="DefaultCDOMerger.PerFeature.ManyValued.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -76,7 +76,7 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
@@ -134,6 +134,30 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
<B>Nested Class Summary</B></FONT></TH>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Element</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A virtual list element to establish unique relations between ancestor, source and target sides.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.PerSide</A>&lt;<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="type parameter in DefaultCDOMerger.PerFeature.ManyValued.PerSide">T</A>&gt;</B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Holds data for the source and target sides.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="nested_classes_inherited_from_class_org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -151,7 +175,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left"><B>Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndTargetConflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndTargetConflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A></CODE></TD>
</TR>
</TABLE>
&nbsp;
@@ -180,6 +204,12 @@ If the meaning of this type isn't clear, there really should be more of a descri
<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#DefaultCDOMerger.PerFeature.ManyValued(org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference)">DefaultCDOMerger.PerFeature.ManyValued</A></B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A>&nbsp;resolutionPreference)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
</TABLE>
&nbsp;
<!-- ========== METHOD SUMMARY =========== -->
@@ -197,7 +227,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
int&nbsp;index)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -207,7 +237,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
int&nbsp;newPosition)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -216,7 +246,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
int&nbsp;index)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -234,7 +264,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#createResult(org.eclipse.emf.ecore.EStructuralFeature)">createResult</A></B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</A>&nbsp;feature)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -244,7 +274,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -254,8 +284,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Decides whether an ADD delta is to be taken (added to the result list) and returns <code>true</code> if it was
- taken, <code>false</code> otherwise.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -265,8 +294,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Decides whether a MOVE delta is to be taken (added to the result list) and returns <code>true</code> if it was
- taken, <code>false</code> otherwise.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -276,8 +304,23 @@ If the meaning of this type isn't clear, there really should be more of a descri
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Decides whether a REMOVE delta is to be taken (added to the result list) and returns <code>true</code> if it
- was taken, <code>false</code> otherwise.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected static&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#other(org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side)">other</A></B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</A>&nbsp;side)</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>protected &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#treatAsUnique(org.eclipse.emf.ecore.EStructuralFeature)">treatAsUnique</A></B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</A>&nbsp;feature)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature"><!-- --></A>
@@ -295,7 +338,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left"><B>Methods inherited from class org.eclipse.emf.spi.cdo.<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInSource(org.eclipse.emf.cdo.common.revision.CDORevision)">addedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInSourceAndTarget(org.eclipse.emf.cdo.common.revision.CDORevision, org.eclipse.emf.cdo.common.revision.CDORevision)">addedInSourceAndTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInTarget(org.eclipse.emf.cdo.common.revision.CDORevision)">addedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSource(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSourceAndDetachedInTarget(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInSourceAndDetachedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInTarget(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInTargetAndDetachedInSource(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInTargetAndDetachedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInSource(org.eclipse.emf.cdo.common.id.CDOID)">detachedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInSourceAndTarget(org.eclipse.emf.cdo.common.id.CDOID)">detachedInSourceAndTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInTarget(org.eclipse.emf.cdo.common.id.CDOID)">detachedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getConflicts()">getConflicts</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResult()">getResult</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getSourceMap()">getSourceMap</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getTargetMap()">getTargetMap</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge(org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)">merge</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge(java.lang.Object, java.lang.Object)">merge</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInSource(org.eclipse.emf.cdo.common.revision.CDORevision)">addedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInSourceAndTarget(org.eclipse.emf.cdo.common.revision.CDORevision, org.eclipse.emf.cdo.common.revision.CDORevision)">addedInSourceAndTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInTarget(org.eclipse.emf.cdo.common.revision.CDORevision)">addedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSource(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSourceAndDetachedInTarget(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInSourceAndDetachedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInTarget(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInTargetAndDetachedInSource(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">changedInTargetAndDetachedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInSource(org.eclipse.emf.cdo.common.id.CDOID)">detachedInSource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInSourceAndTarget(org.eclipse.emf.cdo.common.id.CDOID)">detachedInSourceAndTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInTarget(org.eclipse.emf.cdo.common.id.CDOID)">detachedInTarget</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getConflicts()">getConflicts</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResolutionPreference()">getResolutionPreference</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResult()">getResult</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getSourceMap()">getSourceMap</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getTargetMap()">getTargetMap</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge(org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)">merge</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge(java.lang.Object, java.lang.Object)">merge</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
@@ -326,6 +369,18 @@ DefaultCDOMerger.PerFeature.ManyValued</H3>
public <B>DefaultCDOMerger.PerFeature.ManyValued</B>()</PRE>
<DL>
</DL>
+<HR>
+
+<A NAME="DefaultCDOMerger.PerFeature.ManyValued(org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference)"><!-- --></A><H3>
+DefaultCDOMerger.PerFeature.ManyValued</H3>
+<PRE>
+public <B>DefaultCDOMerger.PerFeature.ManyValued</B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</A>&nbsp;resolutionPreference)</PRE>
+<DL>
+<DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DL>
<!-- ============ METHOD DETAIL ========== -->
@@ -337,6 +392,19 @@ public <B>DefaultCDOMerger.PerFeature.ManyValued</B>()</PRE>
</TR>
</TABLE>
+<A NAME="treatAsUnique(org.eclipse.emf.ecore.EStructuralFeature)"><!-- --></A><H3>
+treatAsUnique</H3>
+<PRE>
+protected boolean <B>treatAsUnique</B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</A>&nbsp;feature)</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="changedInSourceAndTargetManyValued(org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta, org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta)"><!-- --></A><H3>
changedInSourceAndTargetManyValued</H3>
<PRE>
@@ -354,11 +422,27 @@ protected <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOF
</DL>
<HR>
+<A NAME="other(org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side)"><!-- --></A><H3>
+other</H3>
+<PRE>
+protected static <A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</A> <B>other</B>(<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</A>&nbsp;side)</PRE>
+<DL>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="createResult(org.eclipse.emf.ecore.EStructuralFeature)"><!-- --></A><H3>
createResult</H3>
<PRE>
-protected <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOListFeatureDelta</A> <B>createResult</B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</A>&nbsp;feature)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>protected <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOListFeatureDelta</A> <B>createResult</B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</A>&nbsp;feature)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;
+<P>
<DD><DL>
</DL>
</DD>
@@ -368,10 +452,13 @@ protected <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOL
<A NAME="handleListDelta(java.util.List, java.util.List, java.util.List)"><!-- --></A><H3>
handleListDelta</H3>
<PRE>
-protected void <B>handleListDelta</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
- <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToHandle,
- <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>protected void <B>handleListDelta</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
+ <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToHandle,
+ <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;
+<P>
<DD><DL>
</DL>
</DD>
@@ -381,13 +468,12 @@ protected void <B>handleListDelta</B>(<A HREF="http://download.oracle.com/javase
<A NAME="handleListDeltaAdd(java.util.List, org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta, java.util.List)"><!-- --></A><H3>
handleListDeltaAdd</H3>
<PRE>
-protected boolean <B>handleListDeltaAdd</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
- <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOAddFeatureDelta</A>&nbsp;addDelta,
- <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>protected boolean <B>handleListDeltaAdd</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOAddFeatureDelta</A>&nbsp;addDelta,
+ <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
<DL>
-<DD>Decides whether an ADD delta is to be taken (added to the result list) and returns <code>true</code> if it was
- taken, <code>false</code> otherwise. Note that the passed ADD delta has to be copied prior to adding it to the
- result list!
+<DD><B>Deprecated.</B>&nbsp;
<P>
<DD><DL>
</DL>
@@ -398,13 +484,12 @@ protected boolean <B>handleListDeltaAdd</B>(<A HREF="http://download.oracle.com/
<A NAME="handleListDeltaRemove(java.util.List, org.eclipse.emf.cdo.common.revision.delta.CDORemoveFeatureDelta, java.util.List)"><!-- --></A><H3>
handleListDeltaRemove</H3>
<PRE>
-protected boolean <B>handleListDeltaRemove</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
- <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORemoveFeatureDelta</A>&nbsp;removeDelta,
- <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>protected boolean <B>handleListDeltaRemove</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORemoveFeatureDelta</A>&nbsp;removeDelta,
+ <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
<DL>
-<DD>Decides whether a REMOVE delta is to be taken (added to the result list) and returns <code>true</code> if it
- was taken, <code>false</code> otherwise. Note that the passed REMOVE delta has to be copied prior to adding it
- to the result list!
+<DD><B>Deprecated.</B>&nbsp;
<P>
<DD><DL>
</DL>
@@ -415,13 +500,12 @@ protected boolean <B>handleListDeltaRemove</B>(<A HREF="http://download.oracle.c
<A NAME="handleListDeltaMove(java.util.List, org.eclipse.emf.cdo.common.revision.delta.CDOMoveFeatureDelta, java.util.List)"><!-- --></A><H3>
handleListDeltaMove</H3>
<PRE>
-protected boolean <B>handleListDeltaMove</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
- <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOMoveFeatureDelta</A>&nbsp;moveDelta,
- <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>protected boolean <B>handleListDeltaMove</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;resultList,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOMoveFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOMoveFeatureDelta</A>&nbsp;moveDelta,
+ <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;listToAdjust)</PRE>
<DL>
-<DD>Decides whether a MOVE delta is to be taken (added to the result list) and returns <code>true</code> if it was
- taken, <code>false</code> otherwise. Note that the passed MOVE delta has to be copied prior to adding it to the
- result list!
+<DD><B>Deprecated.</B>&nbsp;
<P>
<DD><DL>
</DL>
@@ -432,9 +516,12 @@ protected boolean <B>handleListDeltaMove</B>(<A HREF="http://download.oracle.com
<A NAME="adjustAfterAddition(java.util.List, int)"><!-- --></A><H3>
adjustAfterAddition</H3>
<PRE>
-public static void <B>adjustAfterAddition</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;list,
- int&nbsp;index)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>public static void <B>adjustAfterAddition</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;list,
+ int&nbsp;index)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;
+<P>
<DD><DL>
</DL>
</DD>
@@ -444,9 +531,12 @@ public static void <B>adjustAfterAddition</B>(<A HREF="http://download.oracle.co
<A NAME="adjustAfterRemoval(java.util.List, int)"><!-- --></A><H3>
adjustAfterRemoval</H3>
<PRE>
-public static void <B>adjustAfterRemoval</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;list,
- int&nbsp;index)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>public static void <B>adjustAfterRemoval</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;list,
+ int&nbsp;index)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;
+<P>
<DD><DL>
</DL>
</DD>
@@ -456,10 +546,13 @@ public static void <B>adjustAfterRemoval</B>(<A HREF="http://download.oracle.com
<A NAME="adjustAfterMove(java.util.List, int, int)"><!-- --></A><H3>
adjustAfterMove</H3>
<PRE>
-public static void <B>adjustAfterMove</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;list,
- int&nbsp;oldPosition,
- int&nbsp;newPosition)</PRE>
+<FONT SIZE="-1"><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</A>
+</FONT>public static void <B>adjustAfterMove</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</A>&gt;&nbsp;list,
+ int&nbsp;oldPosition,
+ int&nbsp;newPosition)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;
+<P>
<DD><DL>
</DL>
</DD>
@@ -495,7 +588,7 @@ public static void <B>adjustAfterMove</B>(<A HREF="http://download.oracle.com/ja
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html" title="class in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="DefaultCDOMerger.PerFeature.ManyValued.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -515,7 +608,7 @@ public static void <B>adjustAfterMove</B>(<A HREF="http://download.oracle.com/ja
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;<A HREF="#nested_classes_inherited_from_class_org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>

Back to the top