svn commit: r17411 - trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java

Author: thn
Date: 2009-10-19 09:56:15-0700
New Revision: 17411

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java

Log:
UML2: fix for selection of the wrong prop panel

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java?view=diff&pathrev=17411&r1=17410&r2=17411
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	2009-10-19 09:56:15-0700
@@ -125,8 +125,6 @@
             // the classifier check
             if (Model.getFacade().isASubsystem(element)) {
                 return new PropPanelSubsystem();
-            } else if (Model.getFacade().isAClassifier(element)) {
-                return getClassifierPropPanel(element);
             } else if (Model.getFacade().isARelationship(element)) {
                 return getRelationshipPropPanel(element);
             } else if (Model.getFacade().isAStateVertex(element)) {
@@ -218,6 +216,9 @@
                 return new PropPanelTimeEvent();
             } else if (Model.getFacade().isADependency(element)) {
                 return new PropPanelDependency();
+            } else if (Model.getFacade().isAClassifier(element)) {
+                // in UML2 many things are a classifier, so this is the last:
+                return getClassifierPropPanel(element);
             }
             throw new IllegalArgumentException("Unsupported Element type "
                     + element.getClass().getName());

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

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