rename ItemForShip to DataForShip for consistency

diff --git a/ships/Alu2.ship b/ships/Alu2.ship
index 013748e..5fd3e91 100644 (file)
--- a/ships/Alu2.ship
+++ b/ships/Alu2.ship
@@ -43,7 +43,7 @@ public void service() {
   if (box_in1.dataReadyForShip() &&
       box_in2.dataReadyForShip() &&
       box_inOp.dataReadyForShip() &&
-      box_out.readyForItemFromShip()) {
+      box_out.readyForDataFromShip()) {
       long a      = box_in1.removeDataForShip();
       long b      = box_in2.removeDataForShip();
       long op     = box_inOp.removeDataForShip();

diff --git a/ships/Choice.ship b/ships/Choice.ship
index 28531dd..0b084f3 100644 (file)
--- a/ships/Choice.ship
+++ b/ships/Choice.ship
@@ -63,7 +63,7 @@ output ports.
 == Fleeterpreter ====================================================
 private Packet selector;
 public void service() {
-  if (!box_out1.readyForItemFromShip() || !box_out2.readyForItemFromShip()) return;
+  if (!box_out1.readyForDataFromShip() || !box_out2.readyForDataFromShip()) return;
   if (selector == null && !box_in.dataReadyForShip()) return;
   if (selector == null) selector = box_in.removePacketForShip();
   String port = selector.destination.getDestinationName();

diff --git a/ships/Memory.ship b/ships/Memory.ship
index bdb2e93..dc266c6 100644 (file)
--- a/ships/Memory.ship
+++ b/ships/Memory.ship
@@ -58,7 +58,7 @@ data  out:   out
             long size = val & 0x3f;
             dispatch((int)addr, (int)size);
         }
-        if (box_inAddr.dataReadyForShip() && box_out.readyForItemFromShip()) {
+        if (box_inAddr.dataReadyForShip() && box_out.readyForDataFromShip()) {
             Packet packet = box_inAddr.peekPacketForShip();
             if (packet.destination.getDestinationName().equals("read")) {
                 box_out.addDataFromShip(readMem((int)box_inAddr.removeDataForShip()));