svn commit: r14236 - trunk/src/model/src/org/argouml/model

Author: tfmorris
Date: 2008-03-27 09:03:16-0700
New Revision: 14236

Modified:
   trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java
   trunk/src/model/src/org/argouml/model/CoreHelper.java

Log:
Add method to get names of all meta datatypes & use in metatype combo box

Update Javadoc for getAllMetatypeNames to match implemented behavior.

Modified: trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java?view=diff&rev=14236&p1=trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java&p2=trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java&r1=14235&r2=14236
==============================================================================
--- trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java	(original)
+++ trunk/src/model/src/org/argouml/model/AbstractCoreHelperDecorator.java	2008-03-27 09:03:16-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2007 The Regents of the University of California. All
+// Copyright (c) 2005-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -658,4 +658,8 @@
     public Collection getAllMetatypeNames() {
         return impl.getAllMetatypeNames();
     }
+
+    public Collection getAllMetaDatatypeNames() {
+        return impl.getAllMetaDatatypeNames();
+    }
 }

Modified: trunk/src/model/src/org/argouml/model/CoreHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/CoreHelper.java?view=diff&rev=14236&p1=trunk/src/model/src/org/argouml/model/CoreHelper.java&p2=trunk/src/model/src/org/argouml/model/CoreHelper.java&r1=14235&r2=14236
==============================================================================
--- trunk/src/model/src/org/argouml/model/CoreHelper.java	(original)
+++ trunk/src/model/src/org/argouml/model/CoreHelper.java	2008-03-27 09:03:16-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2007 The Regents of the University of California. All
+// Copyright (c) 2005-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -1436,8 +1436,7 @@
     void setEnumerationLiterals(Object enumeration, List literals);
     
     /**
-     * Returns names of all metatypes in metamodel, including datatypes
-     * and primitive types.
+     * Returns names of all metatypes in metamodel.
      * 
      * TODO: This method rightly belongs in a separate interface dealing
      * with instances of MOF types as opposed to UML types like all the
@@ -1447,4 +1446,15 @@
      */
     Collection<String> getAllMetatypeNames();
 
+    /**
+     * Returns names of all metamodel value elements including datatypes,
+     * enumerations, and primitive types.
+     * 
+     * TODO: This method rightly belongs in a separate interface dealing
+     * with instances of MOF types as opposed to UML types like all the
+     * rest of the methods here do.
+     * 
+     * @return Collection containing Strings with names of all metatypes
+     */
+    Collection<String> getAllMetaDatatypeNames();
 }