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

Author: mvw
Date: 2008-06-22 08:21:11-0700
New Revision: 15029

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

Log:
Fix for issue 5174: Wrong proppanel shown for CallState.

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&rev=15029&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java&r1=15028&r2=15029
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	2008-06-22 08:21:11-0700
@@ -312,10 +312,10 @@
     
     private PropPanelStateVertex getStateVertexPropPanel(Object element) {
         if (Model.getFacade().isAState(element)) {
-            if (Model.getFacade().isAActionState(element)) {
-                return new PropPanelActionState();
-            } else if (Model.getFacade().isACallState(element)) {
+            if (Model.getFacade().isACallState(element)) {
                 return new PropPanelCallState();
+            } else if (Model.getFacade().isAActionState(element)) {
+                return new PropPanelActionState();
             } else if (Model.getFacade().isACompositeState(element)) {
                 if (Model.getFacade().isASubmachineState(element)) {
                     if (Model.getFacade().isASubactivityState(element)) {