From: Bill Kuker <bkuker@billkuker.com>
Date: Sun, 12 Apr 2009 02:37:19 +0000 (+0000)
Subject: Cleared some warnings
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e11dac7695a08c8819b6c4265af29d7773bd3cd2;p=sw%2Fmotorsim

Cleared some warnings
---

diff --git a/src/com/billkuker/rocketry/motorsim/MotorPart.java b/src/com/billkuker/rocketry/motorsim/MotorPart.java
index b60484c..1bd054e 100644
--- a/src/com/billkuker/rocketry/motorsim/MotorPart.java
+++ b/src/com/billkuker/rocketry/motorsim/MotorPart.java
@@ -48,7 +48,7 @@ public class MotorPart {
 						if (ps[i].getName().equals(evt.getPropertyName())){
 							Type t = ps[i].getReadMethod().getGenericReturnType();
 							ParameterizedType p = (ParameterizedType) t;
-							Class expected = (Class) p.getActualTypeArguments()[0];
+							Class expected = (Class)p.getActualTypeArguments()[0];
 							Field f = expected.getDeclaredField("UNIT");
 							Unit u = (Unit) f.get(null);
 							
diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedGrain.java
index cf9963c..18d856a 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedGrain.java
@@ -32,12 +32,6 @@ public class ExtrudedGrain implements Grain {
 
 	Amount<Length> rStep;
 
-	private class RegEntry {
-		Amount<Area> surfaceArea;
-
-		Amount<Volume> volume;
-	}
-
 	Amount<Length> webThickness;
 
 	{
diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 11def56..556de4b 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -12,6 +12,7 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JSplitPane;
+import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -20,6 +21,7 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Burn;
 
 public class BurnPanel extends JPanel {
+	private static final long serialVersionUID = 1L;
 	private Burn burn;
 	Chart<Duration, Pressure> pressure;
 	Chart<Duration, Force> thrust;
@@ -133,7 +135,7 @@ public class BurnPanel extends JPanel {
 		f.setSize(1280,720);
 		f.setLocation(0, 0);
 		f.setContentPane(this);
-		f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);
+		f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		f.setVisible(true);
 	}
 }
diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
index 3504a7f..8a7985b 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/Chart.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
@@ -27,8 +27,8 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;
 
 public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
+	private static final long serialVersionUID = 1L;
 
-	
 	public class IntervalDomain implements Iterable<Amount<X>>{
 		
 		Amount<X> low, high, delta;
@@ -131,7 +131,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
 		series.clear();
 		for( Amount<X> ax: d){
 			try {
-				Amount<Y> y = (Amount<Y>) f.invoke(source, ax);
+				Amount<Y> y = (Amount<Y>)f.invoke(source, ax);
 				add(ax, y);
 			} catch (IllegalArgumentException e) {
 				// TODO Auto-generated catch block
@@ -152,6 +152,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
 	
 	public void show(){
 		new JFrame(){
+			private static final long serialVersionUID = 1L;
 			{
 				setContentPane(Chart.this);
 				setSize(640,480);
diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index 312734d..ef94189 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -21,6 +21,8 @@ import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;
 import com.l2fprod.common.propertysheet.PropertySheetPanel;
 
 public class Editor extends JPanel {
+	private static final long serialVersionUID = 1L;
+
 	private static Logger log = Logger.getLogger(Editor.class);
 
 	private Object obj;
diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
index 035c187..cbb48f5 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
@@ -20,6 +20,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JSplitPane;
+import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -204,7 +205,7 @@ public class GrainPanel extends JPanel {
 		JFrame f = new JFrame();
 		f.setSize(1024,600);
 		f.setContentPane(this);
-		f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);
+		f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		f.setVisible(true);
 	}
 
diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
index 511fb81..2cc9501 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
@@ -12,6 +12,7 @@ import java.beans.PropertyChangeListener;
 import javax.measure.unit.SI;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.WindowConstants;
 
 import org.jscience.physics.amount.Amount;
 
@@ -20,6 +21,7 @@ import com.billkuker.rocketry.motorsim.MotorPart;
 import com.billkuker.rocketry.motorsim.Nozzle;
 
 public class NozzlePanel extends JPanel {
+	private static final long serialVersionUID = 1L;
 	private Nozzle nozzle;
 	public NozzlePanel(Nozzle n){
 		nozzle = n;
@@ -61,7 +63,7 @@ public class NozzlePanel extends JPanel {
 		JFrame f = new JFrame();
 		f.setSize(220,250);
 		f.setContentPane(this);
-		f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);
+		f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		f.setVisible(true);
 	}