Changeset 5429 in josm for trunk/src/org/openstreetmap/josm/actions

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/actions/AbstractMergeAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java

@@ -11 +11 @@
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.Icon;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -20 +19 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -58 +58 @@
 
     protected Layer askTargetLayer(List<Layer> targetLayers) {
-        JComboBox layerList = new JComboBox();
+        JosmComboBox layerList = new JosmComboBox();
         layerList.setRenderer(new LayerListCellRenderer());
         layerList.setModel(new DefaultComboBoxModel(targetLayers.toArray()));