svn commit: r19415 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui

Author: bobtarling
Date: 2011-05-13 01:15:05-0700
New Revision: 19415

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:
UML2 does have internal transitions

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=19415&r1=19414&r2=19415
==============================================================================
--- 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-13 01:15:05-0700
@@ -65,8 +65,7 @@
     protected void buildModelList() {
         ArrayList c =
             new ArrayList(Model.getFacade().getIncomings(getTarget()));
-        if (Model.getFacade().getUmlVersion().startsWith("1")
-        	&& Model.getFacade().isAState(getTarget())) {
+        if (Model.getFacade().isAState(getTarget())) {
             ArrayList i =
                 new ArrayList(
                         Model.getFacade().getInternalTransitions(getTarget()));
@@ -81,8 +80,7 @@
     protected boolean isValidElement(Object element) {
         ArrayList c =
             new ArrayList(Model.getFacade().getIncomings(getTarget()));
-        if (Model.getFacade().getUmlVersion().startsWith("1")
-        	&& Model.getFacade().isAState(getTarget())) {
+        if (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=19415&r1=19414&r2=19415
==============================================================================
--- 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-13 01:15:05-0700
@@ -65,8 +65,7 @@
     protected void buildModelList() {
         ArrayList c =
             new ArrayList(Model.getFacade().getOutgoings(getTarget()));
-        if (Model.getFacade().getUmlVersion().startsWith("1")
-        	&& Model.getFacade().isAState(getTarget())) {
+        if (Model.getFacade().isAState(getTarget())) {
             ArrayList i =
                 new ArrayList(
                         Model.getFacade().getInternalTransitions(getTarget()));
@@ -81,8 +80,7 @@
     protected boolean isValidElement(Object element) {
         ArrayList c =
             new ArrayList(Model.getFacade().getOutgoings(getTarget()));
-        if (Model.getFacade().getUmlVersion().startsWith("1")
-        	&& Model.getFacade().isAState(getTarget())) {
+        if (Model.getFacade().isAState(getTarget())) {
             ArrayList i =
                 new ArrayList(
                         Model.getFacade().getInternalTransitions(getTarget()));

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

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