From 93ccc180b85bdc5eac081d39ca393b1816df98c6 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Thu, 13 Oct 2016 15:54:26 -0400 Subject: [PATCH] [Cleanup][Warnings][Non-Func] Fixes numerous but trivial warnings Warnings fixed: -"JComboBox is a raw type. References to generic type JComboBox should be parameterized" -- fix: Add a type specifier to each generic, (or occasionally ) - "The serializable class WarningDialog does not declare a static final serialVersionUID field of type long" -- fix: add annotation: '@SuppressWarnings("serial")' - "Unnecessary @SuppressWarnings("unchecked")" -- fix: remove annotation --- .../gui/configdialog/AxialStageConfig.java | 13 ++++--------- .../gui/configdialog/MassComponentConfig.java | 7 ++++--- .../openrocket/gui/configdialog/NoseConeConfig.java | 4 ++-- .../gui/configdialog/RailButtonConfig.java | 4 ++-- .../gui/configdialog/RingComponentConfig.java | 5 +++-- .../gui/dialogs/CustomMaterialDialog.java | 5 +++-- .../openrocket/gui/dialogs/PrintSettingsDialog.java | 9 +++++---- .../sf/openrocket/gui/dialogs/WarningDialog.java | 6 +++--- .../DeploymentSelectionDialog.java | 8 ++++---- 9 files changed, 30 insertions(+), 31 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java index d59f147fc..e932bda52 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java @@ -17,6 +17,7 @@ import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration; +import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration.SeparationEvent; import net.sf.openrocket.startup.Application; public class AxialStageConfig extends ComponentAssemblyConfig { @@ -48,16 +49,10 @@ public class AxialStageConfig extends ComponentAssemblyConfig { sepConfig = new StageSeparationConfiguration(); stage.getSeparationConfigurations().set( flConfig.getId(), sepConfig ); } - @SuppressWarnings("unchecked") + JComboBox combo = new JComboBox( - new EnumModel( sepConfig, "SeparationEvent", - new StageSeparationConfiguration.SeparationEvent[] { - StageSeparationConfiguration.SeparationEvent.UPPER_IGNITION, - StageSeparationConfiguration.SeparationEvent.IGNITION, - StageSeparationConfiguration.SeparationEvent.BURNOUT, - StageSeparationConfiguration.SeparationEvent.EJECTION, - StageSeparationConfiguration.SeparationEvent.LAUNCH, - StageSeparationConfiguration.SeparationEvent.NEVER })); + new EnumModel( sepConfig, "SeparationEvent", SeparationEvent.values())); + //combo.setSelectedItem(sepConfig); panel.add(combo, ""); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java index 23c5550d6..00e65c66e 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java @@ -23,6 +23,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class MassComponentConfig extends RocketComponentConfig { private static final Translator trans = Application.getTranslator(); @@ -34,8 +35,8 @@ public class MassComponentConfig extends RocketComponentConfig { //// Mass component type panel.add(new JLabel(trans.get("MassComponentCfg.lbl.type"))); - @SuppressWarnings("unchecked") - JComboBox typecombo = new JComboBox( + + final JComboBox typecombo = new JComboBox( new EnumModel(component, "MassComponentType", new MassComponent.MassComponentType[] { MassComponent.MassComponentType.MASSCOMPONENT, @@ -108,7 +109,7 @@ public class MassComponentConfig extends RocketComponentConfig { //// Position relative to: panel.add(new JLabel(trans.get("MassComponentCfg.lbl.PosRelativeto"))); - JComboBox combo = new JComboBox( + final JComboBox combo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, diff --git a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java index e57fdd900..02d95e48b 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java @@ -27,9 +27,9 @@ import net.sf.openrocket.rocketcomponent.Transition; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class NoseConeConfig extends RocketComponentConfig { - private JComboBox typeBox; private DescriptionArea description; @@ -54,7 +54,7 @@ public class NoseConeConfig extends RocketComponentConfig { Transition.Shape selected = ((NoseCone) component).getType(); Transition.Shape[] typeList = Transition.Shape.values(); - typeBox = new JComboBox(typeList); + final JComboBox typeBox = new JComboBox(typeList); typeBox.setEditable(false); typeBox.setSelectedItem(selected); typeBox.addActionListener(new ActionListener() { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java index 355355467..50bd445c5 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java @@ -22,9 +22,9 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class RailButtonConfig extends RocketComponentConfig { - private MotorConfig motorConfigPane = null; private static final Translator trans = Application.getTranslator(); public RailButtonConfig( OpenRocketDocument document, RocketComponent component) { @@ -78,7 +78,7 @@ public class RailButtonConfig extends RocketComponentConfig { { //// Position relative to: panel.add(new JLabel(trans.get("RailBtnCfg.lbl.PosRelativeTo"))); - @SuppressWarnings("unchecked") + JComboBox relToCombo = new JComboBox( (ComboBoxModel) new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java index 0a1268356..c23dfb0c1 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java @@ -22,6 +22,7 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class RingComponentConfig extends RocketComponentConfig { private static final Translator trans = Application.getTranslator(); @@ -125,7 +126,7 @@ public class RingComponentConfig extends RocketComponentConfig { //// Position relative to: panel.add(new JLabel(trans.get("ringcompcfg.Positionrelativeto"))); - JComboBox combo = new JComboBox( + final JComboBox positionCombo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -133,7 +134,7 @@ public class RingComponentConfig extends RocketComponentConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx 3, growx, wrap"); + panel.add( positionCombo, "spanx 3, growx, wrap"); //// plus panel.add(new JLabel(trans.get("ringcompcfg.plus")), "right"); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java index c90f29940..065956619 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java @@ -25,13 +25,14 @@ import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public class CustomMaterialDialog extends JDialog { private static final Translator trans = Application.getTranslator(); private final Material originalMaterial; private boolean okClicked = false; - private JComboBox typeBox; + private JComboBox typeBox; private JTextField nameField; private DoubleModel density; private JSpinner densitySpinner; @@ -76,7 +77,7 @@ public class CustomMaterialDialog extends JDialog { // Material type (if not known) panel.add(new JLabel(trans.get("custmatdlg.lbl.Materialtype"))); if (material == null) { - typeBox = new JComboBox(Material.Type.values()); + typeBox = new JComboBox(Material.Type.values()); typeBox.setSelectedItem(Material.Type.BULK); typeBox.setEditable(false); typeBox.addActionListener(new ActionListener() { diff --git a/swing/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java index 3271c8c9f..eefc5960a 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java @@ -30,6 +30,7 @@ import net.sf.openrocket.startup.Application; /** * This class is a dialog for displaying advanced settings for printing rocket related info. */ +@SuppressWarnings("serial") public class PrintSettingsDialog extends JDialog { private static final Logger log = LoggerFactory.getLogger(PrintSettingsDialog.class); private static final Translator trans = Application.getTranslator(); @@ -75,16 +76,16 @@ public class PrintSettingsDialog extends JDialog { - JComboBox combo = new JComboBox(new EnumModel(settings, "PaperSize")); + final JComboBox sizeCombo = new JComboBox(new EnumModel(settings, "PaperSize")); ////Paper size: panel.add(new JLabel(trans.get("lbl.Papersize"))); - panel.add(combo, "growx, wrap para"); + panel.add( sizeCombo, "growx, wrap para"); - combo = new JComboBox(new EnumModel(settings, "PaperOrientation")); + final JComboBox orientCombo = new JComboBox(new EnumModel(settings, "PaperOrientation")); //// Paper orientation: panel.add(new JLabel(trans.get("lbl.Paperorientation"))); - panel.add(combo, "growx, wrap para*2"); + panel.add( orientCombo, "growx, wrap para*2"); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java index 30ab240f7..bb6a89a1b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java @@ -10,13 +10,13 @@ import javax.swing.JScrollPane; import net.sf.openrocket.aerodynamics.Warning; import net.sf.openrocket.aerodynamics.WarningSet; +@SuppressWarnings("serial") public class WarningDialog extends JDialog { - public static void showWarnings(Component parent, Object message, String title, - WarningSet warnings) { + public static void showWarnings(Component parent, Object message, String title, WarningSet warnings) { Warning[] w = warnings.toArray(new Warning[0]); - JList list = new JList(w); + final JList list = new JList(w); JScrollPane pane = new JScrollPane(list); JOptionPane.showMessageDialog(parent, new Object[] { message, pane }, diff --git a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java index 3dcab908b..d22ea6523 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java @@ -78,12 +78,12 @@ public class DeploymentSelectionDialog extends JDialog { //// Deploys at: panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Deploysat")), ""); - final JComboBox event = new JComboBox(new EnumModel(newConfiguration, "DeployEvent")); + final JComboBox deployEvent = new JComboBox(new EnumModel(newConfiguration, "DeployEvent")); if( (component.getStageNumber() + 1 ) == rocket.getStageCount() ){ // This is the bottom stage: Restrict deployment options. - event.removeItem( DeployEvent.LOWER_STAGE_SEPARATION ); + deployEvent.removeItem( DeployEvent.LOWER_STAGE_SEPARATION ); } - panel.add(event, "spanx 3, growx, wrap"); + panel.add( deployEvent, "spanx 3, growx, wrap"); // ... and delay //// plus @@ -111,7 +111,7 @@ public class DeploymentSelectionDialog extends JDialog { altSlider = new BasicSlider(alt.getSliderModel(100, 1000)); panel.add(altSlider, "w 100lp, wrap"); - event.addActionListener(new ActionListener() { + deployEvent.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { updateState();