From: Bill Kuker <bkuker@billkuker.com>
Date: Sat, 30 Oct 2010 18:21:46 +0000 (+0000)
Subject: warnings
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=411b62a931ad9ca004e5ea033ace7a38203a9afc;p=sw%2Fmotorsim

warnings
---

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index dcea554..ce404b6 100644
--- 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;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
@@ -79,16 +80,23 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 	private static final int GRAIN_TAB = 1;
 	private static final int BURN_TAB = 2;
 
-	@SuppressWarnings("unchecked")
-	private Class[] grainTypes = { CoredCylindricalGrain.class, Finocyl.class,
-			Moonburner.class, RodAndTubeGrain.class, CSlot.class, EndBurner.class };
+	private List<Class<? extends Grain>> grainTypes = new Vector<Class<? extends Grain>>();
+	{
+		grainTypes.add(CoredCylindricalGrain.class);
+		grainTypes.add(Finocyl.class);
+		grainTypes.add(Moonburner.class);
+		grainTypes.add(RodAndTubeGrain.class);
+		grainTypes.add(CSlot.class);
+		grainTypes.add(EndBurner.class);
+	}
 
 	private abstract class Chooser<T> extends JPanel {
 		private static final long serialVersionUID = 1L;
-		private Class<? extends T>[] types;
+		private List<Class<? extends T>> types;
 		private Map<Class<? extends T>, T> old = new HashMap<Class<? extends T>, T>();
 
-		public Chooser(T initial, Class<? extends T>... ts) {
+		@SuppressWarnings("unchecked")
+		public Chooser(T initial, List<Class<? extends T>> ts) {
 			types = ts;
 			if ( initial != null )
 				old.put((Class<? extends T>)initial.getClass(), initial);
@@ -275,16 +283,19 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 				}
 			});
 			nameAndFuel.add(new JLabel("Fuel:"));
-			nameAndFuel.add( new JComboBox(availableFuels){{
-				setMinimumSize(new Dimension(200, 20));
-				setMaximumSize(new Dimension(Short.MAX_VALUE, 20));
-				addActionListener(new ActionListener(){
-					@Override
-					public void actionPerformed(ActionEvent e) {
-						motor.setFuel((Fuel)getSelectedItem());
-						System.out.println("FUEL CHANGED");
-					}});
-			}});
+			nameAndFuel.add( new JComboBox(availableFuels){
+				private static final long serialVersionUID = 1L;
+				{
+					setMinimumSize(new Dimension(200, 20));
+					setMaximumSize(new Dimension(Short.MAX_VALUE, 20));
+					addActionListener(new ActionListener(){
+						@Override
+						public void actionPerformed(ActionEvent e) {
+							motor.setFuel((Fuel)getSelectedItem());
+							System.out.println("FUEL CHANGED");
+						}});
+				}
+			});
 			nameAndFuel.add(Box.createVerticalGlue());
 			parts.add(nameAndFuel);
 			
@@ -353,7 +364,6 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 		add(bt = new BurnTab(), BURN_TAB);
 	}
 
-	@Deprecated
 	public static Motor defaultMotor() {
 		Motor m = new Motor();
 		m.setName("Example Motor");
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
index b6047ee..1066146 100644
--- 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;
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Vector;
 
 import javax.swing.ButtonGroup;
@@ -49,9 +50,13 @@ import com.billkuker.rocketry.motorsim.visual.workbench.WorkbenchTreeModel.FuelN
 public class MotorWorkbench extends JFrame implements TreeSelectionListener {
 	private static final long serialVersionUID = 1L;
 	
-	@SuppressWarnings("unchecked")
-	private Class[] fuelTypes = { KNSB.class, KNSU.class, KNER.class,
-			KNDX.class };
+	private List<Class<? extends Fuel>> fuelTypes = new Vector<Class<? extends Fuel>>();
+	{
+		fuelTypes.add(KNSB.class);
+		fuelTypes.add(KNSU.class);
+		fuelTypes.add(KNER.class);
+		fuelTypes.add(KNDX.class);
+	}
 	
 	private JPanel top;
 	private JSplitPane split;
@@ -102,7 +107,7 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
 		
 		top.add(split, BorderLayout.CENTER);
 		
-		for ( Class<Fuel> f : fuelTypes){
+		for ( Class<? extends Fuel> f : fuelTypes){
 			try {
 				addFuel(f.newInstance());
 			} catch (InstantiationException e) {
@@ -257,7 +262,9 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
 
 							}
 						});
-						add(new JMenuItem("Save Fuel") {});
+						add(new JMenuItem("Save Fuel") {
+							private static final long serialVersionUID = 1L;
+						});
 						add(new JSeparator());
 						add(new JMenuItem("Export .ENG"){
 							private static final long serialVersionUID = 1L;