svn commit: r13882 - trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java

Author: tfmorris
Date: 2007-12-08 02:10:18-0800
New Revision: 13882

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java

Log:
Issue 4936 - add PrimitiveTypes and DataTypes to the UML metatypes returned so that they can be used for TagDefinition types.

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=13882&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=13881&r2=13882
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java	2007-12-08 02:10:18-0800
@@ -3146,17 +3146,33 @@
 
     public Collection<String> getAllMetatypeNames() {
         Set<String> names = new HashSet<String>();
-        for (Iterator iter =
-                modelImpl.getModelPackage().getMofClass().refAllOfClass()
-                    .iterator();
-            iter.hasNext();) {
-            String name =
-                ((javax.jmi.model.ModelElement) iter.next()).getName();
-            if (names.contains(name)) {
+        for (Object element : modelImpl.getModelPackage().getMofClass()
+                .refAllOfClass()) {
+            String name = ((javax.jmi.model.ModelElement) element).getName();
+            if (names.add(name)) {
+                LOG.debug(" Class " + name);
+            } else {
                 LOG.error("Found duplicate class " + name + " in metamodel");
+            }
+        }
+        for (Object element : modelImpl.getModelPackage().getDataType()
+                .refAllOfClass()) {
+            String name = ((javax.jmi.model.DataType) element).getName();
+            if (names.add(name)) {
+                LOG.debug(" DataType " + name);
             } else {
-                names.add(name);
-                LOG.debug(" Class " + name);
+                LOG.error("Found duplicate datatype " + name + " in metamodel");
+            }
+        }
+        // String, Integer, Long, Float, Double, etc
+        for (Object element : modelImpl.getModelPackage().getPrimitiveType()
+                .refAllOfClass()) {
+            String name = ((javax.jmi.model.PrimitiveType) element).getName();
+            if (names.add(name)) {
+                LOG.debug(" PrimitiveType " + name);
+            } else {
+                LOG.error("Found duplicate primitive type " + name 
+                        + " in metamodel");
             }
         }
         return names;