Merge remote-tracking branch 'remotes/upstream/master'

app/src/processing/mode/java/JavaBuild.java

@@ -1446,7 +1446,11 @@ public class JavaBuild {
     }
     // https://github.com/processing/processing/issues/2239
     runOptions.add("-Djna.nosys=true");
-    
+    // https://github.com/processing/processing/issues/2559
+    if (exportPlatform == PConstants.WINDOWS) {
+      runOptions.add("-Djava.library.path=\"%EXEDIR%\\lib;%PATH%\"");
+    }
+
 
     /// macosx: write out Info.plist (template for classpath, etc)
 

app/src/processing/mode/java/JavaMode.java

@@ -46,7 +46,7 @@ public class JavaMode extends Mode {
 
 
   public String getTitle() {
-    return "Java";
+    return "Java (2.0)";
   }
 
 

app/src/processing/mode/java/runner/Runner.java

@@ -639,9 +639,6 @@ public class Runner implements MessageConsumer {
     //vm.setDebugTraceMode(debugTraceMode);
 //    vm.setDebugTraceMode(VirtualMachine.TRACE_ALL);
 //    vm.setDebugTraceMode(VirtualMachine.TRACE_NONE);  // formerly, seems to have no effect
-
-    // For internal debugging
-    PrintWriter writer = null;
     
     // Calling this seems to set something internally to make the 
     // Eclipse JDI wake up. Without it, an ObjectCollectedException
@@ -735,7 +732,6 @@ public class Runner implements MessageConsumer {
       // we don't interrupt
     }
     //System.out.println("and leaving");
-    if (writer != null) writer.close();
   }