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

Author: bobtarling
Date: 2010-08-26 02:50:29-0700
New Revision: 18685

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

Log:
Make sure the trigger remains selected when drop down pressed on combo

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=18685&r1=18684&r2=18685
==============================================================================
--- 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 02:50:29-0700
@@ -61,6 +61,7 @@
      */
     protected void buildModelList() {
         final Object transition = getTarget();
+        Object selectedElement = getSelectedModelElement();
         removeAllElements();
         
         Object parent = Model.getFacade().getModelElementContainer(transition);
@@ -72,7 +73,6 @@
                 parent,
                 Model.getMetaTypes().getEvent());
         
-        Object selectedElement = getSelectedModelElement();
         if (selectedElement != null && !list.contains(selectedElement)) {
             // Just in case the existing selected element is from elsewhere
             // make sure it is in the list
@@ -80,7 +80,9 @@
         }
         setElements(list);
 
-        setSelectedItem(Model.getFacade().getTrigger(transition));
+        if (selectedElement != null) {
+            setSelectedItem(selectedElement);
+        }
     }
 
     protected boolean isValidElement(Object m) {

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

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