Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-02-15 07:46:50 -0500
committerEike Stepper2013-02-15 07:55:06 -0500
commit1e999f4825d41c2a3b43fb6291fb6416410376ad (patch)
tree620767c828e2c3dfba5694d6a194bf684f909357
parenta6b918d9b334e079b55cb833cd47e79457e8832b (diff)
downloadcdo-1e999f4825d41c2a3b43fb6291fb6416410376ad.tar.gz
cdo-1e999f4825d41c2a3b43fb6291fb6416410376ad.tar.xz
cdo-1e999f4825d41c2a3b43fb6291fb6416410376ad.zip
[400388] Integrate the new MinimalEStoreEObjectImpl
https://bugs.eclipse.org/bugs/show_bug.cgi?id=400388
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/DynamicCDOObjectImpl.java7
2 files changed, 1 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 3d5eaff79f..bfc90069d9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -526,7 +526,7 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC
}
@Override
- protected EClass eDynamicClass()
+ protected final EClass eDynamicClass()
{
EClass eClass = eClass();
if (eClass == eStaticClass())
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/DynamicCDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/DynamicCDOObjectImpl.java
index c8b3b17bcd..c3fbadbdd2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/DynamicCDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/DynamicCDOObjectImpl.java
@@ -27,13 +27,6 @@ public class DynamicCDOObjectImpl extends CDOObjectImpl
eSetClass(eClass);
}
- @Override
- protected EClass eDynamicClass()
- {
- // Bypass the eStaticClass() check in super.eDynamicClass()
- return eClass();
- }
-
/**
* @author Martin Fluegge
* @since 3.0

Back to the top