1 files changed, 6 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
index 5b0fb5559b..91722e5864 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/CDOFeatureAnalyzerModelBased.java
@@ -14,7 +14,8 @@ package org.eclipse.emf.internal.cdo.analyzer;
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.common.CDOFetchRule;
 import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.model.CDOFeature;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,16 +33,16 @@ public class CDOFeatureAnalyzerModelBased extends CDOAbstractFeatureRuleAnalyzer
   }
 
   @Override
-  public void doPreTraverseFeature(CDOObject cdoObject, CDOFeature feature, int index)
+  public void doPreTraverseFeature(CDOObject cdoObject, EStructuralFeature feature, int index)
   {
   }
 
   @Override
-  public void doPostTraverseFeature(CDOObject cdoObject, CDOFeature feature, int index, Object value)
+  public void doPostTraverseFeature(CDOObject cdoObject, EStructuralFeature feature, int index, Object value)
   {
     if (didFetch())
     {
-      featureInfos.activate(cdoObject.cdoClass(), feature);
+      featureInfos.activate(cdoObject.eClass(), feature);
     }
   }
 
@@ -54,7 +55,7 @@ public class CDOFeatureAnalyzerModelBased extends CDOAbstractFeatureRuleAnalyzer
   {
     fetchData();
     List<CDOFetchRule> rules = new ArrayList<CDOFetchRule>();
-    rules.addAll(featureInfos.getRules(lastTraverseCDOObject.cdoClass(), lastTraverseFeature));
+    rules.addAll(featureInfos.getRules(lastTraverseCDOObject.eClass(), lastTraverseFeature));
     return rules;
   }
 }