Remove some warnings

Change-Id: If664d17177451f28d24f9a9c1c4172245f88da61
Reviewed-on: http://gerrit.dmdirc.com/3172
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/ComboBoxWidthModifier.java

@@ -35,20 +35,14 @@ import javax.swing.event.PopupMenuListener;
  */
 public class ComboBoxWidthModifier implements PopupMenuListener {
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Popup menu event
-     */
     @Override
     public void popupMenuWillBecomeVisible(final PopupMenuEvent e) {
-        final JComboBox box = (JComboBox) e.getSource();
+        final JComboBox<?> box = (JComboBox) e.getSource();
         final Object comp = box.getUI().getAccessibleChild(box, 0);
         if (!(comp instanceof JPopupMenu)) {
             return;
         }
-        final JComponent scrollPane = (JComponent) ((JPopupMenu) comp)
-                .getComponent(0);
+        final JComponent scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(0);
         final Dimension size = new Dimension(box.getPreferredSize().width,
                 scrollPane.getPreferredSize().height);
         scrollPane.setPreferredSize(size);
@@ -65,11 +59,6 @@ public class ComboBoxWidthModifier implements PopupMenuListener {
         //Ignore
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Popup menu event
-     */
     @Override
     public void popupMenuCanceled(final PopupMenuEvent e) {
         //Ignore

src/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -209,8 +209,7 @@ public final class PrefsComponentFactory {
      * @return A JComponent descendent for the specified setting
      */
     private JComponent getComboOption(final PreferencesSetting setting) {
-        final JComboBox option = new JComboBox(setting.getComboOptions()
-                .entrySet().toArray());
+        final JComboBox<Object> option = new JComboBox<>(setting.getComboOptions().entrySet().toArray());
         option.setRenderer(new MapEntryRenderer(option.getRenderer()));
         option.setEditable(false);
 

src/com/dmdirc/addons/ui_swing/UIUtilities.java

@@ -499,7 +499,7 @@ public final class UIUtilities {
      *
      * @param combo Combo box to modify
      */
-    public static void addComboBoxWidthModifier(final JComboBox combo) {
+    public static void addComboBoxWidthModifier(final JComboBox<?> combo) {
         combo.addPopupMenuListener(new ComboBoxWidthModifier());
     }
 

src/com/dmdirc/addons/ui_swing/components/FontPicker.java

@@ -37,13 +37,9 @@ import javax.swing.SwingUtilities;
 /**
  * System font picking component.
  */
-public class FontPicker extends JComboBox {
+public class FontPicker extends JComboBox<Object> {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = -9054812588033935839L;
     /** Font family to choose from. */
     private final String fontFamily;
@@ -54,8 +50,7 @@ public class FontPicker extends JComboBox {
      * @param fontFamily Font family
      */
     public FontPicker(final String fontFamily) {
-        super(new DefaultComboBoxModel());
-        setPrototypeDisplayValue("test");
+        super(new DefaultComboBoxModel<>());
         this.fontFamily = fontFamily;
 
         setRenderer(new FontListCellRenderer(getRenderer()));
@@ -93,7 +88,7 @@ public class FontPicker extends JComboBox {
                 /** {@inheritDoc} */
                 @Override
                 public void run() {
-                    ((DefaultComboBoxModel) getModel()).addElement(new Font(
+                    ((DefaultComboBoxModel<Object>) getModel()).addElement(new Font(
                             font, Font.PLAIN, size));
                 }
             });

src/com/dmdirc/addons/ui_swing/components/GenericComboBoxModel.java

@@ -29,19 +29,13 @@ import javax.swing.ComboBoxModel;
  *
  * @param <T> Model holds this type of object
  */
-public class GenericComboBoxModel<T> extends GenericListModel<T> implements
-        ComboBoxModel {
+public class GenericComboBoxModel<T> extends GenericListModel<T> implements ComboBoxModel<T> {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 2;
     /** Selected Object. */
     private T selectedObject;
 
-    /** {@inheritDoc} */
     @Override
     @SuppressWarnings("unchecked")
     public void setSelectedItem(final Object anItem) {
@@ -52,7 +46,6 @@ public class GenericComboBoxModel<T> extends GenericListModel<T> implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public T getSelectedItem() {
         return selectedObject;

src/com/dmdirc/addons/ui_swing/components/GenericListModel.java

@@ -34,13 +34,9 @@ import javax.swing.AbstractListModel;
  *
  * @param <T> Generic type of the list
  */
-public class GenericListModel<T> extends AbstractListModel {
+public class GenericListModel<T> extends AbstractListModel<T> {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = -4227892376992714545L;
     /** Data stored in list. */
     private final List<T> list;
@@ -65,7 +61,6 @@ public class GenericListModel<T> extends AbstractListModel {
         this.list = Collections.synchronizedList(new ArrayList<>(list));
     }
 
-    /** {@inheritDoc} */
     @Override
     public int getSize() {
         return list.size();
@@ -194,7 +189,6 @@ public class GenericListModel<T> extends AbstractListModel {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         return list.toString();
@@ -236,9 +230,8 @@ public class GenericListModel<T> extends AbstractListModel {
         list.addAll(index, collection);
     }
 
-    /** {@inheritDoc} */
     @Override
-    public Object getElementAt(final int index) {
+    public T getElementAt(final int index) {
         return get(index);
     }
 

src/com/dmdirc/addons/ui_swing/components/renderers/FontListCellRenderer.java

@@ -37,7 +37,7 @@ public class FontListCellRenderer extends DMDircListCellRenderer<Object> {
      *
      * @param renderer RendereParent renderer
      */
-    public FontListCellRenderer(final ListCellRenderer<Object> renderer) {
+    public FontListCellRenderer(final ListCellRenderer<? super Object> renderer) {
         super(renderer);
     }
 

src/com/dmdirc/addons/ui_swing/components/renderers/MapEntryRenderer.java

@@ -42,7 +42,7 @@ public final class MapEntryRenderer extends DMDircListCellRenderer<Object> {
      *
      * @param renderer RendereParent renderer
      */
-    public MapEntryRenderer(final ListCellRenderer<Object> renderer) {
+    public MapEntryRenderer(final ListCellRenderer<? super Object> renderer) {
         super(renderer);
     }