fixes based on library work.. also properly load qtjava

build/windows/launcher/launcher.cpp

@@ -127,31 +127,6 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
       }
     }
   }
-  /*
-  // there's a bug in the QTJAVA installer, that sets this
-  // to a bad value if no java has been installed. grr.
-  // as a result, it's better just to ignore it.
-  // keep this code around since may be re-enabled later
-  if (getenv("QTJAVA") != NULL) {
-    strcpy(env_qtjava, getenv("QTJAVA"));
-    if (env_qtjava[0] == '\"') {
-      // starting quote in qtjava.. almost always
-      env_qtjava++;
-
-      int len = strlen(env_qtjava);
-      if (env_qtjava[len-1] == '\"') {
-        env_qtjava[len-1] = 0;
-      } else {
-        // a starting quote but no ending quote..
-      }
-    }
-    int last = strlen(env_qtjava);
-    env_qtjava[last++] = ';';
-    env_qtjava[last] = 0;
-  } else {
-    env_qtjava[0] = 0;
-  }
-  */
 
   // NO! put quotes around contents of cp, because %s might have spaces in it.
   // don't put quotes in it, because it's setting the environment variable
@@ -163,7 +138,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
           //"'"
 
           "%s"
-          //"%s"
+          "%s"
           //"%s"
 
           //"%s\\lib\\comm.jar;"
@@ -185,7 +160,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
           // the first three %s args
           //local_jre_installed ? "java\\lib\\rt.jar;java\\lib\\jaws.jar;" : "", 
           local_jre_installed ? "java\\lib\\rt.jar;" : "", 
-          //qtjava_path,
+          qtjava_path,
           //env_classpath, 
 
           // the next several %s args

core/PApplet.java

@@ -264,6 +264,8 @@ public class PApplet extends Applet
   // maybe start should also be used as the method for kicking
   // the thread on, instead of doing it inside paint()
   public void stop() {
+    //finished = true; 
+
     if (thread != null) {
       thread = null;
     }
@@ -597,6 +599,7 @@ public class PApplet extends Applet
     }
     if (THREAD_DEBUG) println(Thread.currentThread().getName() + 
                               " thread finished");
+    //stop();  // call to shutdown libs?
   }
 
 
@@ -1058,7 +1061,7 @@ public class PApplet extends Applet
    * only works for applets, but eventually should be implemented
    * for applications as well, using code from PdeBase.
    */
-  void link(String here) {
+  public void link(String here) {
     if (!online) {
       System.err.println("Can't open " + here);
       System.err.println("link() only works inside a web browser");
@@ -1074,7 +1077,7 @@ public class PApplet extends Applet
     }
   }
 
-  void link(String here, String there) {
+  public void link(String here, String there) {
     if (!online) {
       System.err.println("Can't open " + here);
       System.err.println("link() only works inside a web browser");
@@ -3899,10 +3902,12 @@ public class PApplet extends Applet
               int anything = System.in.read();
               if (anything == EXTERNAL_STOP) {
                 finished = true;
+                //stop();
                 //thread = null;  // kill self
               }
             } catch (IOException e) {
               // not tested (needed?) but seems correct
+              //stop();
               finished = true;
               //thread = null;
             }

todo.txt

@@ -238,22 +238,28 @@ X find serial example from tom igoe, include with new examples
 X remove sketchbook -> libraries until it works
 X serial_setup.command is missing from osx distribution
 X   fix the note in the readme about it
+X properly import qtjava from processing.exe
 
-_ properly import qtjava from processing.exe
+_ fix the default network, camera, serial examples
 
 
 with casey
-_ figure out what to include for examples/libraries
+X figure out what to include for examples/libraries
 _ let's not call it 'expert', let's just say w/o java
 _ "draw" is not highlighted as a keyword.. other keywords?
 _   draw(), PGraphics(), NO_DEPTH_TEST, PMovie(), PMovie.repeat()
 _   PClient(), PClient.available(), PClient.read(), 
 _   PServer(), PServer.dispose(), PServer.write(), attach(), length
+_ sketches no longer require a "data" folder
 
 
 ......................................................................
 
 
+_ run library destroy after hitting 'stop'
+_   quicktime audio doesn't stop after hitting 'stop'
+_   weirdness external stop not calling stop(), just finished = true
+
 _ properly handle non-ascii chars in p5 folder name
 _   or at least warn the user to install somehwere else
 _ track down the cause of the processing.exe not starting bugs