Merge branch 'master' of git://git.hcoop.net/git/crawshaw/fleet

diff --git a/Makefile b/Makefile
index 79a028e..aa5881a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
          done
        javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
-       cd build/class/; jar cmf manifest ../../$@ .
+       jar cmf build/class/manifest $@ ships -C build/class .
 
 
 ## Fpga ####################################################################################

diff --git a/src/edu/berkeley/fleet/assembler/Parser.java b/src/edu/berkeley/fleet/assembler/Parser.java
index 36b7b56..3a1fdbd 100644 (file)
--- a/src/edu/berkeley/fleet/assembler/Parser.java
+++ b/src/edu/berkeley/fleet/assembler/Parser.java
@@ -218,7 +218,7 @@ public class Parser {
         }
     }
 
-    String string(Tree<String> t) {
+    private static String string(Tree<String> t) {
         String ret = "";
         if (t.head() != null) ret += t.head();
         for(Tree<String> c : t)
@@ -226,14 +226,14 @@ public class Parser {
         return ret;
     }
 
-    String stringBody(Tree<String> t) {
+    private static String stringBody(Tree<String> t) {
         String ret = "";
         for(Tree<String> c : t)
             ret += string(c);
         return ret;
     }
 
-    String name(Tree<String> t) {
+    private static String name(Tree<String> t) {
         return string(t.child(0))+string(t.child(1));
     }
 

diff --git a/src/edu/berkeley/fleet/interpreter/Interpreter.java b/src/edu/berkeley/fleet/interpreter/Interpreter.java
index b4492c7..d09b3d0 100644 (file)
--- a/src/edu/berkeley/fleet/interpreter/Interpreter.java
+++ b/src/edu/berkeley/fleet/interpreter/Interpreter.java
@@ -49,7 +49,9 @@ public class Interpreter extends FleetTwoFleet implements Parser.FleetWithDynami
             if (ships.get(shipname)!=null) return ships.get(shipname);
             Class c = Class.forName("edu.berkeley.fleet.interpreter."+shipType);
             Constructor con = c.getConstructor(new Class[] { Interpreter.class, String.class, ShipDescription.class });
-            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream("ships/"+shipType+".ship")));
+            String src = "/ships/" + shipType + ".ship";
+            InputStream is = getClass().getResourceAsStream(src);
+            BufferedReader br = new BufferedReader(new InputStreamReader(is));
             ShipDescription sd = new ShipDescription(shipType, br);
             InterpreterShip ret = (InterpreterShip)con.newInstance(new Object[] { this, shipname, sd });
             ships.put(shipname, ret);