Changeset 5429 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

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)

Location:

trunk/src/org/openstreetmap/josm/gui/conflict

Files:

• pair/ListMerger.java (modified) (3 diffs)
• tags/MultiValueCellEditor.java (modified) (4 diffs)
• tags/MultiValueCellRenderer.java (modified) (5 diffs)
• tags/RelationMemberConflictDecisionEditor.java (modified) (2 diffs)
• tags/RelationMemberConflictDecisionRenderer.java (modified) (3 diffs)
• tags/RelationMemberConflictResolverTable.java (modified) (2 diffs)
• tags/TagConflictResolverTable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -29 +29 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -44 +43 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -252 +252 @@
         p.setLayout(new FlowLayout(FlowLayout.LEFT));
         p.add(new JLabel(tr("Compare ")));
-        JComboBox cbComparePair =new JComboBox(model.getComparePairListModel());
+        JosmComboBox cbComparePair = new JosmComboBox(model.getComparePairListModel());
         cbComparePair.setRenderer(new ComparePairListCellRenderer());
         p.add(cbComparePair);

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

@@ -13 +13 @@
 import javax.swing.AbstractCellEditor;
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -20 +19 @@
 import javax.swing.UIManager;
 import javax.swing.table.TableCellEditor;
+
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
 /**
@@ -40 +41 @@
 
     /** the combo box used as editor */
-    private JComboBox editor;
+    private JosmComboBox editor;
     private DefaultComboBoxModel editorModel;
     private CopyOnWriteArrayList<NavigationListener> listeners;
@@ -68 +69 @@
     public MultiValueCellEditor() {
         editorModel = new DefaultComboBoxModel();
-        editor = new JComboBox(editorModel) {
+        editor = new JosmComboBox(editorModel) {
             @Override
             public void processKeyEvent(KeyEvent e) {

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
@@ -10 +9 @@
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.ImageIcon;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JTable;
@@ -17 +15 @@
 
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -28 +27 @@
     private ImageIcon iconUndecided;
     private DefaultComboBoxModel model;
-    private JComboBox cbDecisionRenderer;
+    private JosmComboBox cbDecisionRenderer;
 
     public MultiValueCellRenderer() {
@@ -34 +33 @@
         iconDecided = ImageProvider.get("dialogs/conflict", "tagconflictresolved");
         iconUndecided = ImageProvider.get("dialogs/conflict", "tagconflictunresolved");
-        cbDecisionRenderer = new JComboBox(model = new DefaultComboBoxModel());
+        cbDecisionRenderer = new JosmComboBox(model = new DefaultComboBoxModel());
     }
 

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

@@ -6 +6 @@
 
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
 import javax.swing.JTable;
 import javax.swing.event.CellEditorListener;
@@ -12 +11 @@
 
 import org.openstreetmap.josm.gui.util.TableCellEditorSupport;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
-public class RelationMemberConflictDecisionEditor extends JComboBox implements TableCellEditor {
+public class RelationMemberConflictDecisionEditor extends JosmComboBox implements TableCellEditor {
 
     public RelationMemberConflictDecisionEditor() {

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

@@ -6 +6 @@
 
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -14 +13 @@
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+
 public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer{
 
-    private JComboBox cbDecisionTypes;
+    private JosmComboBox cbDecisionTypes;
 
     protected void resetTableRenderer() {
@@ -34 +35 @@
     public RelationMemberConflictDecisionRenderer() {
         DefaultComboBoxModel model = new DefaultComboBoxModel();
-        cbDecisionTypes = new JComboBox(model);
+        cbDecisionTypes = new JosmComboBox(model);
         model.addElement(RelationMemberConflictDecisionType.KEEP);
         model.addElement(RelationMemberConflictDecisionType.REMOVE);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.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 RelationMemberConflictResolverTable extends JTable implements MultiValueCellEditor.NavigationListener {
@@ -39 +40 @@
         getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
 
-        setRowHeight((int)new JComboBox().getPreferredSize().getHeight());
+        setRowHeight((int)new JosmComboBox().getPreferredSize().getHeight());
     }
 

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());
     }