[204535] Missing CDO Mixins cause errors

https://bugs.eclipse.org/bugs/show_bug.cgi?id=204535

3 files changed, 27 insertions, 25 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 9dcf506f02..366d355566 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.server.IView;
 import org.eclipse.emf.cdo.server.db.IClassMapping;
 import org.eclipse.emf.cdo.server.db.IDBStore;
 import org.eclipse.emf.cdo.server.db.IMappingStrategy;
+import org.eclipse.emf.cdo.server.internal.db.bundle.OM;
 
 import org.eclipse.net4j.db.ConnectionProvider;
 import org.eclipse.net4j.db.DBException;
@@ -263,8 +264,10 @@ public class DBStore extends Store implements IDBStore
 
   protected void repairAfterCrash(Repository repository, Connection connection)
   {
-    // TODO Implement method DBStore.repairAfterCrash()
-    throw new UnsupportedOperationException("Not yet implemented");
+    OM.LOG.warn("Detected restart after crash");
+
+    // TODO repairAfterCrash not yet implemented
+    OM.LOG.error("repairAfterCrash not yet implemented");
   }
 
   protected IDBSchema createSchema()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java
index b797b9a192..faa310765d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.util;
 
 import org.eclipse.emf.internal.cdo.CDOAdapterImpl;
-import org.eclipse.emf.internal.cdo.CDOCallbackImpl;
 import org.eclipse.emf.internal.cdo.CDOObjectImpl;
 import org.eclipse.emf.internal.cdo.CDOStateMachine;
 
@@ -34,8 +33,8 @@ public enum CDOPackageType
 
   /**
    * The type of <code>EPackages</code> that have been normally generated for EMF and later converted to CDO.
-   * Instances of <code>EClasses</code> of these packages are represented by {@link CDOCallbackImpl} to the
-   * {@link CDOStateMachine}.
+   * Instances of <code>EClasses</code> of these packages are represented by
+   * {@link org.eclipse.emf.internal.cdo.CDOCallbackImpl} to the {@link CDOStateMachine}.
    */
   CONVERTED
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index 8fa86fb09c..de1c360eb1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -114,26 +114,26 @@ public final class FSMUtil
 
   private static InternalCDOObject adaptCallback(Object object, CDOView view) throws Throwable
   {
-    if (object instanceof org.eclipse.emf.ecore.impl.CDOAware)
-    {
-      org.eclipse.emf.ecore.impl.CDOAware aware = (org.eclipse.emf.ecore.impl.CDOAware)object;
-      org.eclipse.emf.internal.cdo.CDOCallbackImpl callback = (org.eclipse.emf.internal.cdo.CDOCallbackImpl)aware
-          .getCDOCallback();
-      if (callback == null)
-      {
-        InternalEObject instance = (InternalEObject)aware;
-        if (instance.eIsProxy())
-        {
-          instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet());
-        }
-
-        callback = new org.eclipse.emf.internal.cdo.CDOCallbackImpl(instance);
-        aware.setCDOCallback(callback);
-        instance.eAdapters().add(callback);
-      }
-
-      return callback;
-    }
+    // if (object instanceof org.eclipse.emf.ecore.impl.CDOAware)
+    // {
+    // org.eclipse.emf.ecore.impl.CDOAware aware = (org.eclipse.emf.ecore.impl.CDOAware)object;
+    // org.eclipse.emf.internal.cdo.CDOCallbackImpl callback = (org.eclipse.emf.internal.cdo.CDOCallbackImpl)aware
+    // .getCDOCallback();
+    // if (callback == null)
+    // {
+    // InternalEObject instance = (InternalEObject)aware;
+    // if (instance.eIsProxy())
+    // {
+    // instance = (InternalEObject)EcoreUtil.resolve(instance, view.getResourceSet());
+    // }
+    //
+    // callback = new org.eclipse.emf.internal.cdo.CDOCallbackImpl(instance);
+    // aware.setCDOCallback(callback);
+    // instance.eAdapters().add(callback);
+    // }
+    //
+    // return callback;
+    // }
 
     return null;
   }