svn commit: r18682 - trunk/src/argouml-app/src/org/argouml/uml: diagram/state/ui ui

Author: bobtarling
Date: 2010-08-24 16:27:58-0700
New Revision: 18682

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

Log:
Workaround some UML1.4 vs UML2 issues in state diagram

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=18682&r1=18681&r2=18682
==============================================================================
--- 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	2010-08-24 16:27:58-0700
@@ -398,29 +398,51 @@
      * @see org.argouml.uml.diagram.ui.UMLDiagram#getUmlActions()
      */
     protected Object[] getUmlActions() {
-        Object[] actions =
-        {
-            getActionState(),
-	    getActionCompositeState(),
-	    getActionTransition(),
-	    getActionSynchState(),
-	    getActionSubmachineState(),
-	    getActionStubState(),
-	    null,
-	    getActionStartPseudoState(),
-	    getActionFinalPseudoState(),
-	    getActionJunctionPseudoState(),
-            getActionChoicePseudoState(),
-	    getActionForkPseudoState(),
-	    getActionJoinPseudoState(),
-	    getActionShallowHistoryPseudoState(),
-	    getActionDeepHistoryPseudoState(),
-            null,
-            getTriggerActions(),
-            getActionGuard(),
-            getEffectActions(),
-        };
-        return actions;
+        if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+            Object[] actions =
+            {
+                getActionState(),
+                getActionCompositeState(),
+                getActionTransition(),
+                getActionSynchState(),
+                getActionSubmachineState(),
+                getActionStubState(),
+                null,
+                getActionStartPseudoState(),
+                getActionFinalPseudoState(),
+                getActionJunctionPseudoState(),
+                getActionChoicePseudoState(),
+                getActionForkPseudoState(),
+                getActionJoinPseudoState(),
+                getActionShallowHistoryPseudoState(),
+                getActionDeepHistoryPseudoState(),
+                null,
+                getTriggerActions(),
+                getActionGuard(),
+                getEffectActions(),
+            };
+            return actions;
+        } else {
+            Object[] actions =
+            {
+                getActionState(),
+                getActionTransition(),
+                null,
+                getActionStartPseudoState(),
+                getActionFinalPseudoState(),
+                getActionJunctionPseudoState(),
+                getActionChoicePseudoState(),
+                getActionForkPseudoState(),
+                getActionJoinPseudoState(),
+                getActionShallowHistoryPseudoState(),
+                getActionDeepHistoryPseudoState(),
+                null,
+                getTriggerActions(),
+                getActionGuard(),
+                getEffectActions(),
+            };
+            return actions;
+        }
     }
 
     protected Object[] getTriggerActions() {
@@ -568,10 +590,17 @@
      */
     protected Action getActionState() {
         if (actionState == null) {
-            actionState =
-                new RadioAction(
-                        new CmdCreateNode(Model.getMetaTypes().getSimpleState(),
-                                	  "button.new-simplestate"));
+            if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+                actionState =
+                    new RadioAction(
+                            new CmdCreateNode(Model.getMetaTypes().getSimpleState(),
+                                              "button.new-simplestate"));
+            } else {
+                actionState =
+                    new RadioAction(
+                            new CmdCreateNode(Model.getMetaTypes().getState(),
+                                              "button.new-simplestate"));
+            }
         }
         return actionState;
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java?view=diff&pathrev=18682&r1=18681&r2=18682
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java	2010-08-24 16:27:58-0700
@@ -108,8 +108,11 @@
               }
             }
             Model.getCoreHelper().setNamespace(machine, namespace);
-            Model.getStateMachinesFactory()
+            
+            if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+                Model.getStateMachinesFactory()
                     .buildCompositeStateOnStateMachine(machine);
+            }
         }
         return machine;
     }

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

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