diff options
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java | 3 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java | 55 |
2 files changed, 27 insertions, 31 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java index da76a3a21d..19f675240d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java @@ -13,7 +13,6 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.CDOCallback; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.FSMUtil; @@ -23,7 +22,7 @@ import java.util.List; /** * @author Eike Stepper */ -public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback +public class CDOCallbackImpl extends CDOAdapterImpl // implements CDOCallback { public CDOCallbackImpl(InternalEObject instance) { 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 44eb1068a3..3493f895a4 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 @@ -20,15 +20,12 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.CDOAware; 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; -import org.eclipse.emf.internal.cdo.bundle.OM; import java.util.Collection; import java.util.Iterator; @@ -85,32 +82,32 @@ public final class FSMUtil } } - try - { - if (object instanceof CDOAware) - { - CDOAware aware = (CDOAware)object; - CDOCallbackImpl callback = (CDOCallbackImpl)aware.getCDOCallback(); - if (callback == null) - { - InternalEObject instance = (InternalEObject)aware; - if (instance.eIsProxy()) - { - instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet()); - } - - callback = new CDOCallbackImpl(instance); - aware.setCDOCallback(callback); - instance.eAdapters().add(callback); - } - - return callback; - } - } - catch (Throwable t) - { - OM.LOG.info(t); - } + // try + // { + // if (object instanceof CDOAware) + // { + // CDOAware aware = (CDOAware)object; + // CDOCallbackImpl callback = (CDOCallbackImpl)aware.getCDOCallback(); + // if (callback == null) + // { + // InternalEObject instance = (InternalEObject)aware; + // if (instance.eIsProxy()) + // { + // instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet()); + // } + // + // callback = new CDOCallbackImpl(instance); + // aware.setCDOCallback(callback); + // instance.eAdapters().add(callback); + // } + // + // return callback; + // } + // } + // catch (Throwable t) + // { + // OM.LOG.info(t); + // } if (object instanceof InternalEObject) { |