move edu.berkeley.fleet.ships to edu.berkeley.fleet.interpreter.ships

diff --git a/src/edu/berkeley/fleet/interpreter/Interpreter.java b/src/edu/berkeley/fleet/interpreter/Interpreter.java
index 7c0c349..d4eff59 100644 (file)
--- a/src/edu/berkeley/fleet/interpreter/Interpreter.java
+++ b/src/edu/berkeley/fleet/interpreter/Interpreter.java
@@ -7,7 +7,7 @@ import edu.berkeley.fleet.*;
 import edu.berkeley.fleet.doc.*;
 import edu.berkeley.fleet.api.*;
 import edu.berkeley.fleet.ies44.*;
-import edu.berkeley.fleet.ships.*;
+import edu.berkeley.fleet.interpreter.ships.*;
 
 public class Interpreter extends Fleet {
 
@@ -37,13 +37,13 @@ public class Interpreter extends Fleet {
     public void expand(ShipDescription sd) {
         try {
             String filename = (sd.name.charAt(0)+"").toUpperCase() + sd.name.substring(1).toLowerCase();
-            File outf = new File("build/java/edu/berkeley/fleet/ships/"+filename+".java");
+            File outf = new File("build/java/edu/berkeley/fleet/interpreter/ships/"+filename+".java");
             new File(outf.getParent()).mkdirs();
             System.err.println("writing to " + outf);
             FileOutputStream out = new FileOutputStream(outf);
             PrintWriter pw = new PrintWriter(out);
 
-            pw.println("package edu.berkeley.fleet.ships;");
+            pw.println("package edu.berkeley.fleet.interpreter.ships;");
             pw.println("import edu.berkeley.fleet.interpreter.*;");
             pw.println("import edu.berkeley.fleet.api.*;");
             pw.println("import edu.berkeley.fleet.*;");
@@ -125,7 +125,7 @@ public class Interpreter extends Fleet {
                     break;
                 }
             if (iscratch==null)
-                iscratch = (InterpreterShip)Class.forName("edu.berkeley.fleet.ships.Iscratch")
+                iscratch = (InterpreterShip)Class.forName("edu.berkeley.fleet.interpreter.ships.Iscratch")
                     .getConstructor(new Class[] { Interpreter.class, String.class })
                     .newInstance(new Object[] { this, "iscratch" });
             iscratch
@@ -225,7 +225,7 @@ public class Interpreter extends Fleet {
 
     public Ship createShip(String shipType, String shipname) {
         try {
-            Class c = Class.forName("edu.berkeley.fleet.ships."+shipType);
+            Class c = Class.forName("edu.berkeley.fleet.interpreter.ships."+shipType);
             Constructor con = c.getConstructor(new Class[] { Interpreter.class, String.class });
             InterpreterShip ret = (InterpreterShip)con.newInstance(new Object[] { this, shipname });
             ships.put(shipname, ret);

diff --git a/src/edu/berkeley/fleet/ships/ArithmeticShip.java b/src/edu/berkeley/fleet/interpreter/ships/ArithmeticShip.java
similarity index 99%
rename from src/edu/berkeley/fleet/ships/ArithmeticShip.java
rename to src/edu/berkeley/fleet/interpreter/ships/ArithmeticShip.java
index f41e2f3..3335c26 100644 (file)
--- a/src/edu/berkeley/fleet/ships/ArithmeticShip.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/ArithmeticShip.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/Counter.java b/src/edu/berkeley/fleet/interpreter/ships/Counter.java
similarity index 95%
rename from src/edu/berkeley/fleet/ships/Counter.java
rename to src/edu/berkeley/fleet/interpreter/ships/Counter.java
index c3d4fa7..921a2b3 100644 (file)
--- a/src/edu/berkeley/fleet/ships/Counter.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/Counter.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/DeMux.java b/src/edu/berkeley/fleet/interpreter/ships/DeMux.java
similarity index 95%
rename from src/edu/berkeley/fleet/ships/DeMux.java
rename to src/edu/berkeley/fleet/interpreter/ships/DeMux.java
index d5c081c..3006dd9 100644 (file)
--- a/src/edu/berkeley/fleet/ships/DeMux.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/DeMux.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/Dup.java b/src/edu/berkeley/fleet/interpreter/ships/Dup.java
similarity index 93%
rename from src/edu/berkeley/fleet/ships/Dup.java
rename to src/edu/berkeley/fleet/interpreter/ships/Dup.java
index 0e982bc..e78273a 100644 (file)
--- a/src/edu/berkeley/fleet/ships/Dup.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/Dup.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/Dup3.java b/src/edu/berkeley/fleet/interpreter/ships/Dup3.java
similarity index 94%
rename from src/edu/berkeley/fleet/ships/Dup3.java
rename to src/edu/berkeley/fleet/interpreter/ships/Dup3.java
index 0060cd9..1820970 100644 (file)
--- a/src/edu/berkeley/fleet/ships/Dup3.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/Dup3.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/DuplicatorShip.java b/src/edu/berkeley/fleet/interpreter/ships/DuplicatorShip.java
similarity index 95%
rename from src/edu/berkeley/fleet/ships/DuplicatorShip.java
rename to src/edu/berkeley/fleet/interpreter/ships/DuplicatorShip.java
index 276074b..70d3e5e 100644 (file)
--- a/src/edu/berkeley/fleet/ships/DuplicatorShip.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/DuplicatorShip.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/HomeworkCounter.java b/src/edu/berkeley/fleet/interpreter/ships/HomeworkCounter.java
similarity index 95%
rename from src/edu/berkeley/fleet/ships/HomeworkCounter.java
rename to src/edu/berkeley/fleet/interpreter/ships/HomeworkCounter.java
index 04eac70..0aa8be8 100644 (file)
--- a/src/edu/berkeley/fleet/ships/HomeworkCounter.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/HomeworkCounter.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/MemoryReadShip.java b/src/edu/berkeley/fleet/interpreter/ships/MemoryReadShip.java
similarity index 96%
rename from src/edu/berkeley/fleet/ships/MemoryReadShip.java
rename to src/edu/berkeley/fleet/interpreter/ships/MemoryReadShip.java
index 3ffb974..ffe4511 100644 (file)
--- a/src/edu/berkeley/fleet/ships/MemoryReadShip.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/MemoryReadShip.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 
 import edu.berkeley.fleet.*;

diff --git a/src/edu/berkeley/fleet/ships/MemoryWriteShip.java b/src/edu/berkeley/fleet/interpreter/ships/MemoryWriteShip.java
similarity index 96%
rename from src/edu/berkeley/fleet/ships/MemoryWriteShip.java
rename to src/edu/berkeley/fleet/interpreter/ships/MemoryWriteShip.java
index ed171c7..6fec40c 100644 (file)
--- a/src/edu/berkeley/fleet/ships/MemoryWriteShip.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/MemoryWriteShip.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 
 import edu.berkeley.fleet.*;

diff --git a/src/edu/berkeley/fleet/ships/MultiplierShip.java b/src/edu/berkeley/fleet/interpreter/ships/MultiplierShip.java
similarity index 95%
rename from src/edu/berkeley/fleet/ships/MultiplierShip.java
rename to src/edu/berkeley/fleet/interpreter/ships/MultiplierShip.java
index ceb6b5b..3efd5da 100644 (file)
--- a/src/edu/berkeley/fleet/ships/MultiplierShip.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/MultiplierShip.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/Mux.java b/src/edu/berkeley/fleet/interpreter/ships/Mux.java
similarity index 94%
rename from src/edu/berkeley/fleet/ships/Mux.java
rename to src/edu/berkeley/fleet/interpreter/ships/Mux.java
index 7701a6d..86a2822 100644 (file)
--- a/src/edu/berkeley/fleet/ships/Mux.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/Mux.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/ScatterShip.java b/src/edu/berkeley/fleet/interpreter/ships/ScatterShip.java
similarity index 95%
rename from src/edu/berkeley/fleet/ships/ScatterShip.java
rename to src/edu/berkeley/fleet/interpreter/ships/ScatterShip.java
index 81a08fe..4f6b892 100644 (file)
--- a/src/edu/berkeley/fleet/ships/ScatterShip.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/ScatterShip.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/ships/Sort2.java b/src/edu/berkeley/fleet/interpreter/ships/Sort2.java
similarity index 94%
rename from src/edu/berkeley/fleet/ships/Sort2.java
rename to src/edu/berkeley/fleet/interpreter/ships/Sort2.java
index 1d2c8e3..90cb3e4 100644 (file)
--- a/src/edu/berkeley/fleet/ships/Sort2.java
+++ b/src/edu/berkeley/fleet/interpreter/ships/Sort2.java
@@ -1,4 +1,4 @@
-package edu.berkeley.fleet.ships;
+package edu.berkeley.fleet.interpreter.ships;
 import edu.berkeley.fleet.interpreter.*;
 import edu.berkeley.fleet.*;
 

diff --git a/src/edu/berkeley/fleet/slipway/Slipway.java b/src/edu/berkeley/fleet/slipway/Slipway.java
index a73fd0f..46c9ca9 100644 (file)
--- a/src/edu/berkeley/fleet/slipway/Slipway.java
+++ b/src/edu/berkeley/fleet/slipway/Slipway.java
@@ -12,7 +12,7 @@ import edu.berkeley.sbp.bind.*;
 import edu.berkeley.sbp.util.*;
 import java.util.*;
 import java.io.*;
-import edu.berkeley.fleet.ships.*;
+import edu.berkeley.fleet.interpreter.ships.*;
 
 public class Slipway extends Interpreter {