svn commit: r13595 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2007-09-26 11:16:06-0700
New Revision: 13595

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

Log:
Add support for tagType other than String on TagDefinitions as requested by Sérgio Adriano Fernandes Lopes on the dev list

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java?view=diff&rev=13595&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&r1=13594&r2=13595
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java	2007-09-26 11:16:06-0700
@@ -327,9 +327,13 @@
         // TODO: required tags
     }
 
+    public TagDefinition buildTagDefinition(String name, Object owner, 
+            Object namespace) {
+        return buildTagDefinition(name, owner, namespace, "String");
+    }
 
-    public TagDefinition buildTagDefinition(String text, Object owner, 
-            Object ns) {
+    public TagDefinition buildTagDefinition(String name, Object owner, 
+            Object ns, String tagType) {
         if (owner != null) {
             if (!(owner instanceof Stereotype)) {
                 throw new IllegalArgumentException("owner: " + owner);
@@ -348,10 +352,10 @@
         } else {
             coreHelper.setNamespace(td, ns);
         }
-        coreHelper.setName(td, text);
+        coreHelper.setName(td, name);
         coreHelper.setMultiplicity(td, org.argouml.model.Model
                 .getDataTypesFactory().createMultiplicity(0, 1));
-        td.setTagType("String");
+        td.setTagType(tagType);
         return td;
     }
 

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=13595&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=13594&r2=13595
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	2007-09-26 11:16:06-0700
@@ -554,6 +554,15 @@
                 + " or taggedValues: " + taggedValues);
     }
 
+    public void setTagType(Object handle, String tagType) {
+        if (handle instanceof TagDefinition) {
+            // TODO: What type of validation can we do here on tagType?
+            ((TagDefinition) handle).setTagType(tagType);
+            return;
+        }
+        throw new IllegalArgumentException("handle: " + handle
+                + " or tagType: " + tagType);
+    }
 
     public void setType(Object handle, Object type) {
         if (type == null || type instanceof TagDefinition) {