summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-03 14:17:31 (EDT)
committerEike Stepper2007-08-03 14:17:31 (EDT)
commitaf6347b5be80eb13aed6ff0289b0ae4d8b085449 (patch)
treee538bb831e2018eca421144097420b333e5c9e1e
parentf9ed2aa56f2c845c835278ae0a69588206c44b43 (diff)
downloadcdo-af6347b5be80eb13aed6ff0289b0ae4d8b085449.zip
cdo-af6347b5be80eb13aed6ff0289b0ae4d8b085449.tar.gz
cdo-af6347b5be80eb13aed6ff0289b0ae4d8b085449.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java15
3 files changed, 13 insertions, 7 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 f0566ef..6764143 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
@@ -39,6 +39,7 @@ public class CDOCallbackImpl extends CDOLegacyImpl implements CDOCallback
@Override
protected Object convertPotentialID(CDOViewImpl view, Object id)
{
- return view.getObject((CDOID)id, false);
+ InternalCDOObject object = view.getObject((CDOID)id, false);
+ return object.cdoInternalInstance();
}
}
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 172fa74..b66d0ea 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
@@ -155,7 +155,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
public void cdoInternalPostLoad()
{
transferRevisionToInstance();
- cdoInternalSetState(CDOState.CLEAN);
+ // cdoInternalSetState(CDOState.CLEAN);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index ecfbb4a..1b6ca13 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -258,6 +258,11 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
*/
private InternalCDOObject createMetaObject(CDOID id)
{
+ if (TRACER.isEnabled())
+ {
+ TRACER.trace("Creating meta object for " + id);
+ }
+
InternalEObject metaInstance = session.lookupMetaInstance(id);
if (metaInstance == null)
{
@@ -272,12 +277,12 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
*/
private InternalCDOObject createObject(CDOID id)
{
- CDORevisionImpl revision = getRevision(id);
if (TRACER.isEnabled())
{
- TRACER.trace("Creating object for revision: " + revision);
+ TRACER.trace("Creating object for " + id);
}
+ CDORevisionImpl revision = getRevision(id);
CDOClassImpl cdoClass = revision.getCDOClass();
InternalCDOObject object = newInstance(cdoClass);
if (object instanceof CDOResourceImpl)
@@ -298,17 +303,18 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
object.cdoInternalSetRevision(revision);
object.cdoInternalSetID(revision.getID());
object.cdoInternalSetState(CDOState.CLEAN);
+ object.cdoInternalPostLoad();
return object;
}
private InternalCDOObject createProxy(CDOID id)
{
- CDOClassImpl cdoClass = getObjectType(id);
if (TRACER.isEnabled())
{
- TRACER.format("Creating proxy for {0}: {1}" + id, cdoClass);
+ TRACER.format("Creating proxy for " + id);
}
+ CDOClassImpl cdoClass = getObjectType(id);
InternalCDOObject object = newInstance(cdoClass);
if (object instanceof CDOResourceImpl)
{
@@ -318,7 +324,6 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
object.cdoInternalSetView(this);
object.cdoInternalSetID(id);
object.cdoInternalSetState(CDOState.PROXY);
-
return object;
}