restored state before refactoring by eike

1 files changed, 20 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index 3571fd24b4..e153ea6d14 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -12,6 +12,7 @@
 package org.eclipse.emf.cdo.common.internal.db.cache;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDProvider;
 import org.eclipse.emf.cdo.common.internal.db.AbstractQueryStatement;
 import org.eclipse.emf.cdo.common.internal.db.AbstractUpdateStatement;
 import org.eclipse.emf.cdo.common.internal.db.DBRevisionCacheUtil;
@@ -56,6 +57,8 @@ import java.util.List;
  */
 public class DBRevisionCache extends Lifecycle implements CDORevisionCache
 {
+  private CDOIDProvider idProvider;
+
   private CDOListFactory listFactory;
 
   private CDOPackageRegistry packageRegistry;
@@ -70,6 +73,16 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
   {
   }
 
+  public CDOIDProvider getIdProvider()
+  {
+    return idProvider;
+  }
+
+  public void setIdProvider(CDOIDProvider idProvider)
+  {
+    this.idProvider = idProvider;
+  }
+
   public CDOListFactory getListFactory()
   {
     return listFactory;
@@ -589,7 +602,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
         if (revision.isResourceNode())
         {
           preparedStatement.setString(6, DBRevisionCacheUtil.getResourceNodeName(revision));
-          CDOID containerID = revision.getContainerID();
+          CDOID containerID = (CDOID)revision.getContainerID();
           preparedStatement.setString(7, containerID.toURIFragment());
         }
         else
@@ -699,6 +712,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
+    checkState(idProvider, "idProvider"); //$NON-NLS-1$
     checkState(listFactory, "listFactory");//$NON-NLS-1$
     checkState(packageRegistry, "packageRegistry"); //$NON-NLS-1$
     checkState(revisionFactory, "revisionFactory"); //$NON-NLS-1$
@@ -822,6 +836,11 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
       {
         return packageRegistry;
       }
+
+      public CDOIDProvider getIDProvider()
+      {
+        return idProvider;
+      }
     };
   }