Author: bobtarling Date: 2011-07-20 16:49:30-0700 New Revision: 19615 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java
Log: Issue 6315: Allow comment placement in UML2 state diagram - submitted by Laurent Braud 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=19615&r1=19614&r2=19615 ============================================================================== --- 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 2011-07-20 16:49:30-0700 @@ -244,25 +244,26 @@ getNodes().add(node); - final Object stateMachine = getMachine(); - if (Model.getFacade().getUmlVersion().startsWith("1")) { - if (Model.getFacade().isAStateVertex(node)) { + // Don't do it for comment. + if (Model.getFacade().isAStateVertex(node)) { + final Object stateMachine = getMachine(); + if (Model.getFacade().getUmlVersion().startsWith("1")) { Object top = Model.getStateMachinesHelper().getTop(stateMachine); Model.getStateMachinesHelper().addSubvertex(top, node); - } - } else { - final List regions = - Model.getStateMachinesHelper().getRegions(stateMachine); - final Object region; - if (regions.isEmpty()) { - region = Model.getUmlFactory().buildNode( - Model.getMetaTypes().getRegion(), stateMachine); } else { - region = regions.get(0); + final List regions = + Model.getStateMachinesHelper().getRegions(stateMachine); + final Object region; + if (regions.isEmpty()) { + region = Model.getUmlFactory().buildNode( + Model.getMetaTypes().getRegion(), stateMachine); + } else { + region = regions.get(0); + } + Model.getStateMachinesHelper().setContainer(node, region); } - Model.getStateMachinesHelper().setContainer(node, region); } - + fireNodeAdded(node); } ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2799057 To unsubscribe from this discussion, e-mail: [[email protected]].
