From 70fd6db9616723aee5cbc78e89096bbc4519e25b Mon Sep 17 00:00:00 2001 From: megacz Date: Sat, 14 Mar 2009 16:52:04 -0700 Subject: [PATCH] add getConstant(String) methods to FleetTwoFleet implementations --- src/edu/berkeley/fleet/two/FleetTwoDock.java | 6 ++++++ src/edu/berkeley/fleet/two/FleetTwoShip.java | 7 +++++++ src/edu/berkeley/fleet/two/ShipDescription.java | 3 +-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/edu/berkeley/fleet/two/FleetTwoDock.java b/src/edu/berkeley/fleet/two/FleetTwoDock.java index 2868768..e4b3148 100644 --- a/src/edu/berkeley/fleet/two/FleetTwoDock.java +++ b/src/edu/berkeley/fleet/two/FleetTwoDock.java @@ -20,5 +20,11 @@ public abstract class FleetTwoDock extends Dock { public boolean isOutputDock() { return !dockDescription.isInputDock(); } + public BitVector getConstant(String constantName) { + BitVector bv = dockDescription.getConstant(constantName); + if (bv==null) + throw new RuntimeException("unknown constant \""+constantName+"\" on dock " + this); + return bv; + } } diff --git a/src/edu/berkeley/fleet/two/FleetTwoShip.java b/src/edu/berkeley/fleet/two/FleetTwoShip.java index 5a89616..d8d008e 100644 --- a/src/edu/berkeley/fleet/two/FleetTwoShip.java +++ b/src/edu/berkeley/fleet/two/FleetTwoShip.java @@ -30,4 +30,11 @@ public abstract class FleetTwoShip extends Ship { } throw new RuntimeException("inconsistency: Ship does not belong to its own Fleet!"); } + + public BitVector getConstant(String constantName) { + BitVector bv = shipDescription.getConstant(constantName); + if (bv==null) + throw new RuntimeException("unknown constant \""+constantName+"\" on ship " + this); + return bv; + } } diff --git a/src/edu/berkeley/fleet/two/ShipDescription.java b/src/edu/berkeley/fleet/two/ShipDescription.java index 182eed7..6752e70 100644 --- a/src/edu/berkeley/fleet/two/ShipDescription.java +++ b/src/edu/berkeley/fleet/two/ShipDescription.java @@ -51,8 +51,7 @@ public class ShipDescription implements Iterable { public BitVector getConstant(String name) { BitVector c = constants.get(name); - if (c==null) - throw new RuntimeException("unknown constant " + name); + if (c==null) throw new RuntimeException("unknown constant " + name); return c; } -- 1.7.10.4