Changeset 5429 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.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/conflict/tags/TagConflictResolverTable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java

@@ -6 +6 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
 public class TagConflictResolverTable extends JTable implements MultiValueCellEditor.NavigationListener {
@@ -41 +42 @@
         ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListeners(this);
 
-        setRowHeight((int)new JComboBox().getPreferredSize().getHeight());
+        setRowHeight((int)new JosmComboBox().getPreferredSize().getHeight());
     }