Changeset 5424 in josm for trunk/src/org

Timestamp:

2012-08-11T18:49:02+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7671, see #7951 - incorrect contents of value combobox when clicking on a "Recently added tags"

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -532 +532 @@
             }
         }
-        
+
+        FocusAdapter focus = addFocusAdapter(-1, keys, values, autocomplete, defaultACItemComparator);
+        // fire focus event in advance or otherwise the popup list will be too small at first
+        focus.focusGained(null);
+
         int recentTagsToShow = Main.pref.getInteger("properties.recently-added-tags", DEFAULT_LRU_TAGS_NUMBER);
         if (recentTagsToShow > MAX_LRU_TAGS_NUMBER) {
@@ -538 +542 @@
         }
         List<JosmAction> recentTagsActions = new ArrayList<JosmAction>();
-        suggestRecentlyAddedTags(p, keys, values, recentTagsActions, recentTagsToShow);
-
-        FocusAdapter focus = addFocusAdapter(-1, keys, values, autocomplete, defaultACItemComparator);
-        // fire focus event in advance or otherwise the popup list will be too small at first
-        focus.focusGained(null);
+        suggestRecentlyAddedTags(p, keys, values, recentTagsActions, recentTagsToShow, focus);
 
         JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){
@@ -580 +580 @@
     }
     
-    private void suggestRecentlyAddedTags(JPanel p, final AutoCompletingComboBox keys, final AutoCompletingComboBox values, List<JosmAction> tagsActions, int tagsToShow) {
+    private void suggestRecentlyAddedTags(JPanel p, final AutoCompletingComboBox keys, final AutoCompletingComboBox values, List<JosmAction> tagsActions, int tagsToShow, final FocusAdapter focus) {
         if (tagsToShow > 0 && !recentTags.isEmpty()) {
             p.add(new JLabel(tr("Recently added tags")), GBC.eol());
@@ -607 +607 @@
                         keys.getEditor().setItem(t.getKey());
                         values.getEditor().setItem(t.getValue());
+                        // Update list of values (fix #7951) 
+                        focus.focusGained(null);
                     }
                 };