further cleanup of MarinaTest

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

diff --git a/src/edu/berkeley/fleet/marina/MarinaPacket.java b/src/edu/berkeley/fleet/marina/MarinaPacket.java
index 503950c..ee9ec09 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaPacket.java
+++ b/src/edu/berkeley/fleet/marina/MarinaPacket.java
@@ -3,7 +3,6 @@ package edu.berkeley.fleet.marina;
 import com.sun.electric.tool.simulation.test.*;
 import edu.berkeley.fleet.api.Dock;
 import edu.berkeley.fleet.api.Instruction;
-import edu.berkeley.fleet.marina.MarinaFleet;
 
 /**
  * This class encapsulates a "packet" -- a data item in flight plus
@@ -53,8 +52,8 @@ public class MarinaPacket {
 
     /** another constructor which uses an all-zeroes path, for convenience */
     public MarinaPacket(Instruction inst) {
-        BitVector instr =
-            MarinaUtils.berkToSun(MarinaTest.marinaFleet.encodeInstruction(MarinaTest.marinaFleet.getOnlyInputDock(), inst));
+        Marina marina = (Marina)inst.dock.getShip().getFleet();
+        BitVector instr = MarinaUtils.berkToSun(marina.encodeInstruction(marina.getOnlyDock(), inst));
         MarinaUtils.expectLength(instr, MarinaPacket.WORD_WIDTH);
         
         //