Index: mdr/extras/uml2mof/build.xml
===================================================================
RCS file: /cvs/mdr/extras/uml2mof/build.xml,v
retrieving revision 1.9
diff -u -r1.9 build.xml
--- mdr/extras/uml2mof/build.xml 25 Apr 2005 13:00:29 -0000 1.9
+++ mdr/extras/uml2mof/build.xml 27 Jun 2005 23:01:49 -0000
@@ -23,7 +23,7 @@
-
+
Index: mdr/extras/uml2mof/src/org/netbeans/lib/jmi/uml2mof/Transformer.java
===================================================================
RCS file: /cvs/mdr/extras/uml2mof/src/org/netbeans/lib/jmi/uml2mof/Transformer.java,v
retrieving revision 1.15
diff -u -r1.15 Transformer.java
--- mdr/extras/uml2mof/src/org/netbeans/lib/jmi/uml2mof/Transformer.java 2 Aug 2004 09:15:21 -0000 1.15
+++ mdr/extras/uml2mof/src/org/netbeans/lib/jmi/uml2mof/Transformer.java 27 Jun 2005 23:01:49 -0000
@@ -78,8 +78,6 @@
private final org.omg.uml.UmlPackage uml;
// target extent
private final ModelPackage mof;
- // cache of all stereotypes used in model
- private final HashMap stereotypes = new HashMap();
// mapped elements (used for late resolution of supertypes, types and imports) (key=source, value=target)
private final HashMap elements = new HashMap();
// imports that should be resolved (key=imported element, value=list of imports)
@@ -106,11 +104,6 @@
private Transformer(org.omg.uml.UmlPackage uml, ModelPackage mof) {
this.uml = uml;
this.mof = mof;
- // cache all the stereotypes
- for (Iterator it = uml.getCore().getStereotype().refAllOfClass().iterator(); it.hasNext();) {
- Stereotype temp = (Stereotype) it.next();
- stereotypes.put(temp.getName(), temp);
- }
}
public static void execute(org.omg.uml.UmlPackage uml, ModelPackage mof) {
@@ -657,7 +650,17 @@
}
private boolean isOfType(ModelElement element, String stereotype) {
- return element.getStereotype().contains(stereotypes.get(stereotype));
+ Iterator i = element.getStereotype().iterator();
+
+ while (i.hasNext())
+ {
+ Stereotype s = (Stereotype)i.next();
+
+ if (s.getName().equals(stereotype))
+ return true;
+ }
+
+ return false;
}
private javax.jmi.model.Classifier mapType(ModelElement element, Object obj) {