svn commit: r18686 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerComboBoxModel.java

Author: mvw
Date: 2010-08-26 10:42:52-0700
New Revision: 18686

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerComboBoxModel.java

Log:
Correction for the commit Bob did for issue 6134.
This works more exactly in case of nested classes.
Use the StateMachinesHelper function - see example in TransitionNotationUml.

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerComboBoxModel.java?view=diff&pathrev=18686&r1=18685&r2=18686
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerComboBoxModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLTransitionTriggerComboBoxModel.java	2010-08-26 10:42:52-0700
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *    Bob Tarling
+ *    Michiel van der Wulp
  *****************************************************************************/
 
 package org.argouml.core.propertypanels.ui;
@@ -15,11 +16,9 @@
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import javax.swing.Action;
-import javax.swing.event.ChangeEvent;
 
 import org.argouml.model.Model;
 import org.argouml.ui.ActionCreateContainedModelElement;
@@ -63,11 +62,10 @@
         final Object transition = getTarget();
         Object selectedElement = getSelectedModelElement();
         removeAllElements();
-        
-        Object parent = Model.getFacade().getModelElementContainer(transition);
-        if (!Model.getFacade().isAPackage(parent)) {
-            parent = Model.getFacade().getModelElementContainer(parent);
-        }
+
+        Object parent =
+            Model.getStateMachinesHelper()
+                .findNamespaceForEvent(transition, null);
         final Collection list =
             Model.getModelManagementHelper().getAllModelElementsOfKind(
                 parent,

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

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