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

Author: bobtarling
Date: 2010-08-27 09:19:23-0700
New Revision: 18689

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

Log:
Fix all lazy load combos in a consistent manner so that they don't lose there current selcted value when the user hits the dropdown icon

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java?view=diff&pathrev=18689&r1=18688&r2=18689
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLComboBoxModel.java	2010-08-27 09:19:23-0700
@@ -727,6 +727,8 @@
 
     public void popupMenuWillBecomeVisible(PopupMenuEvent ev) {
         if (isLazy() && !modelValid && !processingWillBecomeVisible) {
+            Object selectedElement = getSelectedModelElement();
+            
             buildModelListTimed();
             modelValid = true;
             // We should be able to just do the above, but Swing has already
@@ -740,6 +742,9 @@
             } finally {
                 processingWillBecomeVisible = false;
             }
+            if (selectedElement != null) {
+                setSelectedItem(selectedElement);
+            }
         }
     }
     

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java?view=diff&pathrev=18689&r1=18688&r2=18689
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java	2010-08-27 09:19:23-0700
@@ -114,8 +114,6 @@
     protected void buildModelList() {
         Set<Object> elements = new TreeSet<Object>(new PathComparator());
 
-        Object selectedElement = getSelectedModelElement();
-        
         Object model =
             ProjectManager.getManager().getCurrentProject().getRoot();
         Object target = getTarget();
@@ -142,10 +140,6 @@
         // so remove all the old contents first
         removeAllElements();
         addAll(elements);
-
-        if (selectedElement != null) {
-            setSelectedItem(selectedElement);
-        }
     }
 
     /*

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=18689&r1=18688&r2=18689
==============================================================================
--- 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-27 09:19:23-0700
@@ -60,7 +60,6 @@
      */
     protected void buildModelList() {
         final Object transition = getTarget();
-        Object selectedElement = getSelectedModelElement();
         removeAllElements();
 
         Object parent =
@@ -71,16 +70,13 @@
                 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
             list.add(selectedElement);
         }
         setElements(list);
-
-        if (selectedElement != null) {
-            setSelectedItem(selectedElement);
-        }
     }
 
     protected boolean isValidElement(Object m) {

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

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