Fix some raw types.

This commit is contained in:
Michael Bayne
2016-11-26 09:27:15 -08:00
parent 0436d95cea
commit b1a418eaa9
2 changed files with 7 additions and 7 deletions
@@ -40,7 +40,7 @@ public class ComboButtonBox extends JPanel
*/
public ComboButtonBox (int orientation)
{
this(orientation, new DefaultComboBoxModel());
this(orientation, new DefaultComboBoxModel<Object>());
}
/**
@@ -49,7 +49,7 @@ public class ComboButtonBox extends JPanel
* be used to populate the buttons (see {@link #setModel} for more
* details).
*/
public ComboButtonBox (int orientation, ComboBoxModel model)
public ComboButtonBox (int orientation, ComboBoxModel<?> model)
{
// set up our layout
setOrientation(orientation);
@@ -76,7 +76,7 @@ public class ComboButtonBox extends JPanel
* icons for the buttons. Otherwise the button text will contain the
* string representation of the elements in the model.
*/
public void setModel (ComboBoxModel model)
public void setModel (ComboBoxModel<?> model)
{
// if we had a previous model, unregister ourselves from it
if (_model != null) {
@@ -106,7 +106,7 @@ public class ComboButtonBox extends JPanel
/**
* Returns the model in use by the button box.
*/
public ComboBoxModel getModel ()
public ComboBoxModel<?> getModel ()
{
return _model;
}
@@ -369,7 +369,7 @@ public class ComboButtonBox extends JPanel
}
/** The contents of the box. */
protected ComboBoxModel _model;
protected ComboBoxModel<?> _model;
/** The index of the selected button. */
protected int _selectedIndex = -1;
@@ -304,7 +304,7 @@ public class RuntimeAdjust
@Override protected void populateEditor (JPanel editor)
{
editor.add(_valbox = new JComboBox(_values), GroupLayout.FIXED);
editor.add(_valbox = new JComboBox<Object>(_values), GroupLayout.FIXED);
_valbox.addActionListener(this);
_valbox.setSelectedItem(getValue());
}
@@ -330,7 +330,7 @@ public class RuntimeAdjust
protected String _value;
protected String[] _values;
protected JComboBox _valbox;
protected JComboBox<Object> _valbox;
}
/** Provides runtime adjustable file path variables. */