summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-03 16:22:14 (EDT)
committerEike Stepper2007-08-03 16:22:14 (EDT)
commit1a0589dfba069627ac7d77984fb11dc87f6cd902 (patch)
treecd7910d12aafcf039789e42cce6ad5c65fc7d067
parent18833dbb303c2d93a91c5782ff0884a716459b22 (diff)
downloadcdo-1a0589dfba069627ac7d77984fb11dc87f6cd902.zip
cdo-1a0589dfba069627ac7d77984fb11dc87f6cd902.tar.gz
cdo-1a0589dfba069627ac7d77984fb11dc87f6cd902.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java11
1 files changed, 2 insertions, 9 deletions
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 ae5677c..418d1fc 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
@@ -294,8 +294,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
else
{
int containingFeatureID = revision.getContainingFeatureID();
- // TODO Maybe convertPotentialID() better here?
- InternalCDOObject container = view.getObject(containerID);
+ InternalEObject container = convertPotentialID(view, containerID);
((BasicEObjectImpl)instance).eBasicSetContainer(container, containingFeatureID, null);
}
}
@@ -356,7 +355,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
return null;
}
- return convertID(view, id);
+ potentialID = view.getObject(id, false);
}
if (potentialID instanceof InternalCDOObject)
@@ -372,12 +371,6 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
throw new ImplementationError();
}
- protected InternalEObject convertID(CDOViewImpl view, CDOID id)
- {
- InternalCDOObject object = view.getObject(id, false);
- return object.cdoInternalInstance();
- }
-
protected Object getInstanceValue(InternalEObject instance, CDOFeatureImpl feature)
{
// Class<?> targetClass = target.getClass();