Index: applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java
===================================================================
--- applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java	(revision 30197)
+++ applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java	(revision 30532)
@@ -953,5 +953,5 @@
             getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
 
-            setRowHeight((int)new JComboBox().getPreferredSize().getHeight());
+            setRowHeight((int)new JComboBox<Object>().getPreferredSize().getHeight());
         }
 
@@ -1376,5 +1376,5 @@
             ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListeners(this);
 
-            setRowHeight((int)new JComboBox().getPreferredSize().getHeight());
+            setRowHeight((int)new JComboBox<Object>().getPreferredSize().getHeight());
         }