diff options
4 files changed, 9 insertions, 9 deletions
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 ee8ba1b97f..dd799055e3 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 @@ -138,7 +138,7 @@ public class DBStoreReader implements IStoreReader } }; - String where = CDODBSchema.CLASSES_PACKAGE.getName() + " = " + ServerInfo.getID(cdoPackage); + String where = CDODBSchema.CLASSES_PACKAGE.getName() + " = " + ServerInfo.getDBID(cdoPackage); DBUtil.select(connection, rowHandler, where, CDODBSchema.CLASSES_ID, CDODBSchema.CLASSES_CLASSIFIER, CDODBSchema.CLASSES_NAME, CDODBSchema.CLASSES_ABSTRACT); } 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 e92e942911..4cb0abf71e 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 @@ -117,7 +117,7 @@ public class DBStoreWriter extends DBStoreReader implements IStoreWriter cdoClass.setServerInfo(new ClassServerInfo(id)); CDOPackageImpl cdoPackage = cdoClass.getContainingPackage(); - int packageID = ServerInfo.getID(cdoPackage); + int packageID = ServerInfo.getDBID(cdoPackage); int classifierID = cdoClass.getClassifierID(); String name = cdoClass.getName(); boolean isAbstract = cdoClass.isAbstract(); @@ -146,7 +146,7 @@ public class DBStoreWriter extends DBStoreReader implements IStoreWriter int id = store.getNextFeatureID(); feature.setServerInfo(new FeatureServerInfo(id)); - int classID = ServerInfo.getID(feature.getContainingClass()); + int classID = ServerInfo.getDBID(feature.getContainingClass()); String name = feature.getName(); int featureID = feature.getFeatureID(); int type = feature.getType().getTypeID(); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/info/ServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/info/ServerInfo.java index ccf4615e99..f162fa81f3 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/info/ServerInfo.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/info/ServerInfo.java @@ -17,15 +17,15 @@ import org.eclipse.emf.cdo.protocol.model.CDOModelElement; */ public abstract class ServerInfo { - private int id; + private int dbID; - public ServerInfo(int id) + public ServerInfo(int dbID) { - this.id = id; + this.dbID = dbID; } - public static int getID(CDOModelElement modelElement) + public static int getDBID(CDOModelElement modelElement) { - return ((ServerInfo)modelElement.getServerInfo()).id; + return ((ServerInfo)modelElement.getServerInfo()).dbID; } } diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/StandardMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/StandardMappingStrategy.java index 564b489858..11d99fc934 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/StandardMappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/StandardMappingStrategy.java @@ -235,7 +235,7 @@ public abstract class StandardMappingStrategy extends MappingStrategy int i = 0; Object[] values = new Object[table.getFieldCount()]; values[i++] = revision.getID().getValue(); - values[i++] = ServerInfo.getID(revision.getCDOClass()); + values[i++] = ServerInfo.getDBID(revision.getCDOClass()); values[i++] = revision.getVersion(); values[i++] = new Date(revision.getCreated()); values[i++] = new Date(revision.getRevised()); |