Author: bobtarling Date: 2011-05-13 01:15:48-0700 New Revision: 19416 Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/StateBodyNotation.java trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java
Log: UML2 does have internal transitions Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/StateBodyNotation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/StateBodyNotation.java?view=diff&pathrev=19416&r1=19415&r2=19416 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/notation/providers/StateBodyNotation.java (original) +++ trunk/src/argouml-app/src/org/argouml/notation/providers/StateBodyNotation.java 2011-05-13 01:15:48-0700 @@ -66,12 +66,10 @@ public void initialiseListener(Object modelElement) { addElementListener(modelElement); // register for internal transitions: - if (Model.getFacade().getUmlVersion().startsWith("1")) { - Iterator it = - Model.getFacade().getInternalTransitions(modelElement).iterator(); - while (it.hasNext()) { - NotationUtilityProviders.addListenersForTransition(this, it.next()); - } + Iterator it = + Model.getFacade().getInternalTransitions(modelElement).iterator(); + while (it.hasNext()) { + NotationUtilityProviders.addListenersForTransition(this, it.next()); } // register for the doActivity etc. Object doActivity = Model.getFacade().getDoActivity(modelElement); Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java?view=diff&pathrev=19416&r1=19415&r2=19416 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java (original) +++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/StateBodyNotationUml.java 2011-05-13 01:15:48-0700 @@ -126,18 +126,16 @@ } s.append("exit /").append(exitStr); } - if (Model.getFacade().getUmlVersion().startsWith("1")) { - Collection internaltrans = - Model.getFacade().getInternalTransitions(modelElement); - if (internaltrans != null) { - for (Object trans : internaltrans) { - if (s.length() > 0) { - s.append("\n"); - } - /* TODO: Is this a good way of handling nested notation? */ - s.append((new TransitionNotationUml(trans)).toString(trans, - settings)); + Collection internaltrans = + Model.getFacade().getInternalTransitions(modelElement); + if (internaltrans != null) { + for (Object trans : internaltrans) { + if (s.length() > 0) { + s.append("\n"); } + /* TODO: Is this a good way of handling nested notation? */ + s.append((new TransitionNotationUml(trans)).toString(trans, + settings)); } } return s.toString(); Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java?view=diff&pathrev=19416&r1=19415&r2=19416 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java 2011-05-13 01:15:48-0700 @@ -405,8 +405,8 @@ if (Model.getFacade().getUmlVersion().startsWith("1")) { packagePerspective.addRule(new GoStateMachineToState()); packagePerspective.addRule(new GoCompositeStateToSubvertex()); - packagePerspective.addRule(new GoStateToInternalTrans()); } + packagePerspective.addRule(new GoStateToInternalTrans()); packagePerspective.addRule(new GoStateToDoActivity()); packagePerspective.addRule(new GoStateToEntry()); packagePerspective.addRule(new GoStateToExit()); @@ -593,13 +593,13 @@ new GoTransitiontoEffect(), new GoTransitionToGuard(), new GoUseCaseToExtensionPoint(), new GoSubmachineStateToStateMachine(), + new GoStateToInternalTrans() }; // TODO: We need a factory pattern for GoXXX classes that can determine if they are required PerspectiveRule[] ruleNamesArray14 = { new GoCompositeStateToSubvertex(), new GoStateMachineToState(), - new GoStateToInternalTrans() }; PerspectiveRule[] ruleNamesArray2 = { ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2735284 To unsubscribe from this discussion, e-mail: [[email protected]].
