Switched from 1.6 to 1.5 for more compatibility.

Only source change is older @Override semantics :(

diff --git a/.fatjar b/.fatjar
new file mode 100644 (file)
index 0000000..8ef928c
--- /dev/null
+++ b/.fatjar
@@ -0,0 +1,14 @@
+#Fat Jar Configuration File\r
+#Thu Apr 16 10:44:22 EDT 2009\r
+onejar.license.required=true\r
+manifest.classpath=\r
+manifest.removesigners=true\r
+onejar.checkbox=false\r
+jarname=MotorSim-0.1.jar\r
+manifest.mergeall=true\r
+manifest.mainclass=com.billkuker.rocketry.motorsim.visual.CrappyEditor\r
+manifest.file=<createnew>\r
+jarname.isextern=false\r
+onejar.expand=\r
+excludes=\r
+includes=\r

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 667d97f60ef6a119ab4283c9dd1a568eb101d14c..fb7b8be28413a022c22690f148cfcafa840cdd6c 100644 (file)
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Thu Apr 09 17:28:08 EDT 2009\r
+#Thu Apr 16 13:23:51 EDT 2009\r
 eclipse.preferences.version=1\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate\r
 org.eclipse.jdt.core.compiler.debug.localVariable=generate\r
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.compiler.source=1.5\r

diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 23755fdfa079ed36339e72f56f92c94c99034a6d..d975797875562178893a8f04a93ab6769033ac9c 100644 (file)
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,3 @@
-#Thu Apr 09 17:28:08 EDT 2009\r
+#Thu Apr 16 13:17:57 EDT 2009\r
 eclipse.preferences.version=1\r
 internal.default.compliance=default\r

diff --git a/src/TriTest.java b/src/TriTest.java
index a38d7030c1e01844362c11fd18ed928a6fd882f8..11716cf4fd2819832a4a35c251e5d0e3d7975dcf 100644 (file)
--- a/src/TriTest.java
+++ b/src/TriTest.java
@@ -141,7 +141,6 @@ public class TriTest extends JPanel {
                                setMaximum(100);\r
                                addChangeListener(new ChangeListener(){\r
                                        { setValue(0); }\r
-                                       @Override\r
                                        public void stateChanged(ChangeEvent arg0) {\r
                                                t.r = getValue();\r
                                                t.repaint();\r

diff --git a/src/com/billkuker/rocketry/motorsim/ConvergentDivergentNozzle.java b/src/com/billkuker/rocketry/motorsim/ConvergentDivergentNozzle.java
index d301f442b3e875999d55fe107daa6e070a338817..8ce520f15918226b33ba244a18dfa238b388f33e 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/ConvergentDivergentNozzle.java
+++ b/src/com/billkuker/rocketry/motorsim/ConvergentDivergentNozzle.java
@@ -23,7 +23,6 @@ public class ConvergentDivergentNozzle extends MotorPart implements Nozzle {
        private double efficiency = 1.0;\r
        \r
        \r
-       @Override\r
        public Amount<Area> throatArea() {\r
                return throatDiameter.divide(2).pow(2).times(Math.PI).to(Area.UNIT);\r
        }\r
@@ -60,7 +59,6 @@ public class ConvergentDivergentNozzle extends MotorPart implements Nozzle {
                firePropertyChange("exitDiameter", old, exitDiameter);\r
        }\r
        \r
-       @Override\r
        public Amount<Force> thrust(Amount<Pressure> Po, Amount<Pressure> Pe, Amount<Pressure> Patm, final double k ){\r
                double cF = thrustCoefficient(Po, Pe, Patm, k);\r
                return Po.times(throatArea()).times(cF).to(Force.UNIT);\r

diff --git a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java
index cfac36dc42c707f0abd8eba16d43ea513fd5a83e..719f4d5fe97933929c1331e7f1b651779f919a36 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java
+++ b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java
@@ -13,12 +13,10 @@ public class CylindricalChamber implements Chamber {
        \r
        private Amount<Length> iD;\r
 \r
-       @Override\r
        public Amount<Pressure> burstPressure() {\r
                return null;\r
        }\r
 \r
-       @Override\r
        public Amount<Volume> chamberVolume() {\r
                return iD.divide(2).pow(2).times(Math.PI).times(length).to(SI.CUBIC_METRE);\r
        }\r

diff --git a/src/com/billkuker/rocketry/motorsim/MotorPart.java b/src/com/billkuker/rocketry/motorsim/MotorPart.java
index 4f9d03f53e76d9a41e04d7b349914847dff37b09..eeded4d2da8b1829e78e285d7d5350ff00d204eb 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/MotorPart.java
+++ b/src/com/billkuker/rocketry/motorsim/MotorPart.java
@@ -41,7 +41,6 @@ public class MotorPart {
                \r
                vcs.addVetoableChangeListener(new VetoableChangeListener(){\r
                        @SuppressWarnings("unchecked")\r
-                       @Override\r
                        public void vetoableChange(PropertyChangeEvent evt) throws PropertyVetoException {\r
                                if ( evt.getNewValue() instanceof Amount ){\r
                                        try {\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
index 6eb039bc5db802e643b18f85a81f28656c0d7a7c..d835178c6f60265425a4339464db7bfec2b6726a 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
@@ -27,26 +27,21 @@ public class KNSB extends PiecewiseSaintRobertFuel {
                return Amount.valueOf(1841, 0, SI.KILOGRAM.divide(SI.METER.pow(3))).to(VolumetricDensity.UNIT);\r
        }\r
 \r
-       @Override\r
        public CombustionProduct getCombustionProduct() {\r
                return new CombustionProduct(){\r
                        \r
-                       @Override\r
                        public Amount<Temperature> idealCombustionTemperature() {\r
                                return Amount.valueOf(1600, SI.KELVIN);\r
                        }\r
                \r
-                       @Override\r
                        public Amount<MolarWeight> effectiveMolarWeight() {\r
                                return Amount.valueOf("39.9 kg/kmol").to(MolarWeight.UNIT);\r
                        }\r
                \r
-                       @Override\r
                        public double ratioOfSpecificHeats() {\r
                                return 1.1361;\r
                        }\r
                \r
-                       @Override\r
                        public double ratioOfSpecificHeats2Phase() {\r
                                return 1.042;\r
                        }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java
index bcd0cf03cc6fcbf321d1e010a583d5ee30441c41..cac65fc049101e7424924093b10557242ef7e889 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java
@@ -34,22 +34,18 @@ public class KNSU extends SaintRobertFuel {
        public CombustionProduct getCombustionProduct(){\r
                return new CombustionProduct(){\r
                \r
-                       @Override\r
                        public Amount<Temperature> idealCombustionTemperature() {\r
                                return Amount.valueOf(1720, SI.KELVIN);\r
                        }\r
                \r
-                       @Override\r
                        public Amount<MolarWeight> effectiveMolarWeight() {\r
                                return Amount.valueOf("41.98 kg/kmol").to(MolarWeight.UNIT);\r
                        }\r
                \r
-                       @Override\r
                        public double ratioOfSpecificHeats() {\r
                                return 1.133;\r
                        }\r
                \r
-                       @Override\r
                        public double ratioOfSpecificHeats2Phase() {\r
                                return 1.044;\r
                        }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
index a255282fa8b0c37c6111f1cf0dd4b27aeda51ac1..be87e87811af62085a00ea99df84850efb942900 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
@@ -37,7 +37,6 @@ public abstract class SaintRobertFuel implements Fuel {
                this.t = t;\r
        }\r
 \r
-       @Override\r
        public Amount<Velocity> burnRate(Amount<Pressure> pressure) {\r
 \r
                \r
@@ -56,7 +55,6 @@ public abstract class SaintRobertFuel implements Fuel {
                return Amount.valueOf(0, Velocity.UNIT);\r
        }\r
 \r
-       @Override\r
        public abstract Amount<VolumetricDensity> idealDensity();\r
 \r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
index dc44a5372c234cc56bc2af4a2cde00ebe6110b13..21730589b9f5e60a6c5335e7660bfafc04eda73d 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
@@ -49,7 +49,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va
                innerSurfaceInhibited = in;\r
        }\r
 \r
-       @Override\r
        public Amount<Area> surfaceArea(Amount<Length> regression) {\r
                Amount<Length> zero = Amount.valueOf(0, SI.MILLIMETER);\r
                if ( regression.isLessThan(zero) )\r
@@ -88,7 +87,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va
                return total;\r
        }\r
 \r
-       @Override\r
        public Amount<Volume> volume(Amount<Length> regression) {\r
                Amount<Length> zero = Amount.valueOf(0, SI.MILLIMETER);\r
                \r
@@ -152,7 +150,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va
                \r
        }\r
 \r
-       @Override\r
        public Amount<Length> webThickness() {\r
                if ( innerSurfaceInhibited && outerSurfaceInhibited ){\r
                        return oD; //TODO gotta move this to the end\r
@@ -186,7 +183,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va
                return iD;\r
        }\r
        \r
-       @Override\r
        public java.awt.geom.Area getCrossSection(Amount<Length> regression){\r
                Amount<Length> zero = Amount.valueOf(0, SI.MILLIMETER);\r
                if ( regression.isLessThan(zero) )\r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
index fbd6d7ada18b797b760e7e17f3472965267e7dc4..179a06495b81079c7cbb3fc09eaf639b12495e9e 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java
@@ -45,7 +45,6 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
 \r
        Amount<Length> webThickness;\r
 \r
-       @Override\r
        public Amount<Area> surfaceArea(Amount<Length> regression) {\r
                Amount<Area> zero = Amount.valueOf(0, Area.UNIT);\r
                \r
@@ -73,7 +72,6 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
                                xSection.times(2)).to(Area.UNIT);\r
        }\r
 \r
-       @Override\r
        public Amount<Volume> volume(Amount<Length> regression) {\r
                Amount<Volume> zero = Amount.valueOf(0, Volume.UNIT);\r
                \r
@@ -91,7 +89,6 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
        }\r
 \r
 \r
-       @Override\r
        public Amount<Length> webThickness() {\r
                if ( webThickness != null )\r
                        return webThickness;\r
@@ -122,12 +119,10 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain {
                return webThickness;\r
        }\r
 \r
-       @Override\r
        public java.awt.geom.Area getCrossSection(Amount<Length> regression) {\r
                return xsection.getShape(regression);\r
        }\r
        \r
-       @Override\r
        public java.awt.geom.Area getSideView(Amount<Length> regression) {\r
                java.awt.geom.Area res = new java.awt.geom.Area();\r
                \r

diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
index 821cb5a42dcea57b79a36095a52bfa65fb2e9ffc..4eb4a49c7bf9ec1933930662bbf306b5c25c0bfc 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java
@@ -65,7 +65,6 @@ public class RotatedShapeGrain implements Grain {
        \r
        Amount<Length> web = null;\r
        \r
-       @Override\r
        public Area getCrossSection(Amount<Length> regression) {\r
                Area ret = new Area();\r
                for( Area a : ShapeUtil.separate(shape.getShape(regression))){\r
@@ -79,7 +78,6 @@ public class RotatedShapeGrain implements Grain {
                return ret;\r
        }\r
 \r
-       @Override\r
        public Area getSideView(Amount<Length> regression) {\r
                Area a = new Area();\r
                Area reg = shape.getShape(regression);\r
@@ -89,7 +87,6 @@ public class RotatedShapeGrain implements Grain {
                return a;\r
        }\r
 \r
-       @Override\r
        public Amount<javax.measure.quantity.Area> surfaceArea(\r
                        Amount<Length> regression) {\r
                Amount<javax.measure.quantity.Area> zero = Amount.valueOf(0, javax.measure.quantity.Area.UNIT);\r
@@ -112,7 +109,6 @@ public class RotatedShapeGrain implements Grain {
 \r
        }\r
 \r
-       @Override\r
        public Amount<Volume> volume(Amount<Length> regression) {\r
                Area squared = new Area(square(shape.getShape(regression)));\r
                Amount<javax.measure.quantity.Area> sum = Amount.valueOf(0, SI.SQUARE_METRE);\r
@@ -123,7 +119,6 @@ public class RotatedShapeGrain implements Grain {
                return v;\r
        }\r
 \r
-       @Override\r
        public Amount<Length> webThickness() {\r
                if (web != null)\r
                        return web;\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index c387832fd9a93aa37b946216fd4b2396c93bee7b..0e8eeb16d4ef2cae3f014e4973054daa95646e65 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -97,7 +97,6 @@ public class BurnPanel extends JPanel {
                        setValue(0);\r
                }\r
                \r
-               @Override\r
                public void stateChanged(ChangeEvent e) {\r
                        double t = ((SL)e.getSource()).getValue();\r
                        displayedTime = burn.burnTime().divide(STEPS).times(t);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
index 09637baef9610c17571ee857af7016ffb7f54dc1..a8cddd06b3a2259a99278206e73c349792c44fd2 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Chart.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
@@ -48,23 +48,20 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
                }\r
 \r
 \r
-               @Override\r
                public Iterator<Amount<X>> iterator() {\r
                        return new Iterator<Amount<X>>(){\r
                                Amount<X> current = low;\r
                                \r
-                               @Override\r
                                public boolean hasNext() {\r
                                        return current.isLessThan(high.plus(delta));\r
                                }\r
 \r
-                               @Override\r
                                public Amount<X> next() {\r
                                        Amount<X> ret = current;\r
                                        current = current.plus(delta);\r
                                        return ret;\r
                                }\r
-                               @Override\r
+                               \r
                                public final void remove() {\r
                                        throw new UnsupportedOperationException("Chart domain iterators are not modifiable.");\r
                                }\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index de659622ab91659c39e12c503d66b7d46d2c1420..3a6e5e490ac0c4db4444374643707d5f8dd995bc 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -52,7 +52,6 @@ public class Editor extends PropertySheetPanel {
 \r
                addPropertySheetChangeListener(new PropertyChangeListener() {\r
 \r
-                       @Override\r
                        public void propertyChange(PropertyChangeEvent evt) {\r
                                // When something changes just update the\r
                                // object, I want the changes to be immediate.\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
index ce3ecf57a9ca088e2705abb0861845f938df0782..5ba279fbbee088ab437eff55d35554d1def74d37 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
@@ -45,7 +45,6 @@ public class GrainPanel extends JPanel {
                \r
                if ( g instanceof MotorPart ){\r
                        ((MotorPart)g).addPropertyChangeListener(new PropertyChangeListener(){\r
-                               @Override\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        repaint();\r
                                        area.setDomain(area.new IntervalDomain(Amount.valueOf(0, SI.MILLIMETER), grain.webThickness()));\r
@@ -192,7 +191,6 @@ public class GrainPanel extends JPanel {
                        setValue(0);\r
                }\r
                \r
-               @Override\r
                public void stateChanged(ChangeEvent e) {\r
                        double r = ((SL)e.getSource()).getValue();\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
index 9552756a7c25247ab777114f0bc669b1ce981d56..bb7f7dcfbf97b24f54ba85390610903e46558cce 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java
@@ -28,7 +28,6 @@ public class NozzlePanel extends JPanel {
                \r
                if ( n instanceof MotorPart ){\r
                        ((MotorPart)n).addPropertyChangeListener(new PropertyChangeListener(){\r
-                               @Override\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        repaint();\r
                                }\r