svn commit: r15436 - trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java

Author: mvw
Date: 2008-08-01 05:30:27-0700
New Revision: 15436

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java

Log:
Issue #5277: this is a potential fix for this issue - but I have no proof. 

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java?view=diff&rev=15436&p1=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java&p2=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java&r1=15435&r2=15436
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/TransitionNotationUml.java	2008-08-01 05:30:27-0700
@@ -272,7 +272,15 @@
                         /* Just change the ChangeExpression */
                         Object changeExpr = 
                             Model.getFacade().getChangeExpression(evt);
-                        Model.getDataTypesHelper().setBody(changeExpr, s);
+                        if (changeExpr == null) {
+                            /* Create a new expression: */
+                            changeExpr = Model.getDataTypesFactory()
+                                .createBooleanExpression("", s);
+                            Model.getStateMachinesHelper().setExpression(evt, 
+                                    changeExpr);
+                        } else {
+                            Model.getDataTypesHelper().setBody(changeExpr, s);
+                        }
                     } else {
                         /* The parsed text describes a change-event,
                          * but the model contains another type! */
@@ -429,17 +437,18 @@
                 effect =
                     Model.getCommonBehaviorFactory()
                         .createCallAction();
+                /* And hook it to the transition immediately,
+                 * so that an exception can not cause it to remain dangling: */
+                Model.getStateMachinesHelper().setEffect(trans, effect);
                 Model.getCommonBehaviorHelper().setScript(effect,
                         Model.getDataTypesFactory()
                                 .createActionExpression(""/*language*/,
                                                         actions));
                 Model.getCoreHelper().setName(effect, "anon");
-                Model.getStateMachinesHelper().setEffect(trans, effect);
             } else { // case 2
                 Object script = Model.getFacade().getScript(effect);
                 String language = (script == null) ? null
-                        : Model.getDataTypesHelper().getLanguage(
-                            Model.getFacade().getScript(effect));
+                        : Model.getDataTypesHelper().getLanguage(script);
                 Model.getCommonBehaviorHelper().setScript(effect,
                         Model.getDataTypesFactory()
                                 .createActionExpression(language, actions));