add more methods to fake marins ship/dock object

diff --git a/src/edu/berkeley/fleet/marina/MarinaDock.java b/src/edu/berkeley/fleet/marina/MarinaDock.java
index 158eef7..05a301a 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaDock.java
+++ b/src/edu/berkeley/fleet/marina/MarinaDock.java
@@ -19,5 +19,8 @@ public class MarinaDock extends FleetTwoDock {
         ship.addDock(this);
     }
 
+    public String getName() { return "fakedock"; }
+    public ShipDescription.Constant getDockConstant(String s) { return null; }
+
 }
 

diff --git a/src/edu/berkeley/fleet/marina/MarinaFleet.java b/src/edu/berkeley/fleet/marina/MarinaFleet.java
index 949acde..62806f8 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaFleet.java
+++ b/src/edu/berkeley/fleet/marina/MarinaFleet.java
@@ -19,7 +19,9 @@ public class MarinaFleet extends FleetTwoFleet {
     }
 
     public Iterator<Ship> iterator() {
-        return new HashSet<Ship>().iterator();
+        HashSet hs = new HashSet<Ship>();
+        hs.add(fakeShip);
+        return hs.iterator();
     }
 
     public Ship getShip(String type, int ordinal) {

diff --git a/src/edu/berkeley/fleet/marina/MarinaShip.java b/src/edu/berkeley/fleet/marina/MarinaShip.java
index 55fd98d..c2b8aad 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaShip.java
+++ b/src/edu/berkeley/fleet/marina/MarinaShip.java
@@ -18,5 +18,6 @@ public class MarinaShip extends FleetTwoShip {
         this.fleet = fleet;
     }
 
+    public String getType() { return "MarinaShip"; }
 }