Changeset 5429 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

Timestamp:

2012-08-11T23:03:55+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7917 - Control the number of items displayed at once in all comboboxes (20 by default, configurable with gui.combobox.maximum-row-count)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -10 +10 @@
 import java.awt.Font;
 import java.awt.GridBagLayout;
-import java.awt.Image;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -36 +35 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
-import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -74 +72 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.GBC;
@@ -396 +395 @@
             } else {
                 // the objects have different values
-                JComboBox comboBox = new JComboBox(usage.values.toArray());
+                JosmComboBox comboBox = new JosmComboBox(usage.values.toArray());
                 comboBox.setEditable(true);
                 comboBox.setEditor(textField);
@@ -421 +420 @@
 
             // return if unchanged
-            String v = (value instanceof JComboBox)
-                    ? ((JComboBox) value).getEditor().getItem().toString()
+            String v = (value instanceof JosmComboBox)
+                    ? ((JosmComboBox) value).getEditor().getItem().toString()
                             : ((JTextField) value).getText();
                     v = v.trim();
@@ -800 +799 @@
 
         public boolean editable = true;
-        protected JComboBox combo;
+        protected JosmComboBox combo;
 
         public Combo() {
@@ -820 +819 @@
             lhm.put("", new PresetListEntry(""));
 
-            combo = new JComboBox(lhm.values().toArray());
+            combo = new JosmComboBox(lhm.values().toArray());
             component = combo;
             combo.setRenderer(getListCellRenderer());
             combo.setEditable(editable);
-            combo.setMaximumRowCount(13);
+            //combo.setMaximumRowCount(13);
             AutoCompletingTextField tf = new AutoCompletingTextField();
             initAutoCompletionField(tf, key);