projects
/
fleet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge MarinaFleet and Marina
[fleet.git]
/
src
/
edu
/
berkeley
/
fleet
/
marina
/
MarinaDestination.java
diff --git
a/src/edu/berkeley/fleet/marina/MarinaDestination.java
b/src/edu/berkeley/fleet/marina/MarinaDestination.java
index
8e1d032
..
7bd872b
100644
(file)
--- a/
src/edu/berkeley/fleet/marina/MarinaDestination.java
+++ b/
src/edu/berkeley/fleet/marina/MarinaDestination.java
@@
-5,9
+5,9
@@
import edu.berkeley.fleet.two.*;
public class MarinaDestination extends Destination {
private final BitVector bv;
public class MarinaDestination extends Destination {
private final BitVector bv;
- private final MarinaFleet marina;
+ private final Marina marina;
- public MarinaDestination(MarinaFleet marina, BitVector bv) {
+ public MarinaDestination(Marina marina, BitVector bv) {
super(marina.onlyDock);
this.marina = marina;
bv.setImmutable();
super(marina.onlyDock);
this.marina = marina;
bv.setImmutable();