checkpoint

diff --git a/Makefile b/Makefile
index 5c7aa9e..71898f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,16 @@
 
-run: fleet.jar
-       java -cp lib/edu.berkeley.sbp.jar:fleet.jar edu.berkeley.fleet.FleetParser < test.fleet
+run: fleeterpreter.jar
+       java -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetParser < test.fleet
 
-applet: fleet.jar
-       java -cp lib/edu.berkeley.sbp.jar:fleet.jar edu.berkeley.fleet.FleetApplet < test.fleet
+applet: fleeterpreter.jar
 
-fleet.jar: $(shell find src -name \*.java) fleet.g
+java -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetApplet < test.fleet
+
+fleeterpreter.jar: $(shell find src -name \*.java) fleet.g
        mkdir -p bin
        cp fleet.g bin
        cp test.fleet bin
        javac -cp lib/edu.berkeley.sbp.jar -d bin $(shell find src -name \*.java)
-       cd bin; jar cvf ../$@ .
+       cd bin; jar xvf ../lib/edu.berkeley.sbp.jar
+       echo 'Main-Class: edu.berkeley.fleet.FleetApplet' > bin/manifest
+       cd bin; jar cvmf manifest ../$@ .

diff --git a/lib/edu.berkeley.sbp.jar b/lib/edu.berkeley.sbp.jar
new file mode 100644 (file)
index 0000000..a62ddfb
Binary files /dev/null and b/lib/edu.berkeley.sbp.jar differ

diff --git a/src/edu/berkeley/fleet/FleetApplet.java b/src/edu/berkeley/fleet/FleetApplet.java
index 93f9d1a..cd95480 100644 (file)
--- a/src/edu/berkeley/fleet/FleetApplet.java
+++ b/src/edu/berkeley/fleet/FleetApplet.java
@@ -11,6 +11,23 @@ public class FleetApplet extends Applet {
     public static void main(String[] s) throws Exception {
         Frame f = new Frame();
         f.show();
+        setup(f);
+        f.pack();
+        f.show();
+    }
+
+    public FleetApplet() { }
+    public void init() {
+        try {
+            main(null);/*
+            setup(this);
+            resize(800,600);*/
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void setup(Container f) throws Exception {
 
         PipedOutputStream po1 = new PipedOutputStream();
         PipedInputStream pi1 = new PipedInputStream(po1);
@@ -47,7 +64,6 @@ public class FleetApplet extends Applet {
                 }
             }
         }.start();
-        f.pack();
 
         text.setFont(new Font("monospaced", 0, 20));
         StringBuffer in = new StringBuffer();
@@ -72,8 +88,7 @@ public class FleetApplet extends Applet {
             });
 
         jsp.setDividerLocation(0.5);
-        f.pack();
-        f.show();
+        jsp.setSize(800, 600);
         f.setSize(800, 600);
         f.doLayout();
     }