Cleaned up some warnings

diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index 96fd0ed60011b877b3d98dfc2dd626cd906a2572..a037881753f90489810827c2bd4edad89807eaaf 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -30,11 +30,6 @@ public class Burn {
        \r
        private static final Amount<Pressure> atmosphereicPressure = Amount.valueOf(101000, SI.PASCAL);\r
        \r
-       \r
-       private static double combustionEfficency = 0.97;\r
-       \r
-       private static double densityRatio = 0.96;\r
-       \r
        public class Interval{\r
                public Amount<Duration> time;\r
                public Amount<Duration> dt;\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
index f5a7ed19e45bcca722f8dc1c89357d12a40a093a..9f56711d0c78b8c1f66156caaea66a70736ee951 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
@@ -9,7 +9,6 @@ import org.jscience.physics.amount.Amount;
 \r
 import com.billkuker.rocketry.motorsim.Fuel;\r
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
-import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel.Type;\r
 \r
 public class EditableFuel extends SaintRobertFuel {\r
        private double a = 0.0665;\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
index 13ba8a2558aede7c7ed23e577fb811e6e59ad16a..ba4ebe8e55e3d50c24334051cabc16d6557f289d 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
@@ -4,7 +4,6 @@ import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Velocity;\r
 import javax.measure.quantity.VolumetricDensity;\r
 import javax.measure.unit.NonSI;\r
-import javax.measure.unit.SI;\r
 import javax.measure.unit.Unit;\r
 \r
 import org.jscience.physics.amount.Amount;\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
index 4eb4a49c7bf9ec1933930662bbf306b5c25c0bfc..3aab5d5eae55dfd6629c75ddc53a25c0faa0c1d0 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
@@ -8,6 +8,7 @@ import java.awt.geom.Ellipse2D;
 import java.awt.geom.GeneralPath;\r
 import java.awt.geom.PathIterator;\r
 import java.awt.geom.Rectangle2D;\r
+\r
 import javax.measure.quantity.Length;\r
 import javax.measure.quantity.Volume;\r
 import javax.measure.unit.SI;\r

diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
index 5342f12d1ffd881f10335bf4da323c64b4e8a21d..f4dae95ac5427b2cfe7a5a36377e8d4c7072ea35 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
+++ b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
@@ -1,8 +1,6 @@
 package com.billkuker.rocketry.motorsim.io;\r
 \r
-import java.beans.XMLDecoder;\r
 import java.io.File;\r
-import java.io.FileInputStream;\r
 import java.io.FileReader;\r
 import java.io.FileWriter;\r
 import java.io.IOException;\r

diff --git a/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java b/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
index 786d0b054552fa9140dd543f69913161b883992e..d367913c74dbbd1e72e1e0299630346af2438f97 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
+++ b/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
@@ -15,7 +15,6 @@ import com.billkuker.rocketry.motorsim.fuel.KNSU;
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;\r
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;\r
 import com.billkuker.rocketry.motorsim.io.MotorIO;\r
-import com.billkuker.rocketry.motorsim.motors.kuker.PVC9;\r
 \r
 public class MotorIOTest {\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 948d9dbb6b969455530587e9e3fba11391528d56..dc69c3391b693cc19ab3408ebf5ee4d0a246ddb0 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -9,7 +9,6 @@ import javax.measure.quantity.Duration;
 import javax.measure.quantity.Force;\r
 import javax.measure.quantity.Pressure;\r
 import javax.measure.quantity.Velocity;\r
-import javax.measure.unit.NonSI;\r
 import javax.measure.unit.SI;\r
 import javax.measure.unit.Unit;\r
 import javax.swing.JFrame;\r
@@ -139,6 +138,7 @@ public class BurnPanel extends JPanel {
 \r
        }\r
        \r
+       @SuppressWarnings("unchecked")\r
        private String approx(Amount a){\r
                Unit u = RocketScience.UnitPreference.preference.getPreferredUnit(a.getUnit());\r
                double d = a.doubleValue(u);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
index f3450214f8966ea6e45327f36301cac2f18d54ec..997b030fd0e17619f08850228d13dc94bbb26192 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Chart.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
@@ -83,6 +83,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
        Method f;\r
 \r
 \r
+       @SuppressWarnings("unchecked")\r
        public Chart(Unit<X> xUnit, Unit<Y> yUnit, Object source, String method)\r
                        throws NoSuchMethodException {\r
                super(new BorderLayout());\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
index 59aecfdd1b28793c279fdf890cdd65016001a42e..8ee1b317c34fba22260c67a137c3c26c6ec9e414 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
@@ -14,10 +14,7 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;\r
 import javax.swing.JRadioButton;\r
 import javax.swing.JTabbedPane;\r
-import javax.swing.JTextArea;\r
 import javax.swing.UIManager;\r
-import javax.swing.UnsupportedLookAndFeelException;\r
-import javax.swing.border.Border;\r
 \r
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;\r
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;\r
@@ -27,14 +24,11 @@ import com.billkuker.rocketry.motorsim.Burn;
 import com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle;\r
 import com.billkuker.rocketry.motorsim.CylindricalChamber;\r
 import com.billkuker.rocketry.motorsim.Motor;\r
-import com.billkuker.rocketry.motorsim.RocketScience;\r
 import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference;\r
 import com.billkuker.rocketry.motorsim.fuel.KNSU;\r
-import com.billkuker.rocketry.motorsim.fuel.EditableFuel;\r
 import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;\r
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;\r
 import com.billkuker.rocketry.motorsim.io.MotorIO;\r
-import com.billkuker.rocketry.motorsim.motors.kuker.PVC9;\r
 \r
 public class CrappyEditor extends JFrame {\r
        JTabbedPane tabs;\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index 3a6e5e490ac0c4db4444374643707d5f8dd995bc..dd3e828db4192b5d8e8d9652d53d02313d2b8aa7 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -70,7 +70,7 @@ public class Editor extends PropertySheetPanel {
                });\r
        }\r
 \r
-       public void show() {\r
+       public void showAsWindow() {\r
                JFrame f = new JFrame();\r
                f.setTitle(obj.getClass().getName());\r
                f.setSize(600, 400);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
index bb7f7dcfbf97b24f54ba85390610903e46558cce..2dd29a30efde0735eaa458c905bb570b97d9a59f 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
@@ -70,7 +70,7 @@ public class NozzlePanel extends JPanel {
                ConvergentDivergentNozzle n = new ConvergentDivergentNozzle();\r
                n.setThroatDiameter(Amount.valueOf(5, SI.MILLIMETER));\r
                n.setExitDiameter(Amount.valueOf(9, SI.MILLIMETER));\r
-               new Editor(n).show();\r
-               new NozzlePanel(n).show();\r
+               new Editor(n).showAsWindow();\r
+               new NozzlePanel(n).showAsWindow();\r
        }\r
 }\r