From e98330b52aadb60c5984ea8aff59faaa695f82a6 Mon Sep 17 00:00:00 2001 From: megacz Date: Wed, 7 Jan 2009 19:12:26 -0800 Subject: [PATCH] change internal uses of "port" to "dock" --- src/edu/berkeley/fleet/interpreter/InterpreterDock.java | 2 +- src/edu/berkeley/fleet/interpreter/InterpreterShip.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java index 6e579a9..9e4a692 100644 --- a/src/edu/berkeley/fleet/interpreter/InterpreterDock.java +++ b/src/edu/berkeley/fleet/interpreter/InterpreterDock.java @@ -55,7 +55,7 @@ class InterpreterDock extends FleetTwoDock { InterpreterDock(InterpreterShip ship, DockDescription bbd) { super(ship, bbd); - ship.ports.put(bbd.getName(), this); + ship.docks.put(bbd.getName(), this); } public Path getPath(Destination d, BitVector signal) { return new InterpreterPath(this, (InterpreterDestination)d, signal); } diff --git a/src/edu/berkeley/fleet/interpreter/InterpreterShip.java b/src/edu/berkeley/fleet/interpreter/InterpreterShip.java index 80a38c6..43fa15b 100644 --- a/src/edu/berkeley/fleet/interpreter/InterpreterShip.java +++ b/src/edu/berkeley/fleet/interpreter/InterpreterShip.java @@ -4,10 +4,10 @@ import edu.berkeley.fleet.two.*; import java.util.*; import java.io.*; -/** a ship, which belongs to a fleet and which may have many ports */ +/** a ship, which belongs to a fleet and which may have many docks */ abstract class InterpreterShip extends FleetTwoShip { - LinkedHashMap ports = new LinkedHashMap(); + LinkedHashMap docks = new LinkedHashMap(); /** You should instantiate a bunch of Inboxes and Outboxes in your constructor */ public InterpreterShip(Interpreter fleet, ShipDescription sd) { @@ -15,7 +15,7 @@ abstract class InterpreterShip extends FleetTwoShip { } public Iterator iterator() { - return (Iterator)(Object)ports.values().iterator(); + return (Iterator)(Object)docks.values().iterator(); } /** @@ -26,12 +26,12 @@ abstract class InterpreterShip extends FleetTwoShip { public abstract void service(); public final void _service() { - for(InterpreterDock p : ports.values()) p.service(); + for(InterpreterDock p : docks.values()) p.service(); service(); } public void reset() { - for(InterpreterDock p : ports.values()) + for(InterpreterDock p : docks.values()) p.reset(); } -- 1.7.10.4