svn commit: r17417 - trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java

Author: thn
Date: 2009-10-21 11:52:53-0700
New Revision: 17417

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java

Log:
UML2: fix for selection of the wrong fig for stereotypes

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&pathrev=17417&r1=17416&r2=17417
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java	2009-10-21 11:52:53-0700
@@ -662,6 +662,10 @@
         if (Model.getFacade().isAAssociation(modelElement)) {
             figNode =
                 createNaryAssociationNode(modelElement, bounds, settings);
+        } else if (Model.getFacade().isAStereotype(modelElement)) {
+            // since UML2, this must appear before the isAClass clause
+            figNode = new FigStereotypeDeclaration(modelElement, bounds, 
+                    settings);
         } else if (Model.getFacade().isAClass(modelElement)) {
             figNode = new FigClass(modelElement, bounds, settings);
         } else if (Model.getFacade().isAInterface(modelElement)) {
@@ -678,9 +682,6 @@
             figNode = new FigEnumeration(modelElement, bounds, settings);
         } else if (Model.getFacade().isADataType(modelElement)) {
             figNode = new FigDataType(modelElement, bounds, settings);
-        } else if (Model.getFacade().isAStereotype(modelElement)) {
-            figNode = new FigStereotypeDeclaration(modelElement, bounds, 
-                    settings);
         } else if (Model.getFacade().isAException(modelElement)) {
             figNode = new FigException(modelElement, bounds, settings);
         } else if (Model.getFacade().isASignal(modelElement)) {

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2409900

To unsubscribe from this discussion, e-mail: [[email protected]].