Author: bobtarling Date: 2011-05-07 07:18:36-0700 New Revision: 19371 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexIncomingListModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexOutgoingListModel.java
Log: Ignore internal transitions in UML2 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexIncomingListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexIncomingListModel.java?view=diff&pathrev=19371&r1=19370&r2=19371 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexIncomingListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexIncomingListModel.java 2011-05-07 07:18:36-0700 @@ -65,7 +65,8 @@ protected void buildModelList() { ArrayList c = new ArrayList(Model.getFacade().getIncomings(getTarget())); - if (Model.getFacade().isAState(getTarget())) { + if (Model.getFacade().getUmlVersion().startsWith("1") + && Model.getFacade().isAState(getTarget())) { ArrayList i = new ArrayList( Model.getFacade().getInternalTransitions(getTarget())); @@ -80,7 +81,8 @@ protected boolean isValidElement(Object element) { ArrayList c = new ArrayList(Model.getFacade().getIncomings(getTarget())); - if (Model.getFacade().isAState(getTarget())) { + if (Model.getFacade().getUmlVersion().startsWith("1") + && Model.getFacade().isAState(getTarget())) { ArrayList i = new ArrayList( Model.getFacade().getInternalTransitions(getTarget())); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexOutgoingListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexOutgoingListModel.java?view=diff&pathrev=19371&r1=19370&r2=19371 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexOutgoingListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateVertexOutgoingListModel.java 2011-05-07 07:18:36-0700 @@ -65,7 +65,8 @@ protected void buildModelList() { ArrayList c = new ArrayList(Model.getFacade().getOutgoings(getTarget())); - if (Model.getFacade().isAState(getTarget())) { + if (Model.getFacade().getUmlVersion().startsWith("1") + && Model.getFacade().isAState(getTarget())) { ArrayList i = new ArrayList( Model.getFacade().getInternalTransitions(getTarget())); @@ -80,7 +81,8 @@ protected boolean isValidElement(Object element) { ArrayList c = new ArrayList(Model.getFacade().getOutgoings(getTarget())); - if (Model.getFacade().isAState(getTarget())) { + if (Model.getFacade().getUmlVersion().startsWith("1") + && Model.getFacade().isAState(getTarget())) { ArrayList i = new ArrayList( Model.getFacade().getInternalTransitions(getTarget())); ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2732357 To unsubscribe from this discussion, e-mail: [[email protected]].
