[139299] Moving proxy resolution from resource handler to editor.
diff --git a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
index 22a74b7..e7ea981 100644
--- a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
+++ b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UMLEditor.java,v 1.14 2006/04/26 15:48:55 khussey Exp $
+ * $Id: UMLEditor.java,v 1.15 2006/04/28 20:21:14 khussey Exp $
*/
package org.eclipse.uml2.uml.editor.presentation;
@@ -59,6 +59,7 @@
import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import java.io.IOException;
@@ -839,6 +840,8 @@
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
}
+
+ EcoreUtil.resolveAll(resource);
}
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java
index 9f531cf..bb1ea11 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UML22UMLResourceHandler.java,v 1.14 2006/04/28 20:00:11 khussey Exp $
+ * $Id: UML22UMLResourceHandler.java,v 1.15 2006/04/28 20:21:09 khussey Exp $
*/
package org.eclipse.uml2.uml.resource;
@@ -1302,7 +1302,5 @@
for (Iterator atr = annotationsToRemove.iterator(); atr.hasNext();) {
((EAnnotation) atr.next()).setEModelElement(null);
}
-
- EcoreUtil.resolveAll(resource);
}
}
