svn commit: r19404 - trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java

Author: bobtarling
Date: 2011-05-11 08:11:48-0700
New Revision: 19404

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java

Log:
Don't allow a composite state to be drawn in UML2 (a state becomes composite when a region is added to it)

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&pathrev=19404&r1=19403&r2=19404
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java	2011-05-11 08:11:48-0700
@@ -403,7 +403,9 @@
         ArrayList actions = new ArrayList();
         
         actions.add(getActionState());
-        actions.add(getActionCompositeState());
+        if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+            actions.add(getActionCompositeState());
+        }
         actions.add(getActionTransition());
         
         if (Model.getFacade().getUmlVersion().charAt(0) == '1') {

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

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