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

Author: tfmorris
Date: 2007-06-10 08:55:40-0700
New Revision: 12809

Modified:
   trunk/src/model/src/org/argouml/model/CoreFactory.java
   trunk/src/model/src/org/argouml/model/Facade.java

Log:
Add PrimitiveType.  Deprecate Primitive & ProgrammingLanguageDataType.

Modified: trunk/src/model/src/org/argouml/model/CoreFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/CoreFactory.java?view=diff&rev=12809&p1=trunk/src/model/src/org/argouml/model/CoreFactory.java&p2=trunk/src/model/src/org/argouml/model/CoreFactory.java&r1=12808&r2=12809
==============================================================================
--- trunk/src/model/src/org/argouml/model/CoreFactory.java	(original)
+++ trunk/src/model/src/org/argouml/model/CoreFactory.java	2007-06-10 08:55:40-0700
@@ -224,14 +224,30 @@
      * 
      * @since UML 1.4
      * @return an initialized UML Primitive instance.
+     * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. Use
+     *             {@link #createPrimitiveType()}. This can be scheduled for
+     *             speedy removal since it was just introduced with UML 1.4 and
+     *             is unused by ArgoUML.
      */
     public Object createPrimitive();
 
+    
+    /**
+     * Create a UML PrimitiveType.
+     * 
+     * @since UML 2.1.1
+     * @return an initialized UML Primitive instance.
+     */
+    public Object createPrimitiveType();
+    
     /**
      * Create a UML ProgrammingLanguageDataType.
      * 
      * @since UML 1.4
-     * @return an initialized ProgrammingLanguageDataType
+     * @return an initialized ProgrammingLanguageDataType *
+     * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. This can be
+     *             scheduled for speedy removal since it was just introduced
+     *             with UML 1.4 and is unused by ArgoUML.
      */
     public Object createProgrammingLanguageDataType();
 

Modified: trunk/src/model/src/org/argouml/model/Facade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model/src/org/argouml/model/Facade.java?view=diff&rev=12809&p1=trunk/src/model/src/org/argouml/model/Facade.java&p2=trunk/src/model/src/org/argouml/model/Facade.java&r1=12808&r2=12809
==============================================================================
--- trunk/src/model/src/org/argouml/model/Facade.java	(original)
+++ trunk/src/model/src/org/argouml/model/Facade.java	2007-06-10 08:55:40-0700
@@ -495,6 +495,7 @@
      *
      * @param handle candidate
      * @return true if handle is an ArgListsExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isAArgListsExpression(Object handle);
     
@@ -503,6 +504,7 @@
      *
      * @param handle candidate
      * @return true if handle is an BooleanExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isABooleanExpression(Object handle);
     
@@ -511,6 +513,7 @@
      *
      * @param handle candidate
      * @return true if handle is an IterationExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isAIterationExpression(Object handle);
     
@@ -519,6 +522,7 @@
      *
      * @param handle candidate
      * @return true if handle is an MappingExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isAMappingExpression(Object handle);
     
@@ -527,6 +531,7 @@
      *
      * @param handle candidate
      * @return true if handle is an ObjectSetExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isAObjectSetExpression(Object handle);
     /**
@@ -534,6 +539,7 @@
      *
      * @param handle candidate
      * @return true if handle is an ProcedureExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isAProcedureExpression(Object handle);
     
@@ -542,6 +548,7 @@
      *
      * @param handle candidate
      * @return true if handle is an TimeExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isATimeExpression(Object handle);
     
@@ -550,6 +557,7 @@
      *
      * @param handle candidate
      * @return true if handle is an TypeExpression
+     * @deprecated for 0.25.4 by tfmorris.  Removed from UML 2.x.
      */
     boolean isATypeExpression(Object handle);
 
@@ -826,21 +834,34 @@
 
     /**
      * Recognizer for Primitive.
-     *
-     * @param handle candidate
+     * 
+     * @param handle
+     *            candidate
      * @return true if handle is a Primitive
+     * @deprecated for 0.25.4 by tfmorris. Renamed in UML 2.x. Use
+     *             {@link #isAPrimitiveType(Object).
      */
     boolean isAPrimitive(Object handle);
 
     /**
-     * Recognizer for ProgrammingLanguageDataType.
+     * Recognizer for PrimitiveType.
      *
      * @param handle candidate
+     * @return true if handle is a Primitive
+     */
+    boolean isAPrimitiveType(Object handle);
+    
+    /**
+     * Recognizer for ProgrammingLanguageDataType.
+     * 
+     * @param handle
+     *            candidate
      * @return true if handle is a ProgrammingLanguageDataType
+     * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. Use
+     *             {@link #isAPrimitiveType(Object).
      */
     boolean isAProgrammingLanguageDataType(Object handle);
-    
-    
+
     /**
      * Recognizer for Pseudostate.
      *