merge MarinaFleet and Marina

[fleet.git] / src / edu / berkeley / fleet / marina / MarinaShip.java

diff --git a/src/edu/berkeley/fleet/marina/MarinaShip.java b/src/edu/berkeley/fleet/marina/MarinaShip.java
index c2b8aad..ebb148e 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaShip.java
+++ b/src/edu/berkeley/fleet/marina/MarinaShip.java
@@ -9,11 +9,11 @@ public class MarinaShip extends FleetTwoShip {
 
     public Iterator<Dock> iterator() { return (Iterator<Dock>)(Object)docks.iterator(); }
 
-    private MarinaFleet fleet;
+    private Marina fleet;
 
     /*package*/ void addDock(MarinaDock dock) { docks.add(dock); }
 
-    public MarinaShip(MarinaFleet fleet) {
+    public MarinaShip(Marina fleet) {
         super(fleet, null);
         this.fleet = fleet;
     }