projects
/
sw
/
motorsim
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed motorIO from files to streams
[sw/motorsim]
/
src
/
com
/
billkuker
/
rocketry
/
motorsim
/
grain
/
CoredCylindricalGrain.java
diff --git
a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
index 6071d8a24e073f44f9ef8a279a73c1fecd52de28..5b05536343919d6439092c9e30ff3969a472ca0a 100644
(file)
--- a/
src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
+++ b/
src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
@@
-12,11
+12,12
@@
import javax.measure.unit.SI;
\r
import org.jscience.physics.amount.Amount;
\r
\r
\r
import org.jscience.physics.amount.Amount;
\r
\r
+import com.billkuker.rocketry.motorsim.Validating;
\r
import com.billkuker.rocketry.motorsim.visual.Editor;
\r
import com.billkuker.rocketry.motorsim.visual.GrainPanel;
\r
\r
\r
import com.billkuker.rocketry.motorsim.visual.Editor;
\r
import com.billkuker.rocketry.motorsim.visual.GrainPanel;
\r
\r
\r
-public class CoredCylindricalGrain extends ExtrudedGrain {
\r
+public class CoredCylindricalGrain extends ExtrudedGrain
implements Validating
{
\r
\r
private Amount<Length> oD, iD;
\r
private boolean outerSurfaceInhibited = true, innerSurfaceInhibited = false;
\r
\r
private Amount<Length> oD, iD;
\r
private boolean outerSurfaceInhibited = true, innerSurfaceInhibited = false;
\r
@@
-128,8
+129,8
@@
public class CoredCylindricalGrain extends ExtrudedGrain {
iD = id;
\r
}
\r
\r
iD = id;
\r
}
\r
\r
- /*
\r
- public void
checkValidity
() throws ValidationException{
\r
+ @Override
\r
+ public void
validate
() throws ValidationException{
\r
if ( iD.equals(Amount.ZERO) )
\r
throw new ValidationException(this, "Invalid iD");
\r
if ( oD.equals(Amount.ZERO) )
\r
if ( iD.equals(Amount.ZERO) )
\r
throw new ValidationException(this, "Invalid iD");
\r
if ( oD.equals(Amount.ZERO) )
\r
@@
-143,7
+144,6
@@
public class CoredCylindricalGrain extends ExtrudedGrain {
throw new ValidationException(this, "No exposed grain surface");
\r
\r
}
\r
throw new ValidationException(this, "No exposed grain surface");
\r
\r
}
\r
- */
\r
\r
public Amount<Length> webThickness() {
\r
if ( innerSurfaceInhibited && outerSurfaceInhibited ){
\r
\r
public Amount<Length> webThickness() {
\r
if ( innerSurfaceInhibited && outerSurfaceInhibited ){
\r