From 302b4c9e90370782d2024ea5faf46153e7fb2b20 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Thu, 2 Dec 2010 01:07:01 +0000 Subject: [PATCH] EndBurner Validation --- .../billkuker/rocketry/motorsim/grain/EndBurner.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java b/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java index 2500034..1d6e475 100644 --- a/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java +++ b/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java @@ -10,6 +10,7 @@ import javax.measure.unit.SI; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Validating; +import com.billkuker.rocketry.motorsim.Validating.ValidationException; import com.billkuker.rocketry.motorsim.grain.util.BurningShape; import com.billkuker.rocketry.motorsim.grain.util.RotatedShapeGrain; @@ -51,8 +52,14 @@ public class EndBurner extends RotatedShapeGrain implements Validating { @Override public void validate() throws ValidationException { - // TODO Auto-generated method stub - + if ( oD.equals(Amount.ZERO) ) + throw new ValidationException(this, "Invalid oD"); + if ( getLength().equals(Amount.ZERO) ) + throw new ValidationException(this, "Invalid Length"); + if ( puntDiameter.isGreaterThan(oD) ) + throw new ValidationException(this, "puntDiameter > oD"); + if ( puntDepth.isGreaterThan(length) ) + throw new ValidationException(this, "puntDepth > length"); } public Amount getLength() { -- 2.47.2