summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-26 04:33:47 (EDT)
committerEike Stepper2007-08-26 04:33:47 (EDT)
commit455c2def06f652bfb40ba73cc8dcff2937b38842 (patch)
tree0e12b6f3daf234d0561f1e63a2ff2835f5bb2bd1
parentb53060a00f42e47eecd01b28c4bd2892958a0da5 (diff)
downloadcdo-455c2def06f652bfb40ba73cc8dcff2937b38842.zip
cdo-455c2def06f652bfb40ba73cc8dcff2937b38842.tar.gz
cdo-455c2def06f652bfb40ba73cc8dcff2937b38842.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java2
3 files changed, 15 insertions, 0 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 6376fb4..603c784 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
@@ -40,6 +40,11 @@ public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback
CDOStateMachine.INSTANCE.write(this);
}
+ // public Resource callbackResource(BasicEObjectImpl instance)
+ // {
+ // return cdoResource();
+ // }
+
@Override
public void notifyChanged(Notification msg)
{
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 a15fd00..a59306f 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
@@ -233,6 +233,10 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
if (instanceElement != null && feature.isReference())
{
instanceElement = view.convertObjectToID(instanceElement);
+ if (!(instanceValue instanceof CDOID))
+ {
+ System.out.println(instanceValue);
+ }
}
revisionList.add(instanceElement);
@@ -250,6 +254,10 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
if (instanceValue != null && feature.isReference())
{
instanceValue = view.convertObjectToID(instanceValue);
+ if (!(instanceValue instanceof CDOID))
+ {
+ System.out.println(instanceValue);
+ }
}
revision.setValue(feature, instanceValue);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
index 4049e78..b3953f7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
@@ -135,7 +135,9 @@ public final class ModelUtil
// Current problem with EcorePackage.eINSTANCE is mutual modification of
// certain Ecore features (see newsgroup thread "eGenericSuperTypes" and
// EMFUtil.getPersistentFeatures()
+
String ecore = EcorePackage.eINSTANCE.getNsURI().equals(packageURI) ? null : EMFUtil.ePackageToString(ePackage);
+ // String ecore = EMFUtil.ePackageToString(ePackage);
CDOIDRange idRange = packageManager.getSession().registerEPackage(ePackage);
CDOPackageImpl cdoPackage = new CDOPackageImpl(packageManager, packageURI, name, ecore, dynamic, idRange);