summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-25 09:06:34 (EDT)
committerEike Stepper2007-09-25 09:06:34 (EDT)
commit3df43a765bfacfadbf4ea9ce3870d5c5f8f8f452 (patch)
tree9c6c5ade33d1970d71757ceb1a9ff6455a76c46d
parent380d1701fa60ef28306f890ca3bd223ce8d7924a (diff)
downloadcdo-3df43a765bfacfadbf4ea9ce3870d5c5f8f8f452.zip
cdo-3df43a765bfacfadbf4ea9ce3870d5c5f8f8f452.tar.gz
cdo-3df43a765bfacfadbf4ea9ce3870d5c5f8f8f452.tar.bz2
[204535] Missing CDO Mixins cause errors
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204535
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index a3d9f19..8fa86fb 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.internal.cdo.CDOAdapterImpl;
-import org.eclipse.emf.internal.cdo.CDOCallbackImpl;
import org.eclipse.emf.internal.cdo.CDOMetaImpl;
import org.eclipse.emf.internal.cdo.CDOViewImpl;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
@@ -118,7 +117,8 @@ public final class FSMUtil
if (object instanceof org.eclipse.emf.ecore.impl.CDOAware)
{
org.eclipse.emf.ecore.impl.CDOAware aware = (org.eclipse.emf.ecore.impl.CDOAware)object;
- CDOCallbackImpl callback = (CDOCallbackImpl)aware.getCDOCallback();
+ org.eclipse.emf.internal.cdo.CDOCallbackImpl callback = (org.eclipse.emf.internal.cdo.CDOCallbackImpl)aware
+ .getCDOCallback();
if (callback == null)
{
InternalEObject instance = (InternalEObject)aware;
@@ -127,7 +127,7 @@ public final class FSMUtil
instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet());
}
- callback = new CDOCallbackImpl(instance);
+ callback = new org.eclipse.emf.internal.cdo.CDOCallbackImpl(instance);
aware.setCDOCallback(callback);
instance.eAdapters().add(callback);
}