From: Bill Kuker Date: Sun, 7 Nov 2010 14:04:17 +0000 (+0000) Subject: Rename burstPressure to getBurstPressure so it shows up on the editor. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=9a2f124f9eab9c31d7d12e88ef6ad9862ccf2672;p=sw%2Fmotorsim Rename burstPressure to getBurstPressure so it shows up on the editor. No setter so it is read only, but will probably allow setting in future --- diff --git a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index 632d273..2245cc1 100644 --- a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java +++ b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java @@ -154,7 +154,7 @@ public class BurnPanel extends JPanel { pressure.addRangeMarker(bi.maxPressure(), "Max", Color.BLACK); burnRate.addDomainMarker(bi.maxPressure(), "Max", RED); - Amount burst = b.getMotor().getChamber().burstPressure(); + Amount burst = b.getMotor().getChamber().getBurstPressure(); if ( burst != null ){ pressure.addRangeMarker(burst, "Burst", saftyColor); } diff --git a/src/com/billkuker/rocketry/motorsim/BurnSummary.java b/src/com/billkuker/rocketry/motorsim/BurnSummary.java index adc340c..8c53749 100644 --- a/src/com/billkuker/rocketry/motorsim/BurnSummary.java +++ b/src/com/billkuker/rocketry/motorsim/BurnSummary.java @@ -47,8 +47,8 @@ public class BurnSummary { .divide(Amount.valueOf(9.81, SI.METERS_PER_SQUARE_SECOND)).to(SI.SECOND); - if ( b.getMotor().getChamber().burstPressure() != null ) - saftyFactor = b.getMotor().getChamber().burstPressure().divide(maxPressure).to(Dimensionless.UNIT).doubleValue(Dimensionless.UNIT); + if ( b.getMotor().getChamber().getBurstPressure() != null ) + saftyFactor = b.getMotor().getChamber().getBurstPressure().divide(maxPressure).to(Dimensionless.UNIT).doubleValue(Dimensionless.UNIT); } public String getRating() { diff --git a/src/com/billkuker/rocketry/motorsim/Chamber.java b/src/com/billkuker/rocketry/motorsim/Chamber.java index 2b84c2d..3352ee3 100644 --- a/src/com/billkuker/rocketry/motorsim/Chamber.java +++ b/src/com/billkuker/rocketry/motorsim/Chamber.java @@ -10,7 +10,7 @@ import org.jscience.physics.amount.Amount; public interface Chamber { public Amount chamberVolume(); - public Amount burstPressure(); + public Amount getBurstPressure(); public Shape chamberShape(); } diff --git a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java index 8642c25..5ed318e 100644 --- a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java +++ b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java @@ -17,7 +17,7 @@ public class CylindricalChamber implements Chamber { private Amount oD = Amount.valueOf(31, SI.MILLIMETER); private Amount iD = Amount.valueOf(30, SI.MILLIMETER); - public Amount burstPressure() { + public Amount getBurstPressure() { return null; } diff --git a/src/com/billkuker/rocketry/motorsim/cases/Schedule40.java b/src/com/billkuker/rocketry/motorsim/cases/Schedule40.java index 5372dea..2a2beeb 100644 --- a/src/com/billkuker/rocketry/motorsim/cases/Schedule40.java +++ b/src/com/billkuker/rocketry/motorsim/cases/Schedule40.java @@ -60,7 +60,7 @@ public class Schedule40 implements Chamber { } @Override - public Amount burstPressure() { + public Amount getBurstPressure() { return size.burst; } diff --git a/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java b/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java index 333cdfb..10b38a5 100644 --- a/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java +++ b/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java @@ -12,7 +12,7 @@ public class CylindricalChamberTest extends AbstractRocketTest { @Test public void testBurstPressure() { - Assert.assertNull( new CylindricalChamber().burstPressure() ); + Assert.assertNull( new CylindricalChamber().getBurstPressure() ); } @Test