svn commit: r18943 - trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java

Author: bobtarling
Date: 2010-12-21 14:52:31-0800
New Revision: 18943

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

Log:
Issue 6170: Remove restriction on drawing transition

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java?view=diff&pathrev=18943&r1=18942&r2=18943
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java	2010-12-21 14:52:31-0800
@@ -195,17 +195,7 @@
         Object end0 = null;
         Object end1 = null;
 
-        if (Model.getFacade().isATransition(edge)) {
-            end0 = Model.getFacade().getSource(edge);
-            end1 = Model.getFacade().getTarget(edge);
-            // it's not allowed to directly draw a transition
-            // from a composite state to one of it's substates.
-            if (Model.getFacade().isACompositeState(end0)
-                    && Model.getStateMachinesHelper().getAllSubStates(end0)
-                                                        .contains(end1)) {
-                return false;
-            }
-        } else if (edge instanceof CommentEdge) {
+        if (edge instanceof CommentEdge) {
             end0 = ((CommentEdge) edge).getSource();
             end1 = ((CommentEdge) edge).getDestination();
         } else {

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

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