svn commit: r19215 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java

Author: bobtarling
Date: 2011-04-11 07:22:24-0700
New Revision: 19215

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java

Log:
Allow a submachine to be set to null

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java?view=diff&pathrev=19215&r1=19214&r2=19215
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	2011-04-11 07:22:24-0700
@@ -220,7 +220,8 @@
     public void setStatemachineAsSubmachine(Object oSubmachineState,
             Object oStatemachine) {
         if (oSubmachineState instanceof SubmachineState
-                && oStatemachine instanceof StateMachine) {
+                && (oStatemachine instanceof StateMachine
+                        || oStatemachine == null)) {
             SubmachineState mss = (SubmachineState) oSubmachineState;
             mss.setSubmachine((StateMachine) oStatemachine);
             return;

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

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