3 files changed, 16 insertions, 16 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectAdapter.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
index 0623d0f31f..d255cc6382 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectAdapter.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
@@ -57,9 +57,9 @@ import java.util.List;
 /**
  * @author Eike Stepper
  */
-public class CDOObjectAdapter extends AdapterImpl implements InternalCDOObject
+public class CDOAdapterImpl extends AdapterImpl implements InternalCDOObject
 {
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOObjectAdapter.class);
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOAdapterImpl.class);
 
   private CDOID id;
 
@@ -69,7 +69,7 @@ public class CDOObjectAdapter extends AdapterImpl implements InternalCDOObject
 
   private CDORevisionImpl revision;
 
-  public CDOObjectAdapter()
+  public CDOAdapterImpl()
   {
     state = CDOState.TRANSIENT;
   }
@@ -83,13 +83,13 @@ public class CDOObjectAdapter extends AdapterImpl implements InternalCDOObject
   @Override
   public boolean isAdapterForType(Object type)
   {
-    return type == CDOObjectAdapter.class;
+    return type == CDOAdapterImpl.class;
   }
 
   @Override
   public void notifyChanged(Notification msg)
   {
-    // TODO Implement method CDOObjectAdapter.notifyChanged()
+    // TODO Implement method CDOAdapterImpl.notifyChanged()
     throw new UnsupportedOperationException("Not yet implemented");
   }
 
@@ -214,7 +214,7 @@ public class CDOObjectAdapter extends AdapterImpl implements InternalCDOObject
 
   public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID)
   {
-    // TODO Implement method CDOObjectAdapter.cdoInternalDynamicFeature()
+    // TODO Implement method CDOAdapterImpl.cdoInternalDynamicFeature()
     throw new UnsupportedOperationException("Not yet implemented");
   }
 
@@ -298,7 +298,7 @@ public class CDOObjectAdapter extends AdapterImpl implements InternalCDOObject
 
   private void transferRevisionToTarget()
   {
-    // TODO Implement method CDOObjectAdapter.transferRevisionToTarget()
+    // TODO Implement method CDOAdapterImpl.transferRevisionToTarget()
     throw new UnsupportedOperationException("Not yet implemented");
   }
 
@@ -658,19 +658,19 @@ public class CDOObjectAdapter extends AdapterImpl implements InternalCDOObject
     return getTarget().eURIFragmentSegment(feature, object);
   }
 
-  public static CDOObjectAdapter get(InternalEObject eObject)
+  public static CDOAdapterImpl get(InternalEObject eObject)
   {
     EList<Adapter> adapters = eObject.eAdapters();
-    return (CDOObjectAdapter)EcoreUtil.getAdapter(adapters, CDOObjectAdapter.class);
+    return (CDOAdapterImpl)EcoreUtil.getAdapter(adapters, CDOAdapterImpl.class);
   }
 
-  public static CDOObjectAdapter getOrCreate(InternalEObject eObject)
+  public static CDOAdapterImpl getOrCreate(InternalEObject eObject)
   {
     EList<Adapter> adapters = eObject.eAdapters();
-    CDOObjectAdapter adapter = (CDOObjectAdapter)EcoreUtil.getAdapter(adapters, CDOObjectAdapter.class);
+    CDOAdapterImpl adapter = (CDOAdapterImpl)EcoreUtil.getAdapter(adapters, CDOAdapterImpl.class);
     if (adapter == null)
     {
-      adapter = new CDOObjectAdapter();
+      adapter = new CDOAdapterImpl();
       adapters.add(adapter);
     }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
index 5c5c92b1cb..1505e00716 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
@@ -373,7 +373,7 @@ public final class CDOStore implements EStore
 
     if (object instanceof InternalEObject)
     {
-      return CDOObjectAdapter.getOrCreate((InternalEObject)object);
+      return CDOAdapterImpl.getOrCreate((InternalEObject)object);
     }
 
     throw new ImplementationError("Neither InternalCDOObject nor InternalEObject: " + object.getClass().getName());
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 48f45b1627..d0f5b7b0e3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -234,7 +234,7 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
       // if (id.isMeta())
       // {
       // InternalEObject metaObject = session.lookupMetaInstance(id);
-      // CDOObjectAdapter adapter = CDOObjectAdapter.getOrCreate(metaObject);
+      // CDOAdapterImpl adapter = CDOAdapterImpl.getOrCreate(metaObject);
       // adapter.cdoInternalSetID(id);
       // adapter.cdoInternalSetState(CDOState.CLEAN);
       // adapter.cdoInternalSetView(this);
@@ -280,14 +280,14 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier
     // if (potentialObject instanceof InternalEObject)
     // {
     // InternalEObject eObject = (InternalEObject)potentialObject;
-    // CDOObjectAdapter adapter = CDOObjectAdapter.get(eObject);
+    // CDOAdapterImpl adapter = CDOAdapterImpl.get(eObject);
     // if (adapter == null)
     // {
     // eObject = (InternalEObject)EcoreUtil.resolve(eObject, resourceSet);
     // CDOID id = session.lookupMetaInstanceID(eObject);
     // if (id != null)
     // {
-    // adapter = (CDOObjectAdapter)lookupInstance(id);
+    // adapter = (CDOAdapterImpl)lookupInstance(id);
     // }
     // }
     //