merge MarinaFleet and Marina

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

diff --git a/src/edu/berkeley/fleet/marina/MarinaPath.java b/src/edu/berkeley/fleet/marina/MarinaPath.java
index 84cb47f..e3d5b63 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaPath.java
+++ b/src/edu/berkeley/fleet/marina/MarinaPath.java
@@ -6,10 +6,10 @@ public class MarinaPath extends FleetTwoPath {
 
     public static final int SIGNAL_BIT_INDEX = 13;
 
-    private final MarinaFleet marina;
+    private final Marina marina;
     final BitVector bv;
 
-    public MarinaPath(MarinaFleet marina, BitVector bv) {
+    public MarinaPath(Marina marina, BitVector bv) {
         this.marina = marina;
         this.bv = bv;
         bv.setImmutable();