warnings

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index dcea55419256d73a2e2f31312f6e068f0270c13a..ce404b694aa394564b8be0b72e591419305cb5be 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -11,6 +11,7 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;\r
 import java.io.IOException;\r
 import java.util.HashMap;\r
+import java.util.List;\r
 import java.util.Map;\r
 import java.util.Vector;\r
 \r
@@ -79,16 +80,23 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
        private static final int GRAIN_TAB = 1;\r
        private static final int BURN_TAB = 2;\r
 \r
-       @SuppressWarnings("unchecked")\r
-       private Class[] grainTypes = { CoredCylindricalGrain.class, Finocyl.class,\r
-                       Moonburner.class, RodAndTubeGrain.class, CSlot.class, EndBurner.class };\r
+       private List<Class<? extends Grain>> grainTypes = new Vector<Class<? extends Grain>>();\r
+       {\r
+               grainTypes.add(CoredCylindricalGrain.class);\r
+               grainTypes.add(Finocyl.class);\r
+               grainTypes.add(Moonburner.class);\r
+               grainTypes.add(RodAndTubeGrain.class);\r
+               grainTypes.add(CSlot.class);\r
+               grainTypes.add(EndBurner.class);\r
+       }\r
 \r
        private abstract class Chooser<T> extends JPanel {\r
                private static final long serialVersionUID = 1L;\r
-               private Class<? extends T>[] types;\r
+               private List<Class<? extends T>> types;\r
                private Map<Class<? extends T>, T> old = new HashMap<Class<? extends T>, T>();\r
 \r
-               public Chooser(T initial, Class<? extends T>... ts) {\r
+               @SuppressWarnings("unchecked")\r
+               public Chooser(T initial, List<Class<? extends T>> ts) {\r
                        types = ts;\r
                        if ( initial != null )\r
                                old.put((Class<? extends T>)initial.getClass(), initial);\r
@@ -275,16 +283,19 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                                }\r
                        });\r
                        nameAndFuel.add(new JLabel("Fuel:"));\r
-                       nameAndFuel.add( new JComboBox(availableFuels){{\r
-                               setMinimumSize(new Dimension(200, 20));\r
-                               setMaximumSize(new Dimension(Short.MAX_VALUE, 20));\r
-                               addActionListener(new ActionListener(){\r
-                                       @Override\r
-                                       public void actionPerformed(ActionEvent e) {\r
-                                               motor.setFuel((Fuel)getSelectedItem());\r
-                                               System.out.println("FUEL CHANGED");\r
-                                       }});\r
-                       }});\r
+                       nameAndFuel.add( new JComboBox(availableFuels){\r
+                               private static final long serialVersionUID = 1L;\r
+                               {\r
+                                       setMinimumSize(new Dimension(200, 20));\r
+                                       setMaximumSize(new Dimension(Short.MAX_VALUE, 20));\r
+                                       addActionListener(new ActionListener(){\r
+                                               @Override\r
+                                               public void actionPerformed(ActionEvent e) {\r
+                                                       motor.setFuel((Fuel)getSelectedItem());\r
+                                                       System.out.println("FUEL CHANGED");\r
+                                               }});\r
+                               }\r
+                       });\r
                        nameAndFuel.add(Box.createVerticalGlue());\r
                        parts.add(nameAndFuel);\r
                        \r
@@ -353,7 +364,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                add(bt = new BurnTab(), BURN_TAB);\r
        }\r
 \r
-       @Deprecated\r
        public static Motor defaultMotor() {\r
                Motor m = new Motor();\r
                m.setName("Example Motor");\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
index b6047eea3d207304d422013dd17d5140145a1064..1066146f52629c4a214ae75dd632a41a9430df9e 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
@@ -9,6 +9,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;\r
 import java.io.File;\r
 import java.util.HashMap;\r
+import java.util.List;\r
 import java.util.Vector;\r
 \r
 import javax.swing.ButtonGroup;\r
@@ -49,9 +50,13 @@ import com.billkuker.rocketry.motorsim.visual.workbench.WorkbenchTreeModel.FuelN
 public class MotorWorkbench extends JFrame implements TreeSelectionListener {\r
        private static final long serialVersionUID = 1L;\r
        \r
-       @SuppressWarnings("unchecked")\r
-       private Class[] fuelTypes = { KNSB.class, KNSU.class, KNER.class,\r
-                       KNDX.class };\r
+       private List<Class<? extends Fuel>> fuelTypes = new Vector<Class<? extends Fuel>>();\r
+       {\r
+               fuelTypes.add(KNSB.class);\r
+               fuelTypes.add(KNSU.class);\r
+               fuelTypes.add(KNER.class);\r
+               fuelTypes.add(KNDX.class);\r
+       }\r
        \r
        private JPanel top;\r
        private JSplitPane split;\r
@@ -102,7 +107,7 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
                \r
                top.add(split, BorderLayout.CENTER);\r
                \r
-               for ( Class<Fuel> f : fuelTypes){\r
+               for ( Class<? extends Fuel> f : fuelTypes){\r
                        try {\r
                                addFuel(f.newInstance());\r
                        } catch (InstantiationException e) {\r
@@ -257,7 +262,9 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
 \r
                                                        }\r
                                                });\r
-                                               add(new JMenuItem("Save Fuel") {});\r
+                                               add(new JMenuItem("Save Fuel") {\r
+                                                       private static final long serialVersionUID = 1L;\r
+                                               });\r
                                                add(new JSeparator());\r
                                                add(new JMenuItem("Export .ENG"){\r
                                                        private static final long serialVersionUID = 1L;\r