From: Bill Kuker Date: Thu, 16 Apr 2009 17:30:17 +0000 (+0000) Subject: Switched from 1.6 to 1.5 for more compatibility. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=091a245b2cf8cbb1c7d8cfd83c9def0a644fd86b;p=sw%2Fmotorsim 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 index 0000000..8ef928c --- /dev/null +++ b/.fatjar @@ -0,0 +1,14 @@ +#Fat Jar Configuration File +#Thu Apr 16 10:44:22 EDT 2009 +onejar.license.required=true +manifest.classpath= +manifest.removesigners=true +onejar.checkbox=false +jarname=MotorSim-0.1.jar +manifest.mergeall=true +manifest.mainclass=com.billkuker.rocketry.motorsim.visual.CrappyEditor +manifest.file= +jarname.isextern=false +onejar.expand= +excludes= +includes= diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 667d97f..fb7b8be 100644 --- 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 +#Thu Apr 16 13:23:51 EDT 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 23755fd..d975797 100644 --- 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 +#Thu Apr 16 13:17:57 EDT 2009 eclipse.preferences.version=1 internal.default.compliance=default diff --git a/src/TriTest.java b/src/TriTest.java index a38d703..11716cf 100644 --- a/src/TriTest.java +++ b/src/TriTest.java @@ -141,7 +141,6 @@ public class TriTest extends JPanel { setMaximum(100); addChangeListener(new ChangeListener(){ { setValue(0); } - @Override public void stateChanged(ChangeEvent arg0) { t.r = getValue(); t.repaint(); diff --git a/src/com/billkuker/rocketry/motorsim/ConvergentDivergentNozzle.java b/src/com/billkuker/rocketry/motorsim/ConvergentDivergentNozzle.java index d301f44..8ce520f 100644 --- 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; - @Override public Amount throatArea() { return throatDiameter.divide(2).pow(2).times(Math.PI).to(Area.UNIT); } @@ -60,7 +59,6 @@ public class ConvergentDivergentNozzle extends MotorPart implements Nozzle { firePropertyChange("exitDiameter", old, exitDiameter); } - @Override public Amount thrust(Amount Po, Amount Pe, Amount Patm, final double k ){ double cF = thrustCoefficient(Po, Pe, Patm, k); return Po.times(throatArea()).times(cF).to(Force.UNIT); diff --git a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java index cfac36d..719f4d5 100644 --- 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 { private Amount iD; - @Override public Amount burstPressure() { return null; } - @Override public Amount chamberVolume() { return iD.divide(2).pow(2).times(Math.PI).times(length).to(SI.CUBIC_METRE); } diff --git a/src/com/billkuker/rocketry/motorsim/MotorPart.java b/src/com/billkuker/rocketry/motorsim/MotorPart.java index 4f9d03f..eeded4d 100644 --- a/src/com/billkuker/rocketry/motorsim/MotorPart.java +++ b/src/com/billkuker/rocketry/motorsim/MotorPart.java @@ -41,7 +41,6 @@ public class MotorPart { vcs.addVetoableChangeListener(new VetoableChangeListener(){ @SuppressWarnings("unchecked") - @Override public void vetoableChange(PropertyChangeEvent evt) throws PropertyVetoException { if ( evt.getNewValue() instanceof Amount ){ try { diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java index 6eb039b..d835178 100644 --- 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); } - @Override public CombustionProduct getCombustionProduct() { return new CombustionProduct(){ - @Override public Amount idealCombustionTemperature() { return Amount.valueOf(1600, SI.KELVIN); } - @Override public Amount effectiveMolarWeight() { return Amount.valueOf("39.9 kg/kmol").to(MolarWeight.UNIT); } - @Override public double ratioOfSpecificHeats() { return 1.1361; } - @Override public double ratioOfSpecificHeats2Phase() { return 1.042; } diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSU.java index bcd0cf0..cac65fc 100644 --- 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(){ return new CombustionProduct(){ - @Override public Amount idealCombustionTemperature() { return Amount.valueOf(1720, SI.KELVIN); } - @Override public Amount effectiveMolarWeight() { return Amount.valueOf("41.98 kg/kmol").to(MolarWeight.UNIT); } - @Override public double ratioOfSpecificHeats() { return 1.133; } - @Override public double ratioOfSpecificHeats2Phase() { return 1.044; } diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java index a255282..be87e87 100644 --- 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; } - @Override public Amount burnRate(Amount pressure) { @@ -56,7 +55,6 @@ public abstract class SaintRobertFuel implements Fuel { return Amount.valueOf(0, Velocity.UNIT); } - @Override public abstract Amount idealDensity(); } diff --git a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java index dc44a53..2173058 100644 --- 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; } - @Override public Amount surfaceArea(Amount regression) { Amount zero = Amount.valueOf(0, SI.MILLIMETER); if ( regression.isLessThan(zero) ) @@ -88,7 +87,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va return total; } - @Override public Amount volume(Amount regression) { Amount zero = Amount.valueOf(0, SI.MILLIMETER); @@ -152,7 +150,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va } - @Override public Amount webThickness() { if ( innerSurfaceInhibited && outerSurfaceInhibited ){ return oD; //TODO gotta move this to the end @@ -186,7 +183,6 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements MotorPart.Va return iD; } - @Override public java.awt.geom.Area getCrossSection(Amount regression){ Amount zero = Amount.valueOf(0, SI.MILLIMETER); if ( regression.isLessThan(zero) ) diff --git a/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/ExtrudedShapeGrain.java index fbd6d7a..179a064 100644 --- 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 { Amount webThickness; - @Override public Amount surfaceArea(Amount regression) { Amount zero = Amount.valueOf(0, Area.UNIT); @@ -73,7 +72,6 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain { xSection.times(2)).to(Area.UNIT); } - @Override public Amount volume(Amount regression) { Amount zero = Amount.valueOf(0, Volume.UNIT); @@ -91,7 +89,6 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain { } - @Override public Amount webThickness() { if ( webThickness != null ) return webThickness; @@ -122,12 +119,10 @@ public class ExtrudedShapeGrain extends MotorPart implements Grain { return webThickness; } - @Override public java.awt.geom.Area getCrossSection(Amount regression) { return xsection.getShape(regression); } - @Override public java.awt.geom.Area getSideView(Amount regression) { java.awt.geom.Area res = new java.awt.geom.Area(); diff --git a/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RotatedShapeGrain.java index 821cb5a..4eb4a49 100644 --- 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 { Amount web = null; - @Override public Area getCrossSection(Amount regression) { Area ret = new Area(); for( Area a : ShapeUtil.separate(shape.getShape(regression))){ @@ -79,7 +78,6 @@ public class RotatedShapeGrain implements Grain { return ret; } - @Override public Area getSideView(Amount regression) { Area a = new Area(); Area reg = shape.getShape(regression); @@ -89,7 +87,6 @@ public class RotatedShapeGrain implements Grain { return a; } - @Override public Amount surfaceArea( Amount regression) { Amount zero = Amount.valueOf(0, javax.measure.quantity.Area.UNIT); @@ -112,7 +109,6 @@ public class RotatedShapeGrain implements Grain { } - @Override public Amount volume(Amount regression) { Area squared = new Area(square(shape.getShape(regression))); Amount sum = Amount.valueOf(0, SI.SQUARE_METRE); @@ -123,7 +119,6 @@ public class RotatedShapeGrain implements Grain { return v; } - @Override public Amount webThickness() { if (web != null) return web; diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index c387832..0e8eeb1 100644 --- 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); } - @Override public void stateChanged(ChangeEvent e) { double t = ((SL)e.getSource()).getValue(); displayedTime = burn.burnTime().divide(STEPS).times(t); diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java index 09637ba..a8cddd0 100644 --- 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 extends JPanel { } - @Override public Iterator> iterator() { return new Iterator>(){ Amount current = low; - @Override public boolean hasNext() { return current.isLessThan(high.plus(delta)); } - @Override public Amount next() { Amount ret = current; current = current.plus(delta); return ret; } - @Override + public final void remove() { throw new UnsupportedOperationException("Chart domain iterators are not modifiable."); } diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java index de65962..3a6e5e4 100644 --- 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 { addPropertySheetChangeListener(new PropertyChangeListener() { - @Override public void propertyChange(PropertyChangeEvent evt) { // When something changes just update the // object, I want the changes to be immediate. diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java index ce3ecf5..5ba279f 100644 --- 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 { if ( g instanceof MotorPart ){ ((MotorPart)g).addPropertyChangeListener(new PropertyChangeListener(){ - @Override public void propertyChange(PropertyChangeEvent evt) { repaint(); area.setDomain(area.new IntervalDomain(Amount.valueOf(0, SI.MILLIMETER), grain.webThickness())); @@ -192,7 +191,6 @@ public class GrainPanel extends JPanel { setValue(0); } - @Override public void stateChanged(ChangeEvent e) { double r = ((SL)e.getSource()).getValue(); diff --git a/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java b/src/com/billkuker/rocketry/motorsim/visual/NozzlePanel.java index 9552756..bb7f7dc 100644 --- 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 { if ( n instanceof MotorPart ){ ((MotorPart)n).addPropertyChangeListener(new PropertyChangeListener(){ - @Override public void propertyChange(PropertyChangeEvent evt) { repaint(); }