--- old/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java	2014-06-25 15:48:43.000000000 -0700
+++ new/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java	2014-06-25 15:48:42.000000000 -0700
@@ -50,14 +50,14 @@
  */
 @SuppressWarnings("serial") // Same-version serialization only
 public class MetalComboBoxButton extends JButton {
-    protected JComboBox comboBox;
-    protected JList listBox;
+    protected JComboBox<Object> comboBox;
+    protected JList<Object> listBox;
     protected CellRendererPane rendererPane;
     protected Icon comboIcon;
     protected boolean iconOnly = false;
 
-    public final JComboBox getComboBox() { return comboBox;}
-    public final void setComboBox( JComboBox cb ) { comboBox = cb;}
+    public final JComboBox<Object> getComboBox() { return comboBox;}
+    public final void setComboBox( JComboBox<Object> cb ) { comboBox = cb;}
 
     public final Icon getComboIcon() { return comboIcon;}
     public final void setComboIcon( Icon i ) { comboIcon = i;}
@@ -75,8 +75,8 @@
         setModel( model );
     }
 
-    public MetalComboBoxButton( JComboBox cb, Icon i,
-                                CellRendererPane pane, JList list ) {
+    public MetalComboBoxButton( JComboBox<Object> cb, Icon i,
+                                CellRendererPane pane, JList<Object> list ) {
         this();
         comboBox = cb;
         comboIcon = i;
@@ -85,8 +85,8 @@
         setEnabled( comboBox.isEnabled() );
     }
 
-    public MetalComboBoxButton( JComboBox cb, Icon i, boolean onlyIcon,
-                                CellRendererPane pane, JList list ) {
+    public MetalComboBoxButton( JComboBox<Object> cb, Icon i, boolean onlyIcon,
+                                CellRendererPane pane, JList<Object> list ) {
         this( cb, i, pane, list );
         iconOnly = onlyIcon;
     }
@@ -168,7 +168,7 @@
 
         // Let the renderer paint
         if ( ! iconOnly && comboBox != null ) {
-            ListCellRenderer renderer = comboBox.getRenderer();
+            ListCellRenderer<Object> renderer = comboBox.getRenderer();
             Component c;
             boolean renderPressed = getModel().isPressed();
             c = renderer.getListCellRendererComponent(listBox,