fix "could not run" msg, other modernizing

benfry · benfry · commit 471222404171 · 2021-06-22T19:08:50.000-04:00
diff --git a/java/src/processing/mode/java/runner/Runner.java b/java/src/processing/mode/java/runner/Runner.java
@@ -116,16 +116,11 @@ public Runner(JavaBuild build, RunnerListener listener) throws SketchException {
         sketchErr.println(library.getName() + " does not run on this architecture: " + variant);
         int opposite = (bits == 32) ? 64 : 32;
         if (Platform.isMacOS()) {
-          //if (library.supportsArch(PConstants.MACOSX, opposite)) {  // should always be true
           throw new SketchException("To use " + library.getName() + ", " +
                                     "switch to " + opposite + "-bit mode in Preferences.");
-          //}
         } else {
           throw new SketchException(library.getName() + " is only compatible " +
                                     "with the  " + opposite + "-bit download of Processing.");
-          //throw new SketchException(library.getName() + " does not run in " + bits + "-bit mode.");
-          // "To use this library, switch to 32-bit mode in Preferences." (OS X)
-          //  "To use this library, you must use the 32-bit version of Processing."
         }
       }
     }
@@ -317,12 +312,12 @@ protected StringList getMachineParams() {
     //params.add("-Xrunhprof:cpu=samples");  // old-style profiler
 
     // TODO change this to use run.args = true, run.args.0, run.args.1, etc.
-    // so that spaces can be included in the arg names
+    //      so that spaces can be included in the arg names
     String options = Preferences.get("run.options");
     if (options.length() > 0) {
-      String pieces[] = PApplet.split(options, ' ');
-      for (int i = 0; i < pieces.length; i++) {
-        String p = pieces[i].trim();
+      String[] pieces = PApplet.split(options, ' ');
+      for (String piece : pieces) {
+        String p = piece.trim();
         if (p.length() > 0) {
           params.append(p);
         }
@@ -427,7 +422,7 @@ protected StringList getSketchParams(boolean present, String[] args) {
         GraphicsDevice[] devices = ge.getScreenDevices();
 
         // Make sure the display set in Preferences actually exists
-        GraphicsDevice runDevice = editorDevice;
+        GraphicsDevice runDevice;
         if (runDisplay > 0 && runDisplay <= devices.length) {
             runDevice = devices[runDisplay-1];
         } else {
@@ -518,54 +513,52 @@ protected StringList getSketchParams(boolean present, String[] args) {
 
 
   protected void launchJava(final String[] args) {
-    new Thread(new Runnable() {
-      public void run() {
+    new Thread(() -> {
 //        PApplet.println("java starting");
-        vmReturnedError = false;
-        process = PApplet.exec(args);
-        try {
+      vmReturnedError = false;
+      process = PApplet.exec(args);
+      try {
 //          PApplet.println("java waiting");
-          int result = process.waitFor();
+        int result = process.waitFor();
 //          PApplet.println("java done waiting");
-          if (result != 0) {
-            String[] errorStrings = PApplet.loadStrings(process.getErrorStream());
-            String[] inputStrings = PApplet.loadStrings(process.getInputStream());
+        if (result != 0) {
+          String[] errorStrings = PApplet.loadStrings(process.getErrorStream());
+          String[] inputStrings = PApplet.loadStrings(process.getInputStream());
 
 //            PApplet.println("launchJava stderr:");
 //            PApplet.println(errorStrings);
 //            PApplet.println("launchJava stdout:");
-            PApplet.printArray(inputStrings);
-
-            if (errorStrings != null && errorStrings.length > 1) {
-              if (errorStrings[0].indexOf("Invalid maximum heap size") != -1) {
-                Messages.showWarning("Way Too High",
-                                     "Please lower the value for \u201Cmaximum available memory\u201D in the\n" +
-                                     "Preferences window. For more information, read Help \u2192 Troubleshooting.", null);
-              } else {
-                for (String err : errorStrings) {
-                  sketchErr.println(err);
-                }
-                sketchErr.println("Using startup command: " + PApplet.join(args, " "));
-              }
+          PApplet.printArray(inputStrings);
+
+          if (errorStrings != null && errorStrings.length > 1) {
+            if (errorStrings[0].contains("Invalid maximum heap size")) {
+              Messages.showWarning("Way Too High",
+                                   "Please lower the value for \u201Cmaximum available memory\u201D in the\n" +
+                                   "Preferences window. For more information, read Help \u2192 Troubleshooting.", null);
             } else {
-              //exc.printStackTrace();
-              sketchErr.println("Could not run the sketch (Target VM failed to initialize).");
-              if (Preferences.getBoolean("run.options.memory")) {
-                // Only mention this if they've even altered the memory setup
-                sketchErr.println("Make sure that you haven't set the maximum available memory too high.");
+              for (String err : errorStrings) {
+                sketchErr.println(err);
               }
-              sketchErr.println("For more information, read revisions.txt and Help \u2192 Troubleshooting.");
+              sketchErr.println("Using startup command: " + PApplet.join(args, " "));
             }
-            // changing this to separate editor and listener [091124]
-            //if (editor != null) {
-            listener.statusError("Could not run the sketch.");
-            vmReturnedError = true;
-            //}
-//            return null;
+          } else {
+            //exc.printStackTrace();
+            sketchErr.println("Could not run the sketch (Target VM failed to initialize).");
+            if (Preferences.getBoolean("run.options.memory")) {
+              // Only mention this if they've even altered the memory setup
+              sketchErr.println("Make sure that you haven't set the maximum available memory too high.");
+            }
+            sketchErr.println("For more information, read Help \u2192 Troubleshooting.");
           }
-        } catch (InterruptedException e) {
-          e.printStackTrace();
+          // changing this to separate editor and listener [091124]
+          //if (editor != null) {
+          listener.statusError("Could not run the sketch.");
+          vmReturnedError = true;
+          //}
+//            return null;
         }
+      } catch (InterruptedException e) {
+        e.printStackTrace();
       }
     }).start();
   }
@@ -604,40 +597,38 @@ protected void generateTrace() {
       return;
     }
 
-    Thread eventThread = new Thread() {
-      public void run() {
-        try {
-          boolean connected = true;
-          while (connected) {
-            EventQueue eventQueue = vm.eventQueue();
-            // remove() blocks until event(s) available
-            EventSet eventSet = eventQueue.remove();
+    Thread eventThread = new Thread(() -> {
+      try {
+        boolean connected = true;
+        while (connected) {
+          EventQueue eventQueue = vm.eventQueue();
+          // remove() blocks until event(s) available
+          EventSet eventSet = eventQueue.remove();
 //            listener.vmEvent(eventSet);
 
-            for (Event event : eventSet) {
+          for (Event event : eventSet) {
 //              System.out.println("EventThread.handleEvent -> " + event);
-              if (event instanceof VMStartEvent) {
-                vm.resume();
-              } else if (event instanceof ExceptionEvent) {
+            if (event instanceof VMStartEvent) {
+              vm.resume();
+            } else if (event instanceof ExceptionEvent) {
 //                for (ThreadReference thread : vm.allThreads()) {
 //                  System.out.println("thread : " + thread);
 ////                  thread.suspend();
 //                }
-                exceptionEvent((ExceptionEvent) event);
-              } else if (event instanceof VMDisconnectEvent) {
-                connected = false;
-              }
+              exceptionEvent((ExceptionEvent) event);
+            } else if (event instanceof VMDisconnectEvent) {
+              connected = false;
             }
           }
+        }
 //        } catch (VMDisconnectedException e) {
 //          Logger.getLogger(VMEventReader.class.getName()).log(Level.INFO, "VMEventReader quit on VM disconnect");
-        } catch (Exception e) {
-          System.err.println("crashed in event thread due to " + e.getMessage());
+      } catch (Exception e) {
+        System.err.println("crashed in event thread due to " + e.getMessage());
 //          Logger.getLogger(VMEventReader.class.getName()).log(Level.SEVERE, "VMEventReader quit", e);
-          e.printStackTrace();
-        }
+        e.printStackTrace();
       }
-    };
+    });
     eventThread.start();
 
 
@@ -667,9 +658,7 @@ public void run() {
       // or the user manually closes the sketch window.
       // TODO this should be handled better, should it not?
       if (editor != null) {
-        java.awt.EventQueue.invokeLater(() -> {
-          editor.onRunnerExiting(Runner.this);
-        });
+        java.awt.EventQueue.invokeLater(() -> editor.onRunnerExiting(Runner.this));
       }
     } catch (InterruptedException exc) {
       // we don't interrupt
@@ -689,13 +678,7 @@ protected Connector findConnector(String connectorName) {
 //      System.out.println("connector name is " + connector.name());
 //    }
 
-    for (Object c : connectors) {
-      Connector connector = (Connector) c;
-//      System.out.println(connector.name());
-//    }
-//    Iterator iter = connectors.iterator();
-//    while (iter.hasNext()) {
-//      Connector connector = (Connector)iter.next();
+    for (Connector connector : connectors) {
       if (connector.name().equals(connectorName)) {
         return connector;
       }
@@ -736,9 +719,7 @@ public void exceptionEvent(ExceptionEvent event) {
     handleCommonErrors(exceptionName, message, listener, sketchErr);
 
     if (editor != null) {
-      java.awt.EventQueue.invokeLater(() -> {
-        editor.onRunnerExiting(Runner.this);
-      });
+      java.awt.EventQueue.invokeLater(() -> editor.onRunnerExiting(Runner.this));
     }
   }
 
@@ -832,8 +813,7 @@ protected SketchException findException(String message, ObjectReference or, Thre
       for (StackFrame frame : frames) {
         try {
           Location location = frame.location();
-          String filename = null;
-          filename = location.sourceName();
+          String filename = location.sourceName();
           int lineNumber = location.lineNumber() - 1;
           SketchException rex =
             build.placeException(message, filename, lineNumber);
@@ -857,7 +837,7 @@ protected SketchException findException(String message, ObjectReference or, Thre
     } catch (Exception e) {
       // stack overflows seem to trip in frame.location() above
       // ignore this case so that the actual error gets reported to the user
-      if ("StackOverflowError".equals(message) == false) {
+      if (!"StackOverflowError".equals(message)) {
         e.printStackTrace(sketchErr);
       }
     }
@@ -866,15 +846,15 @@ protected SketchException findException(String message, ObjectReference or, Thre
     try {
       // assume object reference is Throwable, get stack trace
       Method method = ((ClassType) or.referenceType()).concreteMethodByName("getStackTrace", "()[Ljava/lang/StackTraceElement;");
-      ArrayReference result = (ArrayReference) or.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
+      ArrayReference result = (ArrayReference) or.invokeMethod(thread, method, new ArrayList<>(), ObjectReference.INVOKE_SINGLE_THREADED);
       // iterate through stack frames and pull filename and line number for each
       for (Value val: result.getValues()) {
         ObjectReference ref = (ObjectReference)val;
         method = ((ClassType) ref.referenceType()).concreteMethodByName("getFileName", "()Ljava/lang/String;");
-        StringReference strref = (StringReference) ref.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
+        StringReference strref = (StringReference) ref.invokeMethod(thread, method, new ArrayList<>(), ObjectReference.INVOKE_SINGLE_THREADED);
         String filename = strref == null ? "Unknown Source" : strref.value();
         method = ((ClassType) ref.referenceType()).concreteMethodByName("getLineNumber", "()I");
-        IntegerValue intval = (IntegerValue) ref.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
+        IntegerValue intval = (IntegerValue) ref.invokeMethod(thread, method, new ArrayList<>(), ObjectReference.INVOKE_SINGLE_THREADED);
         int lineNumber = intval.intValue() - 1;
         SketchException rex =
           build.placeException(message, filename, lineNumber);
@@ -888,12 +868,12 @@ protected SketchException findException(String message, ObjectReference or, Thre
       // Implemented for 2.0b9, writes a stack trace when there's an internal error inside core.
       method = ((ClassType) or.referenceType()).concreteMethodByName("printStackTrace", "()V");
 //      System.err.println("got method " + method);
-      or.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
+      or.invokeMethod(thread, method, new ArrayList<>(), ObjectReference.INVOKE_SINGLE_THREADED);
 
     } catch (Exception e) {
       // stack overflows will make the exception handling above trip again
       // ignore this case so that the actual error gets reported to the user
-      if ("StackOverflowError".equals(message) == false) {
+      if (!"StackOverflowError".equals(message)) {
         e.printStackTrace(sketchErr);
       }
     }
