diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
index 9663882194..354c577d9a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
@@ -137,12 +137,33 @@ Constructor for class org.eclipse.emf.cdo.server.db.mapping.AbstractTypeMappingFactory - Class in org.eclipse.emf.cdo.server.db.mapping
One in a sequence of possibly several points in time of a transaction that encapsulates the
changes to transactional objects and that later changes can be rolled back to.
An unchecked exception that can thrown from a commit operation that is based on stale information
+ about the tree structure of the model and would introduce a containment cycle.
Creates a Hibernate mapping provider from the given element of the cdo-server.xml configuration
@@ -3864,7 +3921,7 @@ Static method in class org.eclipse.emf.cdo.util.createResult(EStructuralFeature) -
Method in class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued
-
@@ -4102,6 +4159,9 @@ Method in class org.eclipse.emf.cdo.spi.server.createXATransaction(Notifier...) -
Static method in class org.eclipse.emf.cdo.util.CDOUtil
@@ -5666,6 +5747,9 @@ Static method in class org.eclipse.emf.cdo.spi.common.branch.getAncestor() -
Method in class org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData
Sets the data of this message as an extended output stream.
@@ -9834,6 +9924,9 @@ Method in class org.eclipse.emf.cdo.transfer.getResolution() -
Method in class org.eclipse.emf.cdo.transfer.ui.swt.TransferDetailsComposite
Returns the maximum number of CDOIDs to be loaded for collections when the owning object is already loaded but the
@@ -11013,6 +11106,9 @@ Method in class org.eclipse.emf.cdo.spi.server.getTimeStamp() -
Method in class org.eclipse.emf.cdo.spi.server.DurableLockArea
The Net4j factory product group for type mappings
@@ -14787,6 +14892,9 @@ Static variable in interface org.eclipse.emf.cdo.spi.workspace.PRODUCT_GROUP -
Static variable in class org.eclipse.emf.cdo.transfer.spi.ui.TransferUIProvider.Factory
@@ -15524,6 +15632,9 @@ Static variable in class org.eclipse.emf.cdo.transfer.ui.swt.RED -
Static variable in class org.eclipse.emf.cdo.transfer.ui.TransferLabelProvider
+
REFERENCES -
+Static variable in class org.eclipse.emf.cdo.common.model.EMFUtil
+
@@ -16575,6 +16686,9 @@ Method in class org.eclipse.emf.cdo.spi.common.revision.set(T...) -
Static method in class org.eclipse.emf.cdo.spi.server.Store
@@ -18569,6 +18692,9 @@ Method in class org.eclipse.emf.cdo.spi.common.revision.toString() -
Method in class org.eclipse.emf.cdo.spi.common.revision.PointerCDORevision
Returns an array containing the constants of this enum type, in
@@ -19257,6 +19398,14 @@ the order they are declared.
Static method in enum org.eclipse.emf.cdo.ui.ide.Node.Type
Returns an array containing the constants of this enum type, in
the order they are declared.
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html
index 1f06637fed..83fb9788c9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/EMFUtil.html
@@ -149,6 +149,14 @@ Various static helper methods for dealing with EMF meta models.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionData.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionData.html
index 4cb232d5af..dfd22b4163 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionData.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionData.html
@@ -154,6 +154,23 @@ Encapsulates the modeled information and the EMF system values of a
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOAddFeatureDelta.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOAddFeatureDelta.html
index b4765c9345..9e31ee9688 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOAddFeatureDelta.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOAddFeatureDelta.html
@@ -184,8 +184,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether an ADD delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOFeatureDelta.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOFeatureDelta.html
index e7e73df4c7..9458f6a8c9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOFeatureDelta.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDOFeatureDelta.html
@@ -385,6 +385,15 @@ Uses of addFeatureDelta(CDOFeatureDelta delta)
+
+ Deprecated.As of 4.2 use InternalCDORevisionDelta.addFeatureDelta(CDOFeatureDelta, CDOOriginSizeProvider).
@@ -682,8 +691,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether an ADD delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
@@ -693,8 +701,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether an ADD delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
@@ -704,8 +711,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether a MOVE delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
@@ -715,8 +721,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether a MOVE delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
@@ -726,8 +731,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether a REMOVE delta is to be taken (added to the result list) and returns true if it
- was taken, false otherwise.
+ Deprecated.
@@ -737,8 +741,7 @@ Uses of List<CDOFeatureDelta> listToAdjust)
- Decides whether a REMOVE delta is to be taken (added to the result list) and returns true if it
- was taken, false otherwise.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html
index 76a984de8a..c23ea4d3c5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html
@@ -88,30 +88,31 @@ Common concepts for dealing with revisions and revision lists.
@@ -201,6 +202,10 @@ Common concepts for dealing with revisions and revision lists.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.png
index 9b82346e2a..0e40cbd011 100644
Binary files a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.png and b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.png differ
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-use.html
index 7e9e078442..39e06c28b5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-use.html
@@ -444,6 +444,12 @@ Classes in revision dumper that directs all output to a stream.
+
-An unchecked exception that is thrown from concurrent commit operations if cycles in the tree containmnent structure
- would result.
+An unchecked exception that can thrown from a commit operation that is based on stale information
+ about the tree structure of the model and would introduce a containment cycle.
+
+ This situation results from a network race condition and can not be prevented by write locks on
+ the changed objects. The committing client must rollback the transaction
+ , replay the original changes and try to commit again.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html
index 0926f77ea7..ddaca38fd7 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/IStoreAccessor.CommitContext.html
@@ -221,6 +221,14 @@ Represents the state of a single, logical commit operation which is driven throu
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html
index d856cc1fa9..6a177facba 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html
@@ -358,6 +358,14 @@ This is a default implementation for the IDBPreparedStatement using an appropriate setXxx
method.
FRAMES
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.html
index 810ae1d96d..f91754dc16 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/IMappingStrategy.html
@@ -133,6 +133,14 @@ The mapping strategy acts as a connection between the DBStore and the database m
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html
index 555ea58cc1..af0e652573 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html
@@ -88,22 +88,24 @@ Server concepts for dealing with mapping strategies and mappings for classes, li
@@ -181,6 +183,14 @@ Server concepts for dealing with mapping strategies and mappings for classes, li
IClassMapping
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html
index 554abee88d..f5ae082403 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html
@@ -423,8 +423,8 @@ Server concepts for dealing with repositories and stores.
An unchecked exception that is thrown from concurrent commit operations if cycles in the tree containmnent structure
- would result.
+
An unchecked exception that can thrown from a commit operation that is based on stale information
+ about the tree structure of the model and would introduce a containment cycle.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html
index 2c93d5f777..cc4c2872f6 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html
@@ -214,6 +214,23 @@ If the meaning of this type isn't clear, there really should be more of a descri
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html
index ce6793379b..e2dc3e1073 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html
@@ -239,6 +239,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
void
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html
index f24a8b039c..a02ee7c3fc 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html
@@ -199,6 +199,23 @@ If the meaning of this type isn't clear, there really should be more of a descri
add(EStructuralFeature feature,
int index,
Object value)
@@ -228,6 +245,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
void
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html
index 7086289c15..4a86439cbb 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html
@@ -270,7 +270,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.StubCDORevision
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListIndexAffecting.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListIndexAffecting.html
index 67d7703a16..7a3249417c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListIndexAffecting.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListIndexAffecting.html
@@ -112,6 +112,12 @@ If the meaning of this type isn't clear, there really should be more of a descri
+
+
No Implement
+
This interface is not intended to be implemented by clients.
+
No Extend
+
This interface is not intended to be extended by clients.
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListTargetAdding.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListTargetAdding.html
index e875aa402e..e68dd50b8e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListTargetAdding.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.ListTargetAdding.html
@@ -112,6 +112,12 @@ If the meaning of this type isn't clear, there really should be more of a descri
+
+
No Implement
+
This interface is not intended to be implemented by clients.
+
No Extend
+
This interface is not intended to be extended by clients.
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.WithIndex.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.WithIndex.html
index 9252178f21..18707632e2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.WithIndex.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.WithIndex.html
@@ -112,6 +112,12 @@ If the meaning of this type isn't clear, there really should be more of a descri
+
+
No Implement
+
This interface is not intended to be implemented by clients.
+
No Extend
+
This interface is not intended to be extended by clients.
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html
index 0b7a483bcd..703e643188 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html
@@ -210,6 +210,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
void
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html
index b5f30646c7..daae230320 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionDelta.html
@@ -167,6 +167,15 @@ If the meaning of this type isn't clear, there really should be more of a descri
void
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Detached.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Detached.html
index 284fe78f4d..8a66179983 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Detached.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Detached.html
@@ -218,7 +218,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.RevisionInfo
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Normal.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Normal.html
index f370476064..5e6349ce2b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Normal.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Normal.html
@@ -226,7 +226,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.RevisionInfo
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Pointer.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Pointer.html
index 4eb731f2f7..aea1983b7f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Pointer.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.Pointer.html
@@ -251,7 +251,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.RevisionInfo
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html
index 0d2632e631..335feaeba4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Available.html
@@ -270,7 +270,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.RevisionInfo
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Missing.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Missing.html
index fa920a496f..3ef9d5e05d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Missing.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.Missing.html
@@ -194,7 +194,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.RevisionInfo
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html
index 74b0e26544..0a47cd317c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/RevisionInfo.html
@@ -330,6 +330,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
void
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html
index 1ea9a140a5..092ead017d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html
@@ -233,6 +233,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
void
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html
index 3b9d09def7..f0141f0d23 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html
@@ -247,7 +247,7 @@ A synthetic revision that represents the initial period of an object in a Methods inherited from class org.eclipse.emf.cdo.spi.common.revision.StubCDORevision
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalCommitContext.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalCommitContext.html
index 46384f8be9..950611fbb6 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalCommitContext.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/server/InternalCommitContext.html
@@ -181,6 +181,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
InternalCDORevision[]
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
index a2d6bff7c2..0ba15725b8 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html
@@ -145,6 +145,12 @@ If the meaning of this type isn't clear, there really should be more of a descri
Returns an array containing the constants of this enum type, in
+the order they are declared. This method may be used to iterate
+over the constants as follows:
+
+for (DefaultCDOMerger.PerFeature.ManyValued.Side c : DefaultCDOMerger.PerFeature.ManyValued.Side.values())
+ System.out.println(c);
+
+
+
+
+
Returns:
an array containing the constants of this enum type, in
+the order they are declared
Returns the enum constant of this type with the specified name.
+The string must match exactly an identifier used to declare an
+enum constant in this type. (Extraneous whitespace characters are
+not permitted.)
+
+
+
Parameters:
name - the name of the enum constant to be returned.
+
@@ -244,7 +274,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
List<CDOFeatureDelta> listToAdjust)
-
+ Deprecated.
@@ -254,8 +284,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
List<CDOFeatureDelta> listToAdjust)
- Decides whether an ADD delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
@@ -265,8 +294,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
List<CDOFeatureDelta> listToAdjust)
- Decides whether a MOVE delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise.
+ Deprecated.
@@ -276,8 +304,23 @@ If the meaning of this type isn't clear, there really should be more of a descri
List<CDOFeatureDelta> listToAdjust)
- Decides whether a REMOVE delta is to be taken (added to the result list) and returns true if it
- was taken, false otherwise.
Decides whether an ADD delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise. Note that the passed ADD delta has to be copied prior to adding it to the
- result list!
+
Decides whether a REMOVE delta is to be taken (added to the result list) and returns true if it
- was taken, false otherwise. Note that the passed REMOVE delta has to be copied prior to adding it
- to the result list!
+
Decides whether a MOVE delta is to be taken (added to the result list) and returns true if it was
- taken, false otherwise. Note that the passed MOVE delta has to be copied prior to adding it to the
- result list!
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html
index cd4d6cf911..f02ab8bbac 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html
@@ -152,7 +152,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.DefaultCDOMerger
Returns an array containing the constants of this enum type, in
+the order they are declared. This method may be used to iterate
+over the constants as follows:
+
+for (DefaultCDOMerger.ResolutionPreference c : DefaultCDOMerger.ResolutionPreference.values())
+ System.out.println(c);
+
+
+
+
+
Returns:
an array containing the constants of this enum type, in
+the order they are declared
Returns the enum constant of this type with the specified name.
+The string must match exactly an identifier used to declare an
+enum constant in this type. (Extraneous whitespace characters are
+not permitted.)
+
+
+
Parameters:
name - the name of the enum constant to be returned.
+
+
+
+
+
+Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
+
+
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.png
new file mode 100644
index 0000000000..1f554de3ac
Binary files /dev/null and b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.png differ
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
If the meaning of this type isn't clear, there really should be more of a description here...
+
DefaultCDOMerger.PerFeature.ManyValued.Side.values()
+
+
+ Returns an array containing the constants of this enum type, in
+the order they are declared.
