From: Bill Kuker Date: Sat, 18 Apr 2009 18:23:04 +0000 (+0000) Subject: Cleaned up some warnings X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c45a5f1d13f607fe37a4d991fd228548eae52dbc;p=sw%2Fmotorsim Cleaned up some warnings --- diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java index 96fd0ed..a037881 100644 --- a/src/com/billkuker/rocketry/motorsim/Burn.java +++ b/src/com/billkuker/rocketry/motorsim/Burn.java @@ -30,11 +30,6 @@ public class Burn { private static final Amount atmosphereicPressure = Amount.valueOf(101000, SI.PASCAL); - - private static double combustionEfficency = 0.97; - - private static double densityRatio = 0.96; - public class Interval{ public Amount time; public Amount dt; diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java index f5a7ed1..9f56711 100644 --- 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; import com.billkuker.rocketry.motorsim.Fuel; import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight; -import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel.Type; public class EditableFuel extends SaintRobertFuel { private double a = 0.0665; diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java index 13ba8a2..ba4ebe8 100644 --- 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; import javax.measure.quantity.VolumetricDensity; import javax.measure.unit.NonSI; -import javax.measure.unit.SI; import javax.measure.unit.Unit; import org.jscience.physics.amount.Amount; diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java index 4eb4a49..3aab5d5 100644 --- 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; import java.awt.geom.PathIterator; import java.awt.geom.Rectangle2D; + import javax.measure.quantity.Length; import javax.measure.quantity.Volume; import javax.measure.unit.SI; diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java index 5342f12..f4dae95 100644 --- 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; -import java.beans.XMLDecoder; import java.io.File; -import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; diff --git a/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java b/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java index 786d0b0..d367913 100644 --- 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; import com.billkuker.rocketry.motorsim.grain.MultiGrain; import com.billkuker.rocketry.motorsim.io.MotorIO; -import com.billkuker.rocketry.motorsim.motors.kuker.PVC9; public class MotorIOTest { diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index 948d9db..dc69c33 100644 --- 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; import javax.measure.quantity.Pressure; import javax.measure.quantity.Velocity; -import javax.measure.unit.NonSI; import javax.measure.unit.SI; import javax.measure.unit.Unit; import javax.swing.JFrame; @@ -139,6 +138,7 @@ public class BurnPanel extends JPanel { } + @SuppressWarnings("unchecked") private String approx(Amount a){ Unit u = RocketScience.UnitPreference.preference.getPreferredUnit(a.getUnit()); double d = a.doubleValue(u); diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java index f345021..997b030 100644 --- 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 extends JPanel { Method f; + @SuppressWarnings("unchecked") public Chart(Unit xUnit, Unit yUnit, Object source, String method) throws NoSuchMethodException { super(new BorderLayout()); diff --git a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java index 59aecfd..8ee1b31 100644 --- 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; import javax.swing.JRadioButton; import javax.swing.JTabbedPane; -import javax.swing.JTextArea; import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.Border; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; @@ -27,14 +24,11 @@ import com.billkuker.rocketry.motorsim.Burn; import com.billkuker.rocketry.motorsim.ConvergentDivergentNozzle; import com.billkuker.rocketry.motorsim.CylindricalChamber; import com.billkuker.rocketry.motorsim.Motor; -import com.billkuker.rocketry.motorsim.RocketScience; import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference; import com.billkuker.rocketry.motorsim.fuel.KNSU; -import com.billkuker.rocketry.motorsim.fuel.EditableFuel; import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain; import com.billkuker.rocketry.motorsim.grain.MultiGrain; import com.billkuker.rocketry.motorsim.io.MotorIO; -import com.billkuker.rocketry.motorsim.motors.kuker.PVC9; public class CrappyEditor extends JFrame { JTabbedPane tabs; diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java index 3a6e5e4..dd3e828 100644 --- 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 { }); } - public void show() { + public void showAsWindow() { JFrame f = new JFrame(); f.setTitle(obj.getClass().getName()); f.setSize(600, 400); diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java index bb7f7dc..2dd29a3 100644 --- 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(); n.setThroatDiameter(Amount.valueOf(5, SI.MILLIMETER)); n.setExitDiameter(Amount.valueOf(9, SI.MILLIMETER)); - new Editor(n).show(); - new NozzlePanel(n).show(); + new Editor(n).showAsWindow(); + new NozzlePanel(n).showAsWindow(); } }