diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db/src')
12 files changed, 62 insertions, 54 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java index 66b387a964..c1096e8a2e 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IAttributeMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.net4j.db.ddl.IDBField; @@ -23,7 +23,7 @@ public interface IAttributeMapping extends IFeatureMapping { public IDBField getField(); - public void appendValue(StringBuilder builder, CDORevisionImpl revision); + public void appendValue(StringBuilder builder, InternalCDORevision revision); - public void extractValue(ResultSet resultSet, int column, CDORevisionImpl revision); + public void extractValue(ResultSet resultSet, int column, InternalCDORevision revision); } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java index a2b8d764e1..876d895147 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IClassMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.protocol.model.CDOFeature; @@ -40,13 +40,13 @@ public interface IClassMapping public IReferenceMapping getReferenceMapping(CDOFeature feature); - public void writeRevision(IDBStoreWriter storeWriter, CDORevisionImpl revision); + public void writeRevision(IDBStoreWriter storeWriter, InternalCDORevision revision); - public void readRevision(IDBStoreReader storeReader, CDORevisionImpl revision, int referenceChunk); + public void readRevision(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk); - public void readRevisionByTime(IDBStoreReader storeReader, CDORevisionImpl revision, long timeStamp, + public void readRevisionByTime(IDBStoreReader storeReader, InternalCDORevision revision, long timeStamp, int referenceChunk); - public void readRevisionByVersion(IDBStoreReader storeReader, CDORevisionImpl revision, int version, + public void readRevisionByVersion(IDBStoreReader storeReader, InternalCDORevision revision, int version, int referenceChunk); } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java index 846ed51ceb..7ce71367ea 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IReferenceMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.server.IStoreChunkReader.Chunk; import org.eclipse.net4j.db.ddl.IDBTable; @@ -24,9 +24,9 @@ public interface IReferenceMapping extends IFeatureMapping { public IDBTable getTable(); - public void writeReference(IDBStoreWriter storeWriter, CDORevisionImpl revision); + public void writeReference(IDBStoreWriter storeWriter, InternalCDORevision revision); - public void readReference(IDBStoreReader storeReader, CDORevisionImpl revision, int referenceChunk); + public void readReference(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk); public void readChunks(IDBStoreChunkReader chunkReader, List<Chunk> chunks, String string); } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java index 9f6b4f2215..c3fc6a8ce0 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.server.internal.db; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.cdo.server.db.IAttributeMapping; @@ -40,20 +40,20 @@ public abstract class AttributeMapping extends FeatureMapping implements IAttrib return field; } - public void appendValue(StringBuilder builder, CDORevisionImpl revision) + public void appendValue(StringBuilder builder, InternalCDORevision revision) { IDBAdapter dbAdapter = getDBAdapter(); Object value = getRevisionValue(revision); dbAdapter.appendValue(builder, field, value); } - protected Object getRevisionValue(CDORevisionImpl revision) + protected Object getRevisionValue(InternalCDORevision revision) { CDOFeature feature = getFeature(); return revision.getValue(feature); } - public void extractValue(ResultSet resultSet, int column, CDORevisionImpl revision) + public void extractValue(ResultSet resultSet, int column, InternalCDORevision revision) { try { diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java index 32e452cf10..9dc8a4978d 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ClassMapping.java @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.server.internal.db; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.cdo.protocol.model.CDOType; @@ -138,7 +138,7 @@ public abstract class ClassMapping implements IClassMapping } } - protected void appendRevisionInfos(StringBuilder builder, CDORevisionImpl revision, boolean full) + protected void appendRevisionInfos(StringBuilder builder, InternalCDORevision revision, boolean full) { builder.append(revision.getID().getValue()); builder.append(", "); @@ -436,7 +436,7 @@ public abstract class ClassMapping implements IClassMapping protected abstract boolean hasFullRevisionInfo(); - public void writeRevision(IDBStoreWriter storeWriter, CDORevisionImpl revision) + public void writeRevision(IDBStoreWriter storeWriter, InternalCDORevision revision) { if (revision.getVersion() >= 2 && hasFullRevisionInfo()) { @@ -454,7 +454,7 @@ public abstract class ClassMapping implements IClassMapping } } - protected void writeRevisedRow(IDBStoreWriter storeWriter, CDORevisionImpl revision) + protected void writeRevisedRow(IDBStoreWriter storeWriter, InternalCDORevision revision) { StringBuilder builder = new StringBuilder(); builder.append("UPDATE "); @@ -474,7 +474,7 @@ public abstract class ClassMapping implements IClassMapping sqlUpdate(storeWriter, builder.toString()); } - protected void writeAttributes(IDBStoreWriter storeWriter, CDORevisionImpl revision) + protected void writeAttributes(IDBStoreWriter storeWriter, InternalCDORevision revision) { StringBuilder builder = new StringBuilder(); builder.append("INSERT INTO "); @@ -492,7 +492,7 @@ public abstract class ClassMapping implements IClassMapping sqlUpdate(storeWriter, builder.toString()); } - protected void writeReferences(IDBStoreWriter storeWriter, CDORevisionImpl revision) + protected void writeReferences(IDBStoreWriter storeWriter, InternalCDORevision revision) { for (IReferenceMapping referenceMapping : referenceMappings) { @@ -500,13 +500,13 @@ public abstract class ClassMapping implements IClassMapping } } - public void readRevision(IDBStoreReader storeReader, CDORevisionImpl revision, int referenceChunk) + public void readRevision(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk) { String where = CDODBSchema.ATTRIBUTES_REVISED + "=0"; readRevision(storeReader, revision, where, true, referenceChunk); } - public void readRevisionByTime(IDBStoreReader storeReader, CDORevisionImpl revision, long timeStamp, + public void readRevisionByTime(IDBStoreReader storeReader, InternalCDORevision revision, long timeStamp, int referenceChunk) { StringBuilder where = new StringBuilder(); @@ -523,15 +523,15 @@ public abstract class ClassMapping implements IClassMapping readRevision(storeReader, revision, where.toString(), true, referenceChunk); } - public void readRevisionByVersion(IDBStoreReader storeReader, CDORevisionImpl revision, int version, + public void readRevisionByVersion(IDBStoreReader storeReader, InternalCDORevision revision, int version, int referenceChunk) { String where = CDODBSchema.ATTRIBUTES_VERSION + "=" + version; readRevision(storeReader, revision, where, false, referenceChunk); } - protected void readRevision(IDBStoreReader storeReader, CDORevisionImpl revision, String where, boolean readVersion, - int referenceChunk) + protected void readRevision(IDBStoreReader storeReader, InternalCDORevision revision, String where, + boolean readVersion, int referenceChunk) { if (attributeMappings != null) { @@ -544,7 +544,8 @@ public abstract class ClassMapping implements IClassMapping } } - protected void readAttributes(IDBStoreReader storeReader, CDORevisionImpl revision, String where, boolean readVersion) + protected void readAttributes(IDBStoreReader storeReader, InternalCDORevision revision, String where, + boolean readVersion) { long id = revision.getID().getValue(); StringBuilder builder = new StringBuilder(readVersion ? selectPrefixWithVersion : selectPrefix); @@ -600,7 +601,7 @@ public abstract class ClassMapping implements IClassMapping } } - protected void readReferences(IDBStoreReader storeReader, CDORevisionImpl revision, int referenceChunk) + protected void readReferences(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk) { for (IReferenceMapping referenceMapping : referenceMappings) { 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 6798dc4578..f1cad8a1f8 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 @@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.internal.protocol.model.CDOClassRefImpl; 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.CDOTypeImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.CDOIDRange; import org.eclipse.emf.cdo.protocol.model.CDOClassRef; @@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; import org.eclipse.emf.cdo.protocol.model.CDOType; import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.cdo.protocol.revision.CDORevisionUtil; import org.eclipse.emf.cdo.server.IPackageManager; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.IRevisionManager; @@ -227,7 +228,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader IRevisionManager revisionManager = getStore().getRepository().getRevisionManager(); CDOClassImpl cdoClass = getObjectType(id); - CDORevisionImpl revision = new CDORevisionImpl(revisionManager, cdoClass, id); + InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id); IMappingStrategy mappingStrategy = getStore().getMappingStrategy(); IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass); @@ -244,7 +245,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader IRevisionManager revisionManager = getStore().getRepository().getRevisionManager(); CDOClassImpl cdoClass = getObjectType(id); - CDORevisionImpl revision = new CDORevisionImpl(revisionManager, cdoClass, id); + InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id); IMappingStrategy mappingStrategy = getStore().getMappingStrategy(); IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass); @@ -261,7 +262,7 @@ public class DBStoreReader extends DBStoreAccessor implements IDBStoreReader IRevisionManager revisionManager = getStore().getRepository().getRevisionManager(); CDOClassImpl cdoClass = getObjectType(id); - CDORevisionImpl revision = new CDORevisionImpl(revisionManager, cdoClass, id); + InternalCDORevision revision = (InternalCDORevision)CDORevisionUtil.create(revisionManager, cdoClass, id); IMappingStrategy mappingStrategy = getStore().getMappingStrategy(); IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass); 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 fa849c1d80..4d935bbccf 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 @@ -14,7 +14,7 @@ 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.CDOFeatureImpl; import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.CDOIDRange; import org.eclipse.emf.cdo.server.IView; import org.eclipse.emf.cdo.server.db.IClassMapping; @@ -162,14 +162,14 @@ public class DBStoreWriter extends DBStoreReader implements IDBStoreWriter type, packageURI, classifierID, many, containment, idx); } - public void writeRevision(CDORevisionImpl revision) + public void writeRevision(InternalCDORevision revision) { if (TRACER.isEnabled()) { TRACER.format("Inserting revision: {0}", revision); } - CDOClassImpl cdoClass = revision.getCDOClass(); + CDOClassImpl cdoClass = (CDOClassImpl)revision.getCDOClass(); IMappingStrategy mappingStrategy = getStore().getMappingStrategy(); IClassMapping mapping = mappingStrategy.getClassMapping(cdoClass); mapping.writeRevision(this, revision); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java index eac046b84d..d0afc74558 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalClassMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.internal.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.server.db.IDBStoreWriter; @@ -32,7 +32,7 @@ public class HorizontalClassMapping extends ClassMapping } @Override - public void writeRevision(IDBStoreWriter storeWriter, CDORevisionImpl revision) + public void writeRevision(IDBStoreWriter storeWriter, InternalCDORevision revision) { super.writeRevision(storeWriter, revision); if (revision.getVersion() == 1) diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java index 66042d42ba..b370dbec6d 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/NoClassMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.internal.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.cdo.server.db.IAttributeMapping; @@ -77,20 +77,20 @@ public class NoClassMapping implements IClassMapping return null; } - public void writeRevision(IDBStoreWriter storeWriter, CDORevisionImpl revision) + public void writeRevision(IDBStoreWriter storeWriter, InternalCDORevision revision) { } - public void readRevision(IDBStoreReader storeReader, CDORevisionImpl revision, int referenceChunk) + public void readRevision(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk) { } - public void readRevisionByTime(IDBStoreReader storeReader, CDORevisionImpl revision, long timeStamp, + public void readRevisionByTime(IDBStoreReader storeReader, InternalCDORevision revision, long timeStamp, int referenceChunk) { } - public void readRevisionByVersion(IDBStoreReader storeReader, CDORevisionImpl revision, int version, + public void readRevisionByVersion(IDBStoreReader storeReader, InternalCDORevision revision, int version, int referenceChunk) { } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java index c64857627d..a2679dec1c 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java @@ -11,8 +11,7 @@ package org.eclipse.emf.cdo.server.internal.db; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl.MoveableList; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.protocol.model.CDOFeature; @@ -32,6 +31,7 @@ import org.eclipse.net4j.db.DBType; import org.eclipse.net4j.db.DBUtil; import org.eclipse.net4j.db.ddl.IDBTable; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.collection.MoveableList; import java.sql.ResultSet; import java.sql.SQLException; @@ -73,7 +73,7 @@ public class ReferenceMapping extends FeatureMapping implements IReferenceMappin return table; } - public void writeReference(IDBStoreWriter storeWriter, CDORevisionImpl revision) + public void writeReference(IDBStoreWriter storeWriter, InternalCDORevision revision) { long source = revision.getID().getValue(); int version = revision.getVersion(); @@ -96,14 +96,17 @@ public class ReferenceMapping extends FeatureMapping implements IReferenceMappin } } - public void readReference(IDBStoreReader storeReader, CDORevisionImpl revision, int referenceChunk) + public void readReference(IDBStoreReader storeReader, InternalCDORevision revision, int referenceChunk) { - MoveableList list = revision.getList(getFeature()); + MoveableList<Object> list = revision.getList(getFeature()); CDOID source = revision.getID(); int version = revision.getVersion(); String sql = createSelect(source, version, null); - if (TRACER.isEnabled()) TRACER.trace(sql); + if (TRACER.isEnabled()) + { + TRACER.trace(sql); + } ResultSet resultSet = null; try @@ -118,7 +121,7 @@ public class ReferenceMapping extends FeatureMapping implements IReferenceMappin // TODO Optimize this? while (resultSet.next()) { - list.add(CDORevisionImpl.UNINITIALIZED); + list.add(InternalCDORevision.UNINITIALIZED); } } catch (SQLException ex) @@ -138,7 +141,10 @@ public class ReferenceMapping extends FeatureMapping implements IReferenceMappin int version = chunkReader.getRevision().getVersion(); String sql = createSelect(source, version, where); - if (TRACER.isEnabled()) TRACER.trace(sql); + if (TRACER.isEnabled()) + { + TRACER.trace(sql); + } ResultSet resultSet = null; try diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java index fecb4770f5..e2819f79a1 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ToOneReferenceMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.internal.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.model.CDOFeature; @@ -25,7 +25,7 @@ public class ToOneReferenceMapping extends AttributeMapping.AMObject } @Override - protected Long getRevisionValue(CDORevisionImpl revision) + protected Long getRevisionValue(InternalCDORevision revision) { CDOID id = (CDOID)super.getRevisionValue(revision); return id.getValue(); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java index ff6a8d3797..f4aa2b2388 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalClassMapping.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.internal.db; -import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; +import org.eclipse.emf.cdo.internal.protocol.revision.InternalCDORevision; import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.server.db.IClassMapping; import org.eclipse.emf.cdo.server.db.IDBStoreWriter; @@ -61,7 +61,7 @@ public class VerticalClassMapping extends ClassMapping } @Override - public void writeRevision(IDBStoreWriter storeWriter, CDORevisionImpl revision) + public void writeRevision(IDBStoreWriter storeWriter, InternalCDORevision revision) { super.writeRevision(storeWriter, revision); if (superMappings != null) |