svn commit: r14417 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java

Author: bobtarling
Date: 2008-04-20 05:34:29-0700
New Revision: 14417

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

Log:
Use UmlException instead of Exception.

Some other minor tidying.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&rev=14417&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&r1=14416&r2=14417
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	2008-04-20 05:34:29-0700
@@ -319,7 +319,7 @@
        
         validContainmentMap.clear();
 
-        validContainmentMap.put(ModelElement.class, 
+        validContainmentMap.put(ModelElement.class,
                 new Class<?>[] {
                     Stereotype.class
                 });
@@ -338,7 +338,7 @@
                 Interface.class, Component.class,
                 Node.class,
                 Enumeration.class, DataType.class,
-                Exception.class, Signal.class
+                UmlException.class, Signal.class
             });
                 
         // specifies valid elements for a class to contain
@@ -356,22 +356,22 @@
         
         // specifies valid elements for an Actor to contain
         validContainmentMap.put(Actor.class, 
-            new Class<?>[] { 
-                Reception.class
-            });
+                new Class<?>[] { 
+                    Reception.class
+                });
         
         // specifies valid elements for a Use Case to contain
         validContainmentMap.put(UseCase.class, 
-            new Class<?>[] { 
-                ExtensionPoint.class, Attribute.class, 
-                Operation.class, Reception.class
-            });
+                new Class<?>[] { 
+                    ExtensionPoint.class, Attribute.class, 
+                    Operation.class, Reception.class
+                });
         
         // specifies valid elements for a Component to contain
         validContainmentMap.put(Component.class, 
-            new Class<?>[] { 
-                Reception.class
-            });
+                new Class<?>[] { 
+                    Reception.class
+                });
         
         // specifies valid elements for a Node to contain
         validContainmentMap.put(Node.class, 
@@ -390,6 +390,12 @@
                 new Class<?>[] { 
                     Operation.class 
                 });
+        
+        // specifies valid elements for a Attribute to contain
+        validContainmentMap.put(Operation.class, 
+                new Class<?>[] { 
+                    Parameter.class
+                });
     }
         
     public Object buildConnection(Object elementType, Object fromElement,