summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-21 02:27:17 (EDT)
committerEike Stepper2007-08-21 02:27:17 (EDT)
commit1e53502d2911a1e74ded37ddf6c37e87d16046bc (patch)
tree78da000ee03c8041f7932f9048aeb81f763cff35
parent4d9a04c90bc80374604447d49e2c99fffed486b1 (diff)
downloadcdo-1e53502d2911a1e74ded37ddf6c37e87d16046bc.zip
cdo-1e53502d2911a1e74ded37ddf6c37e87d16046bc.tar.gz
cdo-1e53502d2911a1e74ded37ddf6c37e87d16046bc.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreReader.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/info/ServerInfo.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/StandardMappingStrategy.java2
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 ee8ba1b..dd79905 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 e92e942..4cb0abf 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 ccf4615..f162fa8 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 564b489..11d99fc 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());