Cleared some warnings

diff --git a/src/com/billkuker/rocketry/motorsim/MotorPart.java b/src/com/billkuker/rocketry/motorsim/MotorPart.java
index b60484c4d40f4e971c76bf9200c34cf02a5504b6..1bd054edcc4a6dd753294e5a436f3e09bd5443b9 100644 (file)
--- 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())){\r
                                                        Type t = ps[i].getReadMethod().getGenericReturnType();\r
                                                        ParameterizedType p = (ParameterizedType) t;\r
-                                                       Class expected = (Class) p.getActualTypeArguments()[0];\r
+                                                       Class expected = (Class)p.getActualTypeArguments()[0];\r
                                                        Field f = expected.getDeclaredField("UNIT");\r
                                                        Unit u = (Unit) f.get(null);\r
                                                        \r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedGrain.java
index cf9963c92d1a604b68f6a88311c52433c7d32f28..18d856af54770d9a596303a0a80d94a03c0f37b1 100644 (file)
--- 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 {
 \r
        Amount<Length> rStep;\r
 \r
-       private class RegEntry {\r
-               Amount<Area> surfaceArea;\r
-\r
-               Amount<Volume> volume;\r
-       }\r
-\r
        Amount<Length> webThickness;\r
 \r
        {\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 11def5674d609d8ef92e7e25c391ef900cb7183c..556de4b5f9e8551727b58de00f90087da0ea5c3d 100644 (file)
--- 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;\r
 import javax.swing.JSlider;\r
 import javax.swing.JSplitPane;\r
+import javax.swing.WindowConstants;\r
 import javax.swing.event.ChangeEvent;\r
 import javax.swing.event.ChangeListener;\r
 \r
@@ -20,6 +21,7 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Burn;\r
 \r
 public class BurnPanel extends JPanel {\r
+       private static final long serialVersionUID = 1L;\r
        private Burn burn;\r
        Chart<Duration, Pressure> pressure;\r
        Chart<Duration, Force> thrust;\r
@@ -133,7 +135,7 @@ public class BurnPanel extends JPanel {
                f.setSize(1280,720);\r
                f.setLocation(0, 0);\r
                f.setContentPane(this);\r
-               f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);\r
+               f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);\r
                f.setVisible(true);\r
        }\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
index 3504a7f89462861caaebe34464697aebba348917..8a7985be2d810025f5bd6ecdfdee92f70060bce2 100644 (file)
--- 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;\r
 \r
 public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {\r
+       private static final long serialVersionUID = 1L;\r
 \r
-       \r
        public class IntervalDomain implements Iterable<Amount<X>>{\r
                \r
                Amount<X> low, high, delta;\r
@@ -131,7 +131,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
                series.clear();\r
                for( Amount<X> ax: d){\r
                        try {\r
-                               Amount<Y> y = (Amount<Y>) f.invoke(source, ax);\r
+                               Amount<Y> y = (Amount<Y>)f.invoke(source, ax);\r
                                add(ax, y);\r
                        } catch (IllegalArgumentException e) {\r
                                // TODO Auto-generated catch block\r
@@ -152,6 +152,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
        \r
        public void show(){\r
                new JFrame(){\r
+                       private static final long serialVersionUID = 1L;\r
                        {\r
                                setContentPane(Chart.this);\r
                                setSize(640,480);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index 312734d406c8f1e8104d018aaba6112338e22153..ef94189641bc483eaa89a17a012e3df6a2c0e251 100644 (file)
--- 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;\r
 \r
 public class Editor extends JPanel {\r
+       private static final long serialVersionUID = 1L;\r
+\r
        private static Logger log = Logger.getLogger(Editor.class);\r
 \r
        private Object obj;\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
index 035c187c303b32b615e16ec717b36317c51bcef4..cbb48f50641500a25815b3c1e439ff39045fb951 100644 (file)
--- 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;\r
 import javax.swing.JSlider;\r
 import javax.swing.JSplitPane;\r
+import javax.swing.WindowConstants;\r
 import javax.swing.event.ChangeEvent;\r
 import javax.swing.event.ChangeListener;\r
 \r
@@ -204,7 +205,7 @@ public class GrainPanel extends JPanel {
                JFrame f = new JFrame();\r
                f.setSize(1024,600);\r
                f.setContentPane(this);\r
-               f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);\r
+               f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);\r
                f.setVisible(true);\r
        }\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
index 511fb81087277c2ccb21f66c5c8d597cce00ed39..2cc950176801a80d25f635d5d52369b61e2b4069 100644 (file)
--- 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;\r
 import javax.swing.JFrame;\r
 import javax.swing.JPanel;\r
+import javax.swing.WindowConstants;\r
 \r
 import org.jscience.physics.amount.Amount;\r
 \r
@@ -20,6 +21,7 @@ import com.billkuker.rocketry.motorsim.MotorPart;
 import com.billkuker.rocketry.motorsim.Nozzle;\r
 \r
 public class NozzlePanel extends JPanel {\r
+       private static final long serialVersionUID = 1L;\r
        private Nozzle nozzle;\r
        public NozzlePanel(Nozzle n){\r
                nozzle = n;\r
@@ -61,7 +63,7 @@ public class NozzlePanel extends JPanel {
                JFrame f = new JFrame();\r
                f.setSize(220,250);\r
                f.setContentPane(this);\r
-               f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);\r
+               f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);\r
                f.setVisible(true);\r
        }\r
        \r