*** empty log message ***

3 files changed, 327 insertions, 564 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
index 8722e1e..0cf5976 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.internal.cdo;
 
 import org.eclipse.emf.cdo.CDOState;
-import org.eclipse.emf.cdo.CDOView;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
 import org.eclipse.emf.cdo.internal.protocol.model.CDOClassImpl;
@@ -26,18 +25,9 @@ import org.eclipse.net4j.util.ImplementationError;
 import org.eclipse.net4j.util.ReflectUtil;
 import org.eclipse.net4j.util.WrappedException;
 
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
 import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
 import org.eclipse.emf.ecore.impl.EAttributeImpl;
 import org.eclipse.emf.ecore.impl.EClassImpl;
@@ -60,32 +50,21 @@ import java.util.List;
 /**
  * @author Eike Stepper
  */
-public abstract class CDOLegacyImpl implements InternalCDOObject
+public abstract class CDOLegacyImpl extends CDOWrapperImpl
 {
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOLegacyImpl.class);
 
-  protected CDOViewImpl view;
-
-  protected CDOID id;
-
   protected CDOState state;
 
   protected CDOResourceImpl resource;
 
   protected CDORevisionImpl revision;
 
-  protected InternalEObject instance;
-
   public CDOLegacyImpl()
   {
     state = CDOState.TRANSIENT;
   }
 
-  public CDOID cdoID()
-  {
-    return id;
-  }
-
   public CDOState cdoState()
   {
     return state;
@@ -106,6 +85,7 @@ public abstract class CDOLegacyImpl implements InternalCDOObject
     return CDOObjectImpl.getCDOClass(this);
   }
 
+  @Override
   public CDOViewImpl cdoView()
   {
     if (view == null)
@@ -116,21 +96,6 @@ public abstract class CDOLegacyImpl implements InternalCDOObject
     return view;
   }
 
-  public void cdoInternalSetID(CDOID id)
-  {
-    if (id == null)
-    {
-      throw new IllegalArgumentException("id == null");
-    }
-
-    if (TRACER.isEnabled())
-    {
-      TRACER.format("Setting ID: {0} for {1}", id, instance);
-    }
-
-    this.id = id;
-  }
-
   public CDOState cdoInternalSetState(CDOState state)
   {
     if (this.state != state)
@@ -166,11 +131,6 @@ public abstract class CDOLegacyImpl implements InternalCDOObject
     this.revision = (CDORevisionImpl)revision;
   }
 
-  public void cdoInternalSetView(CDOView view)
-  {
-    this.view = (CDOViewImpl)view;
-  }
-
   public void cdoInternalSetResource(CDOResource resource)
   {
     if (TRACER.isEnabled())
@@ -181,17 +141,6 @@ public abstract class CDOLegacyImpl implements InternalCDOObject
     this.resource = (CDOResourceImpl)resource;
   }
 
-  public InternalEObject cdoInternalInstance()
-  {
-    return instance;
-  }
-
-  public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID)
-  {
-    // TODO Implement method CDOAdapterImpl.cdoInternalDynamicFeature()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
   public void cdoInternalPostAttach()
   {
     // Do nothing
@@ -523,227 +472,4 @@ public abstract class CDOLegacyImpl implements InternalCDOObject
       throw new ImplementationError(ex);
     }
   }
-
-  public EList<Adapter> eAdapters()
-  {
-    return instance.eAdapters();
-  }
-
-  public TreeIterator<EObject> eAllContents()
-  {
-    return instance.eAllContents();
-  }
-
-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-  {
-    return instance.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-  }
-
-  public NotificationChain eBasicRemoveFromContainer(NotificationChain notifications)
-  {
-    return instance.eBasicRemoveFromContainer(notifications);
-  }
-
-  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
-      NotificationChain notifications)
-  {
-    return instance.eBasicSetContainer(newContainer, newContainerFeatureID, notifications);
-  }
-
-  public EClass eClass()
-  {
-    return instance.eClass();
-  }
-
-  public EObject eContainer()
-  {
-    return instance.eContainer();
-  }
-
-  public int eContainerFeatureID()
-  {
-    return instance.eContainerFeatureID();
-  }
-
-  public EStructuralFeature eContainingFeature()
-  {
-    return instance.eContainingFeature();
-  }
-
-  public EReference eContainmentFeature()
-  {
-    return instance.eContainmentFeature();
-  }
-
-  public EList<EObject> eContents()
-  {
-    return instance.eContents();
-  }
-
-  public EList<EObject> eCrossReferences()
-  {
-    return instance.eCrossReferences();
-  }
-
-  public boolean eDeliver()
-  {
-    return instance.eDeliver();
-  }
-
-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-  {
-    return instance.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-  }
-
-  public Resource.Internal eDirectResource()
-  {
-    return instance.eDirectResource();
-  }
-
-  public Object eGet(EStructuralFeature feature, boolean resolve, boolean coreType)
-  {
-    return instance.eGet(feature, resolve, coreType);
-  }
-
-  public Object eGet(EStructuralFeature feature, boolean resolve)
-  {
-    return instance.eGet(feature, resolve);
-  }
-
-  public Object eGet(EStructuralFeature feature)
-  {
-    return instance.eGet(feature);
-  }
-
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    return instance.eGet(featureID, resolve, coreType);
-  }
-
-  public InternalEObject eInternalContainer()
-  {
-    return instance.eInternalContainer();
-  }
-
-  public Resource.Internal eInternalResource()
-  {
-    return instance.eInternalResource();
-  }
-
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
-  {
-    return instance.eInverseAdd(otherEnd, featureID, baseClass, notifications);
-  }
-
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
-  {
-    return instance.eInverseRemove(otherEnd, featureID, baseClass, notifications);
-  }
-
-  public boolean eIsProxy()
-  {
-    return instance.eIsProxy();
-  }
-
-  public boolean eIsSet(EStructuralFeature feature)
-  {
-    return instance.eIsSet(feature);
-  }
-
-  public boolean eIsSet(int featureID)
-  {
-    return instance.eIsSet(featureID);
-  }
-
-  public boolean eNotificationRequired()
-  {
-    return instance.eNotificationRequired();
-  }
-
-  public void eNotify(Notification notification)
-  {
-    instance.eNotify(notification);
-  }
-
-  public EObject eObjectForURIFragmentSegment(String uriFragmentSegment)
-  {
-    return instance.eObjectForURIFragmentSegment(uriFragmentSegment);
-  }
-
-  public URI eProxyURI()
-  {
-    return instance.eProxyURI();
-  }
-
-  public EObject eResolveProxy(InternalEObject proxy)
-  {
-    return instance.eResolveProxy(proxy);
-  }
-
-  public Resource eResource()
-  {
-    return instance.eResource();
-  }
-
-  public void eSet(EStructuralFeature feature, Object newValue)
-  {
-    instance.eSet(feature, newValue);
-  }
-
-  public void eSet(int featureID, Object newValue)
-  {
-    instance.eSet(featureID, newValue);
-  }
-
-  public void eSetClass(EClass class1)
-  {
-    instance.eSetClass(class1);
-  }
-
-  public void eSetDeliver(boolean deliver)
-  {
-    instance.eSetDeliver(deliver);
-  }
-
-  public void eSetProxyURI(URI uri)
-  {
-    instance.eSetProxyURI(uri);
-  }
-
-  public NotificationChain eSetResource(Resource.Internal resource, NotificationChain notifications)
-  {
-    return instance.eSetResource(resource, notifications);
-  }
-
-  public void eSetStore(EStore store)
-  {
-    instance.eSetStore(store);
-  }
-
-  public Setting eSetting(EStructuralFeature feature)
-  {
-    return instance.eSetting(feature);
-  }
-
-  public EStore eStore()
-  {
-    return instance.eStore();
-  }
-
-  public void eUnset(EStructuralFeature feature)
-  {
-    instance.eUnset(feature);
-  }
-
-  public void eUnset(int featureID)
-  {
-    instance.eUnset(featureID);
-  }
-
-  public String eURIFragmentSegment(EStructuralFeature feature, EObject object)
-  {
-    return instance.eURIFragmentSegment(feature, object);
-  }
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java
index 299e70a..2efa067 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOMetaImpl.java
@@ -11,59 +11,25 @@
 package org.eclipse.emf.internal.cdo;
 
 import org.eclipse.emf.cdo.CDOState;
-import org.eclipse.emf.cdo.CDOView;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.protocol.CDOID;
 import org.eclipse.emf.cdo.protocol.model.CDOClass;
 import org.eclipse.emf.cdo.protocol.revision.CDORevision;
 
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.resource.Resource;
 
 /**
  * @author Eike Stepper
  */
-public class CDOMetaImpl implements InternalCDOObject
+public class CDOMetaImpl extends CDOWrapperImpl
 {
-  private CDOViewImpl view;
-
-  private InternalEObject metaInstance;
-
-  private CDOID id;
-
-  public CDOMetaImpl(CDOViewImpl view, InternalEObject metaInstance, CDOID id)
+  public CDOMetaImpl(CDOViewImpl view, InternalEObject instance, CDOID id)
   {
     this.view = view;
-    this.metaInstance = metaInstance;
+    this.instance = instance;
     this.id = id;
   }
 
-  public CDOViewImpl getView()
-  {
-    return view;
-  }
-
-  public InternalEObject getMetaInstance()
-  {
-    return metaInstance;
-  }
-
-  public CDOID cdoID()
-  {
-    return id;
-  }
-
   public CDOState cdoState()
   {
     return CDOState.CLEAN;
@@ -84,21 +50,11 @@ public class CDOMetaImpl implements InternalCDOObject
     throw new UnsupportedOperationException();
   }
 
-  public CDOViewImpl cdoView()
-  {
-    return view;
-  }
-
   public boolean cdoTransient()
   {
     return false;
   }
 
-  public void cdoInternalSetID(CDOID id)
-  {
-    this.id = id;
-  }
-
   public CDOState cdoInternalSetState(CDOState state)
   {
     throw new UnsupportedOperationException();
@@ -109,11 +65,6 @@ public class CDOMetaImpl implements InternalCDOObject
     throw new UnsupportedOperationException();
   }
 
-  public void cdoInternalSetView(CDOView view)
-  {
-    this.view = (CDOViewImpl)view;
-  }
-
   public void cdoInternalSetResource(CDOResource resource)
   {
     throw new UnsupportedOperationException();
@@ -134,248 +85,14 @@ public class CDOMetaImpl implements InternalCDOObject
     throw new UnsupportedOperationException();
   }
 
-  public InternalEObject cdoInternalInstance()
-  {
-    return metaInstance;
-  }
-
-  public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID)
-  {
-    // TODO Implement method CDOMetaImpl.enclosing_method()
-    throw new UnsupportedOperationException("Not yet implemented");
-  }
-
   @Override
   public String toString()
   {
     if (cdoID() == null)
     {
-      return metaInstance.eClass().getName() + "?";
+      return instance.eClass().getName() + "?";
     }
 
-    return metaInstance.eClass().getName() + "@" + cdoID();
-  }
-
-  public EList<Adapter> eAdapters()
-  {
-    return metaInstance.eAdapters();
-  }
-
-  public TreeIterator<EObject> eAllContents()
-  {
-    return metaInstance.eAllContents();
-  }
-
-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-  {
-    return metaInstance.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-  }
-
-  public NotificationChain eBasicRemoveFromContainer(NotificationChain notifications)
-  {
-    return metaInstance.eBasicRemoveFromContainer(notifications);
-  }
-
-  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
-      NotificationChain notifications)
-  {
-    return metaInstance.eBasicSetContainer(newContainer, newContainerFeatureID, notifications);
-  }
-
-  public EClass eClass()
-  {
-    return metaInstance.eClass();
-  }
-
-  public EObject eContainer()
-  {
-    return metaInstance.eContainer();
-  }
-
-  public int eContainerFeatureID()
-  {
-    return metaInstance.eContainerFeatureID();
-  }
-
-  public EStructuralFeature eContainingFeature()
-  {
-    return metaInstance.eContainingFeature();
-  }
-
-  public EReference eContainmentFeature()
-  {
-    return metaInstance.eContainmentFeature();
-  }
-
-  public EList<EObject> eContents()
-  {
-    return metaInstance.eContents();
-  }
-
-  public EList<EObject> eCrossReferences()
-  {
-    return metaInstance.eCrossReferences();
-  }
-
-  public boolean eDeliver()
-  {
-    return metaInstance.eDeliver();
-  }
-
-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-  {
-    return metaInstance.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-  }
-
-  public Resource.Internal eDirectResource()
-  {
-    return metaInstance.eDirectResource();
-  }
-
-  public Object eGet(EStructuralFeature feature, boolean resolve, boolean coreType)
-  {
-    return metaInstance.eGet(feature, resolve, coreType);
-  }
-
-  public Object eGet(EStructuralFeature feature, boolean resolve)
-  {
-    return metaInstance.eGet(feature, resolve);
-  }
-
-  public Object eGet(EStructuralFeature feature)
-  {
-    return metaInstance.eGet(feature);
-  }
-
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    return metaInstance.eGet(featureID, resolve, coreType);
-  }
-
-  public InternalEObject eInternalContainer()
-  {
-    return metaInstance.eInternalContainer();
-  }
-
-  public Resource.Internal eInternalResource()
-  {
-    return metaInstance.eInternalResource();
-  }
-
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
-  {
-    return metaInstance.eInverseAdd(otherEnd, featureID, baseClass, notifications);
-  }
-
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass,
-      NotificationChain notifications)
-  {
-    return metaInstance.eInverseRemove(otherEnd, featureID, baseClass, notifications);
-  }
-
-  public boolean eIsProxy()
-  {
-    return metaInstance.eIsProxy();
-  }
-
-  public boolean eIsSet(EStructuralFeature feature)
-  {
-    return metaInstance.eIsSet(feature);
-  }
-
-  public boolean eIsSet(int featureID)
-  {
-    return metaInstance.eIsSet(featureID);
-  }
-
-  public boolean eNotificationRequired()
-  {
-    return metaInstance.eNotificationRequired();
-  }
-
-  public void eNotify(Notification notification)
-  {
-    metaInstance.eNotify(notification);
-  }
-
-  public EObject eObjectForURIFragmentSegment(String uriFragmentSegment)
-  {
-    return metaInstance.eObjectForURIFragmentSegment(uriFragmentSegment);
-  }
-
-  public URI eProxyURI()
-  {
-    return metaInstance.eProxyURI();
-  }
-
-  public EObject eResolveProxy(InternalEObject proxy)
-  {
-    return metaInstance.eResolveProxy(proxy);
-  }
-
-  public Resource eResource()
-  {
-    return metaInstance.eResource();
-  }
-
-  public void eSet(EStructuralFeature feature, Object newValue)
-  {
-    metaInstance.eSet(feature, newValue);
-  }
-
-  public void eSet(int featureID, Object newValue)
-  {
-    metaInstance.eSet(featureID, newValue);
-  }
-
-  public void eSetClass(EClass class1)
-  {
-    metaInstance.eSetClass(class1);
-  }
-
-  public void eSetDeliver(boolean deliver)
-  {
-    metaInstance.eSetDeliver(deliver);
-  }
-
-  public void eSetProxyURI(URI uri)
-  {
-    metaInstance.eSetProxyURI(uri);
-  }
-
-  public NotificationChain eSetResource(Resource.Internal resource, NotificationChain notifications)
-  {
-    return metaInstance.eSetResource(resource, notifications);
-  }
-
-  public void eSetStore(EStore store)
-  {
-    metaInstance.eSetStore(store);
-  }
-
-  public Setting eSetting(EStructuralFeature feature)
-  {
-    return metaInstance.eSetting(feature);
-  }
-
-  public EStore eStore()
-  {
-    return metaInstance.eStore();
-  }
-
-  public void eUnset(EStructuralFeature feature)
-  {
-    metaInstance.eUnset(feature);
-  }
-
-  public void eUnset(int featureID)
-  {
-    metaInstance.eUnset(featureID);
-  }
-
-  public String eURIFragmentSegment(EStructuralFeature feature, EObject object)
-  {
-    return metaInstance.eURIFragmentSegment(feature, object);
+    return instance.eClass().getName() + "@" + cdoID();
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java
new file mode 100644
index 0000000..6153847
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java
@@ -0,0 +1,320 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.internal.cdo;
+
+import org.eclipse.emf.cdo.CDOView;
+import org.eclipse.emf.cdo.protocol.CDOID;
+
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.internal.cdo.bundle.OM;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class CDOWrapperImpl implements InternalCDOObject
+{
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOWrapperImpl.class);
+
+  protected CDOID id;
+
+  protected CDOViewImpl view;
+
+  protected InternalEObject instance;
+
+  public CDOWrapperImpl()
+  {
+    super();
+  }
+
+  public CDOID cdoID()
+  {
+    return id;
+  }
+
+  public CDOViewImpl cdoView()
+  {
+    return view;
+  }
+
+  public void cdoInternalSetID(CDOID id)
+  {
+    if (id == null)
+    {
+      throw new IllegalArgumentException("id == null");
+    }
+
+    if (TRACER.isEnabled())
+    {
+      TRACER.format("Setting ID: {0} for {1}", id, instance);
+    }
+
+    this.id = id;
+  }
+
+  public void cdoInternalSetView(CDOView view)
+  {
+    if (TRACER.isEnabled())
+    {
+      TRACER.format("Setting view: {0} for {1}", view, instance);
+    }
+
+    this.view = (CDOViewImpl)view;
+  }
+
+  public InternalEObject cdoInternalInstance()
+  {
+    return instance;
+  }
+
+  public EList<Adapter> eAdapters()
+  {
+    return instance.eAdapters();
+  }
+
+  public EStructuralFeature cdoInternalDynamicFeature(int dynamicFeatureID)
+  {
+    // TODO Implement method CDOWrapperImpl.cdoInternalDynamicFeature()
+    throw new UnsupportedOperationException("Not yet implemented");
+  }
+
+  public TreeIterator<EObject> eAllContents()
+  {
+    return instance.eAllContents();
+  }
+
+  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
+  {
+    return instance.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+  }
+
+  public NotificationChain eBasicRemoveFromContainer(NotificationChain notifications)
+  {
+    return instance.eBasicRemoveFromContainer(notifications);
+  }
+
+  public NotificationChain eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID,
+      NotificationChain notifications)
+  {
+    return instance.eBasicSetContainer(newContainer, newContainerFeatureID, notifications);
+  }
+
+  public EClass eClass()
+  {
+    return instance.eClass();
+  }
+
+  public EObject eContainer()
+  {
+    return instance.eContainer();
+  }
+
+  public int eContainerFeatureID()
+  {
+    return instance.eContainerFeatureID();
+  }
+
+  public EStructuralFeature eContainingFeature()
+  {
+    return instance.eContainingFeature();
+  }
+
+  public EReference eContainmentFeature()
+  {
+    return instance.eContainmentFeature();
+  }
+
+  public EList<EObject> eContents()
+  {
+    return instance.eContents();
+  }
+
+  public EList<EObject> eCrossReferences()
+  {
+    return instance.eCrossReferences();
+  }
+
+  public boolean eDeliver()
+  {
+    return instance.eDeliver();
+  }
+
+  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
+  {
+    return instance.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+  }
+
+  public Resource.Internal eDirectResource()
+  {
+    return instance.eDirectResource();
+  }
+
+  public Object eGet(EStructuralFeature feature, boolean resolve, boolean coreType)
+  {
+    return instance.eGet(feature, resolve, coreType);
+  }
+
+  public Object eGet(EStructuralFeature feature, boolean resolve)
+  {
+    return instance.eGet(feature, resolve);
+  }
+
+  public Object eGet(EStructuralFeature feature)
+  {
+    return instance.eGet(feature);
+  }
+
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    return instance.eGet(featureID, resolve, coreType);
+  }
+
+  public InternalEObject eInternalContainer()
+  {
+    return instance.eInternalContainer();
+  }
+
+  public Resource.Internal eInternalResource()
+  {
+    return instance.eInternalResource();
+  }
+
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class<?> baseClass,
+      NotificationChain notifications)
+  {
+    return instance.eInverseAdd(otherEnd, featureID, baseClass, notifications);
+  }
+
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class<?> baseClass,
+      NotificationChain notifications)
+  {
+    return instance.eInverseRemove(otherEnd, featureID, baseClass, notifications);
+  }
+
+  public boolean eIsProxy()
+  {
+    return instance.eIsProxy();
+  }
+
+  public boolean eIsSet(EStructuralFeature feature)
+  {
+    return instance.eIsSet(feature);
+  }
+
+  public boolean eIsSet(int featureID)
+  {
+    return instance.eIsSet(featureID);
+  }
+
+  public boolean eNotificationRequired()
+  {
+    return instance.eNotificationRequired();
+  }
+
+  public void eNotify(Notification notification)
+  {
+    instance.eNotify(notification);
+  }
+
+  public EObject eObjectForURIFragmentSegment(String uriFragmentSegment)
+  {
+    return instance.eObjectForURIFragmentSegment(uriFragmentSegment);
+  }
+
+  public URI eProxyURI()
+  {
+    return instance.eProxyURI();
+  }
+
+  public EObject eResolveProxy(InternalEObject proxy)
+  {
+    return instance.eResolveProxy(proxy);
+  }
+
+  public Resource eResource()
+  {
+    return instance.eResource();
+  }
+
+  public void eSet(EStructuralFeature feature, Object newValue)
+  {
+    instance.eSet(feature, newValue);
+  }
+
+  public void eSet(int featureID, Object newValue)
+  {
+    instance.eSet(featureID, newValue);
+  }
+
+  public void eSetClass(EClass class1)
+  {
+    instance.eSetClass(class1);
+  }
+
+  public void eSetDeliver(boolean deliver)
+  {
+    instance.eSetDeliver(deliver);
+  }
+
+  public void eSetProxyURI(URI uri)
+  {
+    instance.eSetProxyURI(uri);
+  }
+
+  public NotificationChain eSetResource(Resource.Internal resource, NotificationChain notifications)
+  {
+    return instance.eSetResource(resource, notifications);
+  }
+
+  public void eSetStore(EStore store)
+  {
+    instance.eSetStore(store);
+  }
+
+  public Setting eSetting(EStructuralFeature feature)
+  {
+    return instance.eSetting(feature);
+  }
+
+  public EStore eStore()
+  {
+    return instance.eStore();
+  }
+
+  public void eUnset(EStructuralFeature feature)
+  {
+    instance.eUnset(feature);
+  }
+
+  public void eUnset(int featureID)
+  {
+    instance.eUnset(featureID);
+  }
+
+  public String eURIFragmentSegment(EStructuralFeature feature, EObject object)
+  {
+    return instance.eURIFragmentSegment(feature, object);
+  }
+
+}
\ No newline at end of file