[247226] Transparently support legacy models

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

3 files changed, 13 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
index a2363550b5..6e888d9975 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
@@ -48,7 +48,6 @@ import org.eclipse.emf.ecore.impl.EReferenceImpl;
 import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
 import org.eclipse.emf.ecore.impl.ETypedElementImpl;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.DelegatingInternalEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import java.lang.reflect.Field;
@@ -63,7 +62,7 @@ import java.util.List;
  * @since 2.0
  */
 /*
- * Important: Compile errors in this class might indicate an old version of EMF. Legacy support is only enabled for EMF
+ * IMPORTANT: Compile errors in this class might indicate an old version of EMF. Legacy support is only enabled for EMF
  * with fixed bug #247130. These compile errors do not affect native models!
  */
 public final class CDOLegacyWrapper extends CDOObjectWrapper implements InternalEObject.EReadListener,
@@ -584,6 +583,10 @@ public final class CDOLegacyWrapper extends CDOObjectWrapper implements Internal
     }
   }
 
+  /*
+   * IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
+   * EMF with fixed bug #247130. These compile errors do not affect native models!
+   */
   @SuppressWarnings("unchecked")
   private void resolveProxies(CDOFeature feature, CDOPackageRegistry packageRegistry)
   {
@@ -604,9 +607,9 @@ public final class CDOLegacyWrapper extends CDOObjectWrapper implements Internal
             InternalEObject instance = resolved.cdoInternalInstance();
 
             // TODO Is InternalEList.basicSet() needed???
-            if (list instanceof DelegatingInternalEList)
+            if (list instanceof org.eclipse.emf.ecore.util.DelegatingInternalEList)
             {
-              list = ((DelegatingInternalEList)list).getDelegateInternalEList();
+              list = ((org.eclipse.emf.ecore.util.DelegatingInternalEList)list).getDelegateInternalEList();
             }
 
             if (list instanceof NotifyingListImpl)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java
index 9f68178ca2..9138f9fdba 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java
@@ -116,10 +116,10 @@ public abstract class CDOObjectWrapper implements InternalCDOObject
    * @since 2.0
    */
   /*
-   * Important: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
+   * IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
    * EMF with fixed bug #247130. These compile errors do not affect native models!
    */
-  public EList<EReadListener> eReadListeners()
+  public EList<InternalEObject.EReadListener> eReadListeners()
   {
     return instance.eReadListeners();
   }
@@ -128,10 +128,10 @@ public abstract class CDOObjectWrapper implements InternalCDOObject
    * @since 2.0
    */
   /*
-   * Important: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
+   * IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
    * EMF with fixed bug #247130. These compile errors do not affect native models!
    */
-  public EList<EWriteListener> eWriteListeners()
+  public EList<InternalEObject.EWriteListener> eWriteListeners()
   {
     return instance.eWriteListeners();
   }
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 6538cb201f..476eff0763 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
@@ -110,7 +110,7 @@ public final class FSMUtil
   }
 
   /*
-   * Important: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
+   * IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
    * EMF with fixed bug #247130. These compile errors do not affect native models!
    */
   public static InternalCDOObject adaptLegacy(InternalEObject object)
@@ -142,7 +142,7 @@ public final class FSMUtil
   }
 
   /*
-   * Important: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
+   * IMPORTANT: Compile errors in this method might indicate an old version of EMF. Legacy support is only enabled for
    * EMF with fixed bug #247130. These compile errors do not affect native models!
    */
   public static Object getLegacyWrapper(InternalEObject object)