summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-12-17 11:29:49 (EST)
committerEike Stepper2007-12-17 11:29:49 (EST)
commit49128550ac78f6b8eb3b894a60d322c2140585d4 (patch)
tree1ef673bea5c930a31c6b5c38ea98a980951de195
parent29b46b98f03eb259da90454981d22f982eea146a (diff)
downloadcdo-49128550ac78f6b8eb3b894a60d322c2140585d4.zip
cdo-49128550ac78f6b8eb3b894a60d322c2140585d4.tar.gz
cdo-49128550ac78f6b8eb3b894a60d322c2140585d4.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.java5
1 files changed, 2 insertions, 3 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 9580669..7aa8b0b 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,7 +16,6 @@ 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;
@@ -28,6 +27,7 @@ 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;
@@ -544,8 +544,7 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
* @ADDED
* @author Eike Stepper
*/
- protected class TransientContents<E extends Object & EObject> extends NotifyingListImpl<E> implements
- InternalEList<E>
+ protected class TransientContents<E extends Object & EObject> extends NotifyingInternalEListImpl<E>
{
private static final long serialVersionUID = 1L;