summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-02-02 03:16:58 (EST)
committerEike Stepper2008-02-02 03:16:58 (EST)
commite4bd8b54e23068e6bbd2a48aeaf86561c280021a (patch)
tree765be4667957fbc7af325e276bdca80ffe6e3acc
parent25816af54d97d5c24bec1476fc934d2ce453b818 (diff)
downloadcdo-e4bd8b54e23068e6bbd2a48aeaf86561c280021a.zip
cdo-e4bd8b54e23068e6bbd2a48aeaf86561c280021a.tar.gz
cdo-e4bd8b54e23068e6bbd2a48aeaf86561c280021a.tar.bz2
[217117] Develop a HibernateStore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=217117
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java5
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java
index 6e2e71d..0624aa6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.java
@@ -39,6 +39,9 @@ public class CDOResourceFactoryImpl implements Resource.Factory, CDOResourceFact
return resource;
}
+ /**
+ * TODO Add TCs to ensure that Ecore internally doesn't change the way the stack is used!!!
+ */
private boolean isExistingResource()
{
boolean inResourceSet = false;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index cad14e1..f81815c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.net4j.util.WrappedException;
import org.eclipse.net4j.util.event.EventUtil;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.io.ExtendedDataInput;
import org.eclipse.net4j.util.lifecycle.ILifecycle;
import org.eclipse.emf.common.util.URI;
@@ -153,9 +154,9 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
return cdoidObjectFactory.getCDOIDObjectClasses();
}
- public CDOIDObject createCDOIDObject()
+ public CDOIDObject createCDOIDObject(ExtendedDataInput in)
{
- return cdoidObjectFactory.createCDOIDObject();
+ return cdoidObjectFactory.createCDOIDObject(in);
}
public boolean isDisableLegacyObjects()