Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-05-23 13:26:31 -0400
committerEike Stepper2009-05-23 13:26:31 -0400
commit1724469f6fb2c4addf24adc004f9c19c52ba17dc (patch)
tree76e275542d79140aa2ca3fffdf4f2eb26dd4ece5 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util
parent592760fd13f830be7e8b5be765bfc7febb26a933 (diff)
downloadcdo-1724469f6fb2c4addf24adc004f9c19c52ba17dc.tar.gz
cdo-1724469f6fb2c4addf24adc004f9c19c52ba17dc.tar.xz
cdo-1724469f6fb2c4addf24adc004f9c19c52ba17dc.zip
[249436] Support FeatureMap
https://bugs.eclipse.org/bugs/show_bug.cgi?id=249436
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java
index a9d1cd18ef..0a01fd97bb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/RevisionAdjuster.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta;
+import org.eclipse.emf.cdo.internal.common.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.internal.common.revision.delta.CDOFeatureDeltaVisitorImpl;
import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList;
@@ -66,6 +67,8 @@ public class RevisionAdjuster extends CDOFeatureDeltaVisitorImpl
public void visit(CDOSetFeatureDelta delta)
{
EStructuralFeature feature = delta.getFeature();
+ CDORevisionImpl.checkNoFeatureMap(feature);
+
Object value = delta.getValue();
if (value != null && feature instanceof EReference && !(value instanceof CDOElementProxy))
{
@@ -77,8 +80,9 @@ public class RevisionAdjuster extends CDOFeatureDeltaVisitorImpl
public void visit(CDOListFeatureDelta deltas)
{
EStructuralFeature feature = deltas.getFeature();
- InternalCDOList list = (InternalCDOList)revision.getValue(feature);
+ CDORevisionImpl.checkNoFeatureMap(feature);
+ InternalCDOList list = (InternalCDOList)revision.getValue(feature);
if (feature instanceof EReference)
{
int[] indices = ((CDOListFeatureDeltaImpl)deltas).reconstructAddedIndices().getElement2();

Back to the top