summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-02-25 11:41:49 (EST)
committerEike Stepper2008-02-25 11:41:49 (EST)
commit2583036dd2450ae5cfd62ea66ec8f7a4dd947e3e (patch)
treeb0095dde31b2d35088118d81eeb57c5fff789508
parent97434d704a5dc40a1f7631b37e9a9abc60e1110a (diff)
downloadcdo-2583036dd2450ae5cfd62ea66ec8f7a4dd947e3e.zip
cdo-2583036dd2450ae5cfd62ea66ec8f7a4dd947e3e.tar.gz
cdo-2583036dd2450ae5cfd62ea66ec8f7a4dd947e3e.tar.bz2
[217117] Develop a HibernateStore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=217117
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java45
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java4
11 files changed, 44 insertions, 82 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java
index ecd9732..ea8a5da 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassServerInfo.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.db;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.server.db.IClassMapping;
@@ -34,7 +35,7 @@ public final class ClassServerInfo extends ServerInfo
public static ClassServerInfo setDBID(CDOClass cdoClass, int id)
{
ClassServerInfo serverInfo = new ClassServerInfo(id);
- cdoClass.setServerInfo(serverInfo);
+ ((InternalCDOClass)cdoClass).setServerInfo(serverInfo);
return serverInfo;
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java
index 89c20af..18f0a04 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java
@@ -11,9 +11,9 @@
package org.eclipse.emf.cdo.server.internal.db;
import org.eclipse.emf.cdo.internal.protocol.id.CDOIDMetaImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
import org.eclipse.emf.cdo.protocol.id.CDOID;
import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
@@ -97,8 +97,8 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
Object[] values = DBUtil.select(getConnection(), where, CDODBSchema.PACKAGES_ID, CDODBSchema.PACKAGES_NAME,
CDODBSchema.PACKAGES_ECORE);
PackageServerInfo.setDBID(cdoPackage, (Integer)values[0]);
- ((CDOPackageImpl)cdoPackage).setName((String)values[1]);
- ((CDOPackageImpl)cdoPackage).setEcore((String)values[2]);
+ ((InternalCDOPackage)cdoPackage).setName((String)values[1]);
+ ((InternalCDOPackage)cdoPackage).setEcore((String)values[2]);
readClasses(cdoPackage);
mapPackages(cdoPackage);
}
@@ -115,7 +115,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
boolean isAbstract = getBoolean(values[3]);
CDOClass cdoClass = CDOModelUtil.createClass(cdoPackage, classifierID, name, isAbstract);
ClassServerInfo.setDBID(cdoClass, classID);
- ((CDOPackageImpl)cdoPackage).addClass(cdoClass);
+ ((InternalCDOPackage)cdoPackage).addClass(cdoClass);
readSuperTypes(cdoClass, classID);
readFeatures(cdoClass, classID);
return true;
@@ -135,7 +135,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
{
String packageURI = (String)values[0];
int classifierID = (Integer)values[1];
- ((CDOClassImpl)cdoClass).addSuperType(CDOModelUtil.createClassRef(packageURI, classifierID));
+ ((InternalCDOClass)cdoClass).addSuperType(CDOModelUtil.createClassRef(packageURI, classifierID));
return true;
}
};
@@ -172,7 +172,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
}
FeatureServerInfo.setDBID(feature, (Integer)values[0]);
- ((CDOClassImpl)cdoClass).addFeature(feature);
+ ((InternalCDOClass)cdoClass).addFeature(feature);
return true;
}
};
@@ -227,7 +227,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
}
IRevisionManager revisionManager = getStore().getRepository().getRevisionManager();
- CDOClassImpl cdoClass = getObjectType(id);
+ CDOClass cdoClass = getObjectType(id);
InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id);
IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
@@ -244,7 +244,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
}
IRevisionManager revisionManager = getStore().getRepository().getRevisionManager();
- CDOClassImpl cdoClass = getObjectType(id);
+ CDOClass cdoClass = getObjectType(id);
InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id);
IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
@@ -261,7 +261,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
}
IRevisionManager revisionManager = getStore().getRepository().getRevisionManager();
- CDOClassImpl cdoClass = getObjectType(id);
+ CDOClass cdoClass = getObjectType(id);
InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id);
IMappingStrategy mappingStrategy = getStore().getMappingStrategy();
@@ -282,11 +282,11 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader
return mappingStrategy.readResourcePath(this, id);
}
- protected CDOClassImpl getObjectType(CDOID id)
+ protected CDOClass getObjectType(CDOID id)
{
IRepository repository = getStore().getRepository();
IPackageManager packageManager = repository.getPackageManager();
CDOClassRef type = readObjectType(id);
- return (CDOClassImpl)type.resolve(packageManager);
+ return type.resolve(packageManager);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
index b9d6789..9918069 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.db;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
import org.eclipse.emf.cdo.protocol.id.CDOIDMeta;
import org.eclipse.emf.cdo.protocol.id.CDOIDMetaRange;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
@@ -139,7 +139,7 @@ public class DBStoreWriter extends DBStoreReader implements IDBStoreWriter
}
@Override
- protected void writeClass(CDOClassImpl cdoClass)
+ protected void writeClass(InternalCDOClass cdoClass)
{
int id = getStore().getNextClassID();
ClassServerInfo.setDBID(cdoClass, id);
@@ -156,7 +156,7 @@ public class DBStoreWriter extends DBStoreReader implements IDBStoreWriter
}
@Override
- protected void writeSuperType(CDOClassImpl type, CDOClassProxy superType)
+ protected void writeSuperType(InternalCDOClass type, CDOClassProxy superType)
{
int id = ClassServerInfo.getDBID(type);
String packageURI = superType.getPackageURI();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
index 156abda..c4a9fcc 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
@@ -10,20 +10,14 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.db;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOFeature;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
-import org.eclipse.net4j.db.ddl.IDBField;
-
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @author Eike Stepper
*/
public final class FeatureServerInfo extends ServerInfo
{
- private Map<Object, IDBField> fields;
-
private FeatureServerInfo(int id)
{
super(id);
@@ -32,42 +26,7 @@ public final class FeatureServerInfo extends ServerInfo
public static FeatureServerInfo setDBID(CDOFeature cdoFeature, int id)
{
FeatureServerInfo serverInfo = new FeatureServerInfo(id);
- cdoFeature.setServerInfo(serverInfo);
+ ((InternalCDOFeature)cdoFeature).setServerInfo(serverInfo);
return serverInfo;
}
-
- @Deprecated
- public IDBField getField(Object context)
- {
- return fields == null ? null : fields.get(context);
- }
-
- @Deprecated
- public void addField(Object context, IDBField field)
- {
- if (fields == null)
- {
- fields = new HashMap<Object, IDBField>();
- }
- else
- {
- if (fields.containsKey(context))
- {
- throw new IllegalStateException("Field " + field + " is already added for context " + context);
- }
- }
-
- fields.put(context, field);
- }
-
- @Deprecated
- public IDBField removeField(Object context)
- {
- if (fields == null)
- {
- return null;
- }
-
- return fields.remove(context);
- }
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java
index 5ebc96e..73f0421 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/PackageServerInfo.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.db;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.net4j.db.ddl.IDBSchema;
@@ -29,7 +30,7 @@ public final class PackageServerInfo extends ServerInfo
public static PackageServerInfo setDBID(CDOPackage cdoPackage, int id)
{
PackageServerInfo serverInfo = new PackageServerInfo(id);
- cdoPackage.setServerInfo(serverInfo);
+ ((InternalCDOPackage)cdoPackage).setServerInfo(serverInfo);
return serverInfo;
}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
index 6a9322a..384a273 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernatePackageHandler.java
@@ -11,9 +11,9 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.hibernate;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOFeatureImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOFeature;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
@@ -177,28 +177,29 @@ public class HibernatePackageHandler
Session session = getSessionFactory().openSession();
try
{
- Criteria criteria = session.createCriteria(CDOPackageImpl.class);
+ Criteria criteria = session.createCriteria(CDOPackage.class);
List<?> list = criteria.list();
TRACER.trace("Found " + list.size() + " CDOPackages in DB");
for (Object object : list)
{
- CDOPackageImpl cdoPackage = (CDOPackageImpl)object;
+ CDOPackage cdoPackage = (CDOPackage)object;
TRACER.trace("Read CDOPackage: " + cdoPackage.getName());
result.add(new CDOPackageInfo(cdoPackage.getPackageURI(), cdoPackage.isDynamic(), null));
- cdoPackage.setPackageManager(hibernateStore.getRepository().getPackageManager());
+ ((InternalCDOPackage)cdoPackage).setPackageManager(hibernateStore.getRepository().getPackageManager());
resultPackages.add(cdoPackage);
// repair something
// TODO: set this in the mapping with a bi-directional relation
for (CDOClass cdoClass : cdoPackage.getClasses())
{
- ((CDOClassImpl)cdoClass).setContainingPackage(cdoPackage);
+ ((InternalCDOClass)cdoClass).setContainingPackage(cdoPackage);
for (CDOFeature cdoFeature : cdoClass.getFeatures())
{
- ((CDOFeatureImpl)cdoFeature).setContainingClass(cdoClass);
+ ((InternalCDOFeature)cdoFeature).setContainingClass(cdoClass);
}
}
}
+
cdoPackages = resultPackages;
cdoPackageInfos = result;
}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java
index 863a368..d0803e4 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStoreWriter.java
@@ -11,8 +11,8 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.hibernate;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.emf.cdo.protocol.revision.CDORevision;
@@ -93,7 +93,7 @@ public class HibernateStoreWriter extends HibernateStoreReader implements IHiber
}
@Override
- protected void writeClass(CDOClassImpl cdoClass)
+ protected void writeClass(InternalCDOClass cdoClass)
{
throw new UnsupportedOperationException("Should not be called, should be handled by hibernate cascade");
}
@@ -147,7 +147,7 @@ public class HibernateStoreWriter extends HibernateStoreReader implements IHiber
}
@Override
- protected void writeSuperType(CDOClassImpl type, CDOClassProxy superType)
+ protected void writeSuperType(InternalCDOClass type, CDOClassProxy superType)
{
throw new UnsupportedOperationException("Should not be called, should be handled by hibernate cascade");
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java
index 3fac8c8..6de591d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java
@@ -10,10 +10,10 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
import org.eclipse.emf.cdo.protocol.model.CDOModelUtil;
+import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo;
import org.eclipse.emf.cdo.server.IPackageManager;
import org.eclipse.emf.cdo.server.IStoreReader;
@@ -44,7 +44,7 @@ public class PackageManager extends CDOPackageManagerImpl implements IPackageMan
}
@Override
- protected void resolve(CDOPackageImpl cdoPackage)
+ protected void resolve(CDOPackage cdoPackage)
{
if (!cdoPackage.isSystem())
{
@@ -54,7 +54,7 @@ public class PackageManager extends CDOPackageManagerImpl implements IPackageMan
}
@Override
- protected String provideEcore(CDOPackageImpl cdoPackage)
+ protected String provideEcore(CDOPackage cdoPackage)
{
// No generated model on server side
return null;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
index e61a8cc..fab0677 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
@@ -12,11 +12,11 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionResolverImpl;
import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
import org.eclipse.emf.cdo.protocol.id.CDOID;
import org.eclipse.emf.cdo.protocol.id.CDOIDObjectFactory;
+import org.eclipse.emf.cdo.protocol.model.CDOClass;
import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.emf.cdo.protocol.model.resource.CDOPathFeature;
import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy;
@@ -98,7 +98,7 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
protected void ensureChunks(InternalCDORevision revision, int referenceChunk, IStoreReader storeReader)
{
- CDOClassImpl cdoClass = (CDOClassImpl)revision.getCDOClass();
+ CDOClass cdoClass = revision.getCDOClass();
CDOFeature[] features = cdoClass.getAllFeatures();
for (int i = 0; i < features.length; i++)
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java
index f3768fe..fa9405d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreAccessor.java
@@ -11,8 +11,8 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOClass;
import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.protocol.id.CDOID;
@@ -163,11 +163,11 @@ public class StoreAccessor implements IStoreAccessor
{
for (CDOClass cdoClass : cdoPackage.getClasses())
{
- writeClass((CDOClassImpl)cdoClass);
+ writeClass((InternalCDOClass)cdoClass);
}
}
- protected void writeClass(CDOClassImpl cdoClass)
+ protected void writeClass(InternalCDOClass cdoClass)
{
for (CDOClassProxy superType : cdoClass.getSuperTypeProxies())
{
@@ -180,7 +180,7 @@ public class StoreAccessor implements IStoreAccessor
}
}
- protected void writeSuperType(CDOClassImpl type, CDOClassProxy superType)
+ protected void writeSuperType(InternalCDOClass type, CDOClassProxy superType)
{
throw new UnsupportedOperationException();
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
index bf956f2..de1e835 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Transaction.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
+import org.eclipse.emf.cdo.internal.protocol.model.InternalCDOPackage;
import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision;
import org.eclipse.emf.cdo.internal.protocol.revision.delta.InternalCDORevisionDelta;
import org.eclipse.emf.cdo.internal.server.bundle.OM;
@@ -253,7 +253,7 @@ public class Transaction extends View implements ITransaction, IStoreWriter.Comm
}
CDOIDMetaRange newRange = repository.getMetaIDRange(oldRange.size());
- ((CDOPackageImpl)newPackage).setMetaIDRange(newRange);
+ ((InternalCDOPackage)newPackage).setMetaIDRange(newRange);
for (int l = 0; l < oldRange.size(); l++)
{
CDOIDTemp oldID = (CDOIDTemp)oldRange.get(l);