Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16045)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16046)
@@ -141,6 +141,6 @@
 
             // Cache size
-            item.preferredWidth = lbl.getPreferredSize().width;
-            item.preferredHeight = lbl.getPreferredSize().height;
+            item.preferredWidth = (short) lbl.getPreferredSize().width;
+            item.preferredHeight = (short) lbl.getPreferredSize().height;
 
             // We do not want the editor to have the maximum height of all
@@ -225,7 +225,7 @@
 
         /** Cached width (currently only for Combo) to speed up preset dialog initialization */
-        public int preferredWidth = -1; // NOSONAR
+        public short preferredWidth = -1; // NOSONAR
         /** Cached height (currently only for Combo) to speed up preset dialog initialization */
-        public int preferredHeight = -1; // NOSONAR
+        public short preferredHeight = -1; // NOSONAR
 
         /**