*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java
index fb67f60..f362f44 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.edit/src/org/eclipse/uml2/provider/ElementItemProvider.java
@@ -8,17 +8,15 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ElementItemProvider.java,v 1.15 2005/02/25 02:18:57 khussey Exp $
+ * $Id: ElementItemProvider.java,v 1.16 2005/02/25 02:35:36 khussey Exp $
*/
package org.eclipse.uml2.provider;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EObject;
@@ -251,34 +249,4 @@
});
}
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
- */
- public void dispose() {
- Notifier oldTarget = target;
- target = null;
-
- List oldTargets = targets;
- targets = null;
-
- if (oldTarget != null) {
- oldTarget.eAdapters().remove(this);
- oldTarget = null;
- }
-
- if (oldTargets != null) {
- for (Iterator i = oldTargets.iterator(); i.hasNext();) {
- Notifier otherTarget = (Notifier) i.next();
- otherTarget.eAdapters().remove(this);
- }
- oldTargets = null;
- }
-
- // Dispose the child wrappers.
- //
- if (wrappers != null) {
- wrappers.dispose();
- }
- }
-
}
diff --git a/deprecated/tests/org.eclipse.uml2.edit.tests/src/org/eclipse/uml2/provider/tests/ElementItemProviderTest.java b/deprecated/tests/org.eclipse.uml2.edit.tests/src/org/eclipse/uml2/provider/tests/ElementItemProviderTest.java
index 8efe60b..87f412d 100644
--- a/deprecated/tests/org.eclipse.uml2.edit.tests/src/org/eclipse/uml2/provider/tests/ElementItemProviderTest.java
+++ b/deprecated/tests/org.eclipse.uml2.edit.tests/src/org/eclipse/uml2/provider/tests/ElementItemProviderTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ElementItemProviderTest.java,v 1.6 2005/02/25 02:18:55 khussey Exp $
+ * $Id: ElementItemProviderTest.java,v 1.7 2005/02/25 02:35:30 khussey Exp $
*/
package org.eclipse.uml2.provider.tests;
@@ -29,7 +29,7 @@
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IDisposable;
+//import org.eclipse.emf.edit.provider.IDisposable;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.uml2.Element;
import org.eclipse.uml2.UML2Package;
@@ -263,35 +263,35 @@
}
}
- public void testDispose() {
- ReferenceQueue referenceQueue = new ReferenceQueue();
- Reference reference = new PhantomReference(getModelObject(),
- referenceQueue);
-
- Adapter adapter = adapterFactory.adapt(getModelObject(),
- IEditingDomainItemProvider.class);
- adapter.setTarget(null);
-
- ((IDisposable) adapter).dispose();
- setModelObject(null);
-
- System.gc();
-
- if (!reference.isEnqueued()) {
- System.runFinalization();
- }
-
- assertTrue(reference.isEnqueued());
-
- try {
- reference = referenceQueue.remove();
-
- if (null != reference) {
- reference.clear();
- }
- } catch (InterruptedException ie) {
- // do nothing
- }
- }
+// public void testDispose() {
+// ReferenceQueue referenceQueue = new ReferenceQueue();
+// Reference reference = new PhantomReference(getModelObject(),
+// referenceQueue);
+//
+// Adapter adapter = adapterFactory.adapt(getModelObject(),
+// IEditingDomainItemProvider.class);
+// adapter.setTarget(null);
+//
+// ((IDisposable) adapter).dispose();
+// setModelObject(null);
+//
+// System.gc();
+//
+// if (!reference.isEnqueued()) {
+// System.runFinalization();
+// }
+//
+// assertTrue(reference.isEnqueued());
+//
+// try {
+// reference = referenceQueue.remove();
+//
+// if (null != reference) {
+// reference.clear();
+// }
+// } catch (InterruptedException ie) {
+// // do nothing
+// }
+// }
} //ElementItemProviderTest
