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 632d273b00385686c7e5c5aebe5b1700f365893d..2245cc1a8a3384eefc5560c1052f288ab8a4fcca 100644 (file)
--- 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);\r
                                burnRate.addDomainMarker(bi.maxPressure(), "Max", RED);\r
                                \r
-                               Amount<Pressure> burst = b.getMotor().getChamber().burstPressure();\r
+                               Amount<Pressure> burst = b.getMotor().getChamber().getBurstPressure();\r
                                if ( burst != null ){\r
                                        pressure.addRangeMarker(burst, "Burst", saftyColor);\r
                                }\r

diff --git a/src/com/billkuker/rocketry/motorsim/BurnSummary.java b/src/com/billkuker/rocketry/motorsim/BurnSummary.java
index adc340cc685893693f52277af8efb4c7e819c788..8c53749e1adca094f410ef1a91b0c6448f0083fa 100644 (file)
--- 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,\r
                                SI.METERS_PER_SQUARE_SECOND)).to(SI.SECOND);\r
 \r
-               if ( b.getMotor().getChamber().burstPressure() != null )\r
-                       saftyFactor = b.getMotor().getChamber().burstPressure().divide(maxPressure).to(Dimensionless.UNIT).doubleValue(Dimensionless.UNIT);\r
+               if ( b.getMotor().getChamber().getBurstPressure() != null )\r
+                       saftyFactor = b.getMotor().getChamber().getBurstPressure().divide(maxPressure).to(Dimensionless.UNIT).doubleValue(Dimensionless.UNIT);\r
        }\r
 \r
        public String getRating() {\r

diff --git a/src/com/billkuker/rocketry/motorsim/Chamber.java b/src/com/billkuker/rocketry/motorsim/Chamber.java
index 2b84c2d2e3d2dd0965ca9deb66ed009af32ffd7b..3352ee3bd4d6e88619bb7c37bef91ca661ab140b 100644 (file)
--- 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 {\r
        public Amount<Volume> chamberVolume();\r
        \r
-       public Amount<Pressure> burstPressure();\r
+       public Amount<Pressure> getBurstPressure();\r
        \r
        public Shape chamberShape();\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java
index 8642c25dc4874e8fc8fffc80e9b6a050e27bc657..5ed318e42107f79d5d149ade9071c00511a31788 100644 (file)
--- 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<Length> oD = Amount.valueOf(31, SI.MILLIMETER);\r
        private Amount<Length> iD = Amount.valueOf(30, SI.MILLIMETER);\r
 \r
-       public Amount<Pressure> burstPressure() {\r
+       public Amount<Pressure> getBurstPressure() {\r
                return null;\r
        }\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/cases/Schedule40.java b/src/com/billkuker/rocketry/motorsim/cases/Schedule40.java
index 5372dea4e67da33279039c53f62568df662786fa..2a2beebc207babb12c74ae05ca5a8c77e9d3ce23 100644 (file)
--- 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 {
        }\r
 \r
        @Override\r
-       public Amount<Pressure> burstPressure() {\r
+       public Amount<Pressure> getBurstPressure() {\r
                return size.burst;\r
        }\r
 \r

diff --git a/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java b/test/com/billkuker/rocketry/motorsim/test/CylindricalChamberTest.java
index 333cdfbd606a351df710315777838037a139f47f..10b38a52678f1d5d957cb48d3f01f2c2af39aa88 100644 (file)
--- 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 {
 \r
        @Test\r
        public void testBurstPressure() {\r
-               Assert.assertNull( new CylindricalChamber().burstPressure() );\r
+               Assert.assertNull( new CylindricalChamber().getBurstPressure() );\r
        }\r
 \r
        @Test\r