Changeset 7931 in josm for trunk/src/org

Timestamp:

2015-01-07T00:44:39+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10941 - fix handling of rows attribute for multiselect preset item

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (2 diffs)

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

@@ -1327 +1327 @@
     public static class MultiSelect extends ComboMultiSelect {
 
-        public long rows = -1;
+        /**
+         * Number of rows to display (positive integer, optional).
+         */
+        public String rows;
         protected ConcatenatingJList list;
 
@@ -1354 +1357 @@
             // if a number of rows has been specified in the preset,
             // modify preferred height of scroll pane to match that row count.
-            if (rows != -1) {
+            if (rows != null) {
                 double height = renderer.getListCellRendererComponent(list,
-                        new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;
+                        new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * Integer.valueOf(rows);
                 sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
             }