[155073] Fixing issues with interchanging standard stereotype applications.
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 63760fd..8c69d9a 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.24 2006/05/16 13:08:37 khussey Exp $
+ * $Id: UMLEditor.java,v 1.24.2.1 2006/08/24 18:08:46 khussey Exp $
*/
package org.eclipse.uml2.uml.editor.presentation;
@@ -181,6 +181,7 @@
import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;
import org.eclipse.uml2.uml.resource.UML22UMLResource;
import org.eclipse.uml2.uml.resource.UMLResource;
+import org.eclipse.uml2.uml.resource.XMI2UMLExtendedMetaData;
import org.eclipse.uml2.uml.resource.XMI2UMLResource;
/**
@@ -903,8 +904,10 @@
extensionToFactoryMap.put(XMI2UMLResource.FILE_EXTENSION,
XMI2UMLResource.Factory.INSTANCE);
- Map uriMap = UML22UMLExtendedMetaData.getURIMap();
- resourceSet.getURIConverter().getURIMap().putAll(uriMap);
+ Map uriMap = resourceSet.getURIConverter().getURIMap();
+
+ uriMap.putAll(UML22UMLExtendedMetaData.getURIMap());
+ uriMap.putAll(XMI2UMLExtendedMetaData.getURIMap());
createModelGen();
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 73ec765..2f3f0c5 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.26.2.1 2006/07/10 18:28:25 khussey Exp $
+ * $Id: UML22UMLResourceHandler.java,v 1.26.2.2 2006/08/24 18:08:47 khussey Exp $
*/
package org.eclipse.uml2.uml.resource;
@@ -517,7 +517,7 @@
.getEObject((String) value);
if (eObject instanceof NamedElement) {
- events.add((NamedElement) eObject);
+ events.add(eObject);
firstEvents.add(isFirstEvent);
}
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLExtendedMetaData.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLExtendedMetaData.java
index 1e8ad93..872c27a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLExtendedMetaData.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLExtendedMetaData.java
@@ -8,10 +8,14 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: XMI2UMLExtendedMetaData.java,v 1.1 2006/04/26 15:48:53 khussey Exp $
+ * $Id: XMI2UMLExtendedMetaData.java,v 1.1.2.1 2006/08/24 18:08:47 khussey Exp $
*/
package org.eclipse.uml2.uml.resource;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
import org.eclipse.uml2.uml.UMLPackage;
@@ -19,6 +23,20 @@
public class XMI2UMLExtendedMetaData
extends BasicExtendedMetaData {
+ protected static Map uriMap = null;
+
+ public static Map getURIMap() {
+
+ if (uriMap == null) {
+ uriMap = new HashMap();
+
+ uriMap.put(URI.createURI(XMI2UMLResource.STANDARD_PROFILE_URI), URI
+ .createURI(UMLResource.STANDARD_PROFILE_URI));
+ }
+
+ return uriMap;
+ }
+
public XMI2UMLExtendedMetaData(EPackage.Registry registry) {
super(registry);
}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLResource.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLResource.java
index 46db065..c152a00 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLResource.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/XMI2UMLResource.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: XMI2UMLResource.java,v 1.1 2006/04/26 15:48:53 khussey Exp $
+ * $Id: XMI2UMLResource.java,v 1.1.2.1 2006/08/24 18:08:47 khussey Exp $
*/
package org.eclipse.uml2.uml.resource;
@@ -35,7 +35,7 @@
String UML_METAMODEL_URI = "http://schema.omg.org/spec/UML/2.1/uml.xml"; //$NON-NLS-1$
- String UML_PRIMITIVE_TYPES_LIBRARY_URI = UML_METAMODEL_URI; //$NON-NLS-1$
+ String UML_PRIMITIVE_TYPES_LIBRARY_URI = UML_METAMODEL_URI;
String XMI_NS_URI = XMI_NAMESPACE_PREFIX + "2.1"; //$NON-NLS-1$
