diff options
author | Eike Stepper | 2007-08-07 14:20:26 +0000 |
---|---|---|
committer | Eike Stepper | 2007-08-07 14:20:26 +0000 |
commit | f810d21170f08e12891046eea54d4728014be069 (patch) | |
tree | ae21e1575b31c79f027b4b454b1a95f30330127d | |
parent | a34b9db5af4b6e6a71f9a1b919fe8b983ad9a7bd (diff) | |
download | cdo-f810d21170f08e12891046eea54d4728014be069.tar.gz cdo-f810d21170f08e12891046eea54d4728014be069.tar.xz cdo-f810d21170f08e12891046eea54d4728014be069.zip |
*** empty log message ***
3 files changed, 12 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java index 277d6a5623..6d99c97a2e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java @@ -375,6 +375,11 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource if (legacy.cdoState() != CDOState.CLEAN) { CDOStateMachine.INSTANCE.attach(legacy, this, view); + // if (legacy.eContainer() == this) + // { + // legacy.eBasicSetContainer(null, 0, null); + // legacy.eSetResource(this, null); + // } } } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java index ed72c89e7b..dcb26c4b06 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java @@ -343,7 +343,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl } } - protected void transferResourceToInstance(Resource.Internal resource) + public void transferResourceToInstance(Resource.Internal resource) { Method method = ReflectUtil.getMethod(BasicEObjectImpl.class, "eSetDirectResource", Resource.Internal.class); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index e18bd45854..8b83034546 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -425,6 +425,12 @@ public final class CDOStore implements EStore } CDOStateMachine.INSTANCE.attach(contained, container.cdoResource(), containerView); + + // if (contained instanceof CDOLegacyImpl && container instanceof + // Resource.Internal) + // { + // ((CDOLegacyImpl)contained).transferResourceToInstance((Resource.Internal)container); + // } } } } |