summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-12-17 13:08:18 (EST)
committerEike Stepper2007-12-17 13:08:18 (EST)
commit31bc13ad1648aa594520b4fdc5b6fa6c965c9c52 (patch)
treebbe0727a2be3ce3237cab6db6dec9d5e9e9c3045
parentc8fa349753d68e1e10b7993de510d081f7bb506e (diff)
downloadcdo-31bc13ad1648aa594520b4fdc5b6fa6c965c9c52.zip
cdo-31bc13ad1648aa594520b4fdc5b6fa6c965c9c52.tar.gz
cdo-31bc13ad1648aa594520b4fdc5b6fa6c965c9c52.tar.bz2
[213150] Migrate CDO to EMF 2.4M4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=213150
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java37
1 files changed, 35 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 7cdb5e5..08539dd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.notify.impl.NotificationChainImpl;
import org.eclipse.emf.common.notify.impl.NotificationImpl;
+import org.eclipse.emf.common.notify.impl.NotifyingListImpl;
import org.eclipse.emf.common.util.AbstractTreeIterator;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.TreeIterator;
@@ -27,7 +28,6 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.util.NotifyingInternalEListImpl;
import org.eclipse.emf.internal.cdo.CDOLegacyImpl;
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
import org.eclipse.emf.internal.cdo.CDOStateMachine;
@@ -542,10 +542,13 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
}
/**
+ * TODO Change superclass to NotifyingInternalEListImpl when EMF 2.3 is out of maintenance
+ *
* @ADDED
* @author Eike Stepper
*/
- protected class TransientContents<E extends Object & EObject> extends NotifyingInternalEListImpl<E>
+ protected class TransientContents<E extends Object & EObject> extends NotifyingListImpl<E> implements
+ InternalEList<E>
{
private static final long serialVersionUID = 1L;
@@ -616,6 +619,36 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
return eObject.eSetResource(null, notifications);
}
+ public boolean basicContains(Object object)
+ {
+ return super.contains(object);
+ }
+
+ public boolean basicContainsAll(Collection<?> collection)
+ {
+ return super.containsAll(collection);
+ }
+
+ public int basicIndexOf(Object object)
+ {
+ return super.indexOf(object);
+ }
+
+ public int basicLastIndexOf(Object object)
+ {
+ return super.lastIndexOf(object);
+ }
+
+ public Object[] basicToArray()
+ {
+ return super.toArray();
+ }
+
+ public <T> T[] basicToArray(T[] array)
+ {
+ return super.toArray(array);
+ }
+
@Override
public Iterator<E> basicIterator()
{