Merge pull request #1 from processing/master

merge commits

Author: liquidev

core/src/processing/core/PApplet.java

@@ -62,7 +62,10 @@
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
 import java.util.regex.*;
 import java.util.zip.*;
 
@@ -5431,9 +5434,10 @@ public PImage loadImage(String filename) {
    */
   public PImage loadImage(String filename, String extension) { //, Object params) {
 
-    // await... has to run on the main thread, because P2D and P3D call GL functions
-    // If this runs on background, requestImage() already called await... on the main thread
-    if (g != null && !Thread.currentThread().getName().startsWith(ASYNC_IMAGE_LOADER_THREAD_PREFIX)) {
+    // awaitAsyncSaveCompletion() has to run on the main thread, because P2D
+    // and P3D call GL functions. If this runs on background, requestImage()
+    // already called awaitAsyncSaveCompletion() on the main thread.
+    if (g != null && !Thread.currentThread().getName().startsWith(REQUEST_IMAGE_THREAD_PREFIX)) {
       g.awaitAsyncSaveCompletion(filename);
     }
 
@@ -5561,8 +5565,12 @@ public PImage loadImage(String filename, String extension) { //, Object params)
   }
 
 
+  static private final String REQUEST_IMAGE_THREAD_PREFIX = "requestImage";
+  // fixed-size thread pool used by requestImage()
+  ExecutorService requestImagePool;
+
+
   public PImage requestImage(String filename) {
-//    return requestImage(filename, null, null);
     return requestImage(filename, null);
   }
 
@@ -5596,62 +5604,17 @@ public PImage requestImage(String filename, String extension) {
       g.awaitAsyncSaveCompletion(filename);
     }
     PImage vessel = createImage(0, 0, ARGB);
-    AsyncImageLoader ail =
-      new AsyncImageLoader(filename, extension, vessel);
-    ail.start();
-    return vessel;
-  }
-
-
-//  /**
-//   * @nowebref
-//   */
-//  public PImage requestImage(String filename, String extension, Object params) {
-//    PImage vessel = createImage(0, 0, ARGB, params);
-//    AsyncImageLoader ail =
-//      new AsyncImageLoader(filename, extension, vessel);
-//    ail.start();
-//    return vessel;
-//  }
-
-
-  /**
-   * By trial and error, four image loading threads seem to work best when
-   * loading images from online. This is consistent with the number of open
-   * connections that web browsers will maintain. The variable is made public
-   * (however no accessor has been added since it's esoteric) if you really
-   * want to have control over the value used. For instance, when loading local
-   * files, it might be better to only have a single thread (or two) loading
-   * images so that you're disk isn't simply jumping around.
-   */
-  public int requestImageMax = 4;
-  volatile int requestImageCount;
 
-  private static final String ASYNC_IMAGE_LOADER_THREAD_PREFIX = "ASYNC_IMAGE_LOADER";
-
-  class AsyncImageLoader extends Thread {
-    String filename;
-    String extension;
-    PImage vessel;
-
-    public AsyncImageLoader(String filename, String extension, PImage vessel) {
-      // Give these threads distinct name so we can check whether we are loading
-      // on the main/background thread; for now they are all named the same
-      super(ASYNC_IMAGE_LOADER_THREAD_PREFIX);
-      this.filename = filename;
-      this.extension = extension;
-      this.vessel = vessel;
+    // if the image loading thread pool hasn't been created, create it
+    if (requestImagePool == null) {
+      ThreadFactory factory = new ThreadFactory() {
+        public Thread newThread(Runnable r) {
+          return new Thread(r, REQUEST_IMAGE_THREAD_PREFIX);
+        }
+      };
+      requestImagePool = Executors.newFixedThreadPool(4, factory);
     }
-
-    @Override
-    public void run() {
-      while (requestImageCount == requestImageMax) {
-        try {
-          Thread.sleep(10);
-        } catch (InterruptedException e) { }
-      }
-      requestImageCount++;
-
+    requestImagePool.execute(() -> {
       PImage actual = loadImage(filename, extension);
 
       // An error message should have already printed
@@ -5669,31 +5632,11 @@ public void run() {
         vessel.pixelHeight = actual.height;
         vessel.pixelDensity = 1;
       }
-      requestImageCount--;
-    }
+    });
+    return vessel;
   }
 
 
-  // done internally by ImageIcon
-//  /**
-//   * Load an AWT image synchronously by setting up a MediaTracker for
-//   * a single image, and blocking until it has loaded.
-//   */
-//  protected PImage loadImageMT(Image awtImage) {
-//    MediaTracker tracker = new MediaTracker(this);
-//    tracker.addImage(awtImage, 0);
-//    try {
-//      tracker.waitForAll();
-//    } catch (InterruptedException e) {
-//      //e.printStackTrace();  // non-fatal, right?
-//    }
-//
-//    PImage image = new PImage(awtImage);
-//    image.parent = this;
-//    return image;
-//  }
-
-
   /**
    * Use Java 1.4 ImageIO methods to load an image.
    */

core/src/processing/data/DoubleDict.java

@@ -3,6 +3,7 @@
 import java.io.*;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import processing.core.PApplet;
 
@@ -106,6 +107,20 @@ public DoubleDict(Object[][] pairs) {
   }
 
 
+  public DoubleDict(Map<String, Double> incoming) {
+    count = incoming.size();
+    keys = new String[count];
+    values = new double[count];
+    int index = 0;
+    for (Map.Entry<String, Double> e : incoming.entrySet()) {
+      keys[index] = e.getKey();
+      values[index] = e.getValue();
+      indices.put(keys[index], index);
+      index++;
+    }
+  }
+
+
   /**
    * @webref doubledict:method
    * @brief Returns the number of key/value pairs

core/src/processing/data/Table.java

@@ -4350,7 +4350,15 @@ public int compare(int index1, int index2) {
           double diffd = getDouble(a, column) - getDouble(b, column);
           return diffd == 0 ? 0 : (diffd < 0 ? -1 : 1);
         case STRING:
-          return getString(a, column).compareToIgnoreCase(getString(b, column));
+          String string1 = getString(a, column);
+          if (string1 == null) {
+            string1 = "";  // avoid NPE when cells are left empty
+          }
+          String string2 = getString(b, column);
+          if (string2 == null) {
+            string2 = "";
+          }
+          return string1.compareToIgnoreCase(string2);
         case CATEGORY:
           return getInt(a, column) - getInt(b, column);
         default:

core/src/processing/data/XML.java

@@ -594,7 +594,14 @@ public void removeChild(XML kid) {
     children = null;  // TODO not efficient
   }
 
-
+  /**
+   * Removes whitespace nodes.
+   * Those whitespace nodes are required to reconstruct the original XML's spacing and indentation.
+   * If you call this and use saveXML() your original spacing will be gone.
+   * 
+   * @nowebref
+   * @brief Removes whitespace nodes
+   */
   public void trim() {
     try {
       XPathFactory xpathFactory = XPathFactory.newInstance();

core/todo.txt

@@ -1,6 +1,7 @@
 0265 (3.4)
 X change lack of blendMode() to a warning rather than an error in PDF
 X rewrite exec() to do threads, also handle fast/excessive output cases
+X rewrite requestImage() to fix errors/slowness/concurrency problems
 
 data classes
 X add Double and Long versions of the data classes
@@ -10,6 +11,7 @@ X   sort only uses the sign of the value
 X   more accurate than float, especially when using double and long values
 X consistently implement write(PrintWriter) in the List and Dict classes
 X add save(File) to the List and Dict classes
+X prevent Table.sort() from throwing NPE with empty cells
 _ Dict.remove() should return value, not index (for consistency w/ others)
 _ check again whether element 0,0 in a Table is working
 _   https://github.com/processing/processing/issues/3011

java/src/processing/mode/java/JavaEditor.java

@@ -21,6 +21,7 @@
 import processing.app.*;
 import processing.app.contrib.*;
 import processing.app.syntax.JEditTextArea;
+import processing.app.syntax.PdeTextArea;
 import processing.app.syntax.PdeTextAreaDefaults;
 import processing.app.ui.*;
 import processing.app.ui.Toolkit;
@@ -2078,7 +2079,7 @@ public void setCurrentLine(LineID line) {
     cursorToLineStart(line.lineIdx());
     // highlight line
     currentLine = new LineHighlight(line.lineIdx(), this);
-    currentLine.setMarker(JavaTextArea.STEP_MARKER);
+    currentLine.setMarker(PdeTextArea.STEP_MARKER);
     currentLine.setPriority(10); // fixes current line being hidden by the breakpoint when moved down
   }
 
@@ -2107,7 +2108,7 @@ public void clearCurrentLine() {
    */
   public void addBreakpointedLine(LineID lineID) {
     LineHighlight hl = new LineHighlight(lineID, this);
-    hl.setMarker(JavaTextArea.BREAK_MARKER);
+    hl.setMarker(PdeTextArea.BREAK_MARKER);
     breakpointedLines.add(hl);
     // repaint current line if it's on this line
     if (currentLine != null && currentLine.getLineID().equals(lineID)) {
@@ -2350,7 +2351,7 @@ private void showImportSuggestion(String[] list, int x, int y) {
     frmImportSuggest = new JFrame();
 
     frmImportSuggest.setUndecorated(true);
-    frmImportSuggest.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+    frmImportSuggest.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
     JPanel panel = new JPanel();
     panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
     panel.setBackground(Color.WHITE);

java/src/processing/mode/java/pdex/DebugTree.java

@@ -9,9 +9,9 @@
 import java.util.function.Consumer;
 
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
+import javax.swing.WindowConstants;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
@@ -24,6 +24,7 @@
 import processing.mode.java.JavaEditor;
 import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
 
+
 class DebugTree {
   final JDialog window;
   final JTree tree;
@@ -59,7 +60,7 @@ public void componentHidden(ComponentEvent e) {
         tree.setModel(null);
       }
     });
-    window.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+    window.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
     window.setBounds(new Rectangle(680, 100, 460, 620));
     window.setTitle("AST View - " + editor.getSketch().getName());
     JScrollPane sp = new JScrollPane();

java/src/processing/mode/java/pdex/Rename.java

@@ -17,12 +17,12 @@
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JRootPane;
 import javax.swing.JTextField;
+import javax.swing.WindowConstants;
 import javax.swing.text.BadLocationException;
 
 import org.eclipse.jdt.core.dom.ASTNode;
@@ -73,7 +73,7 @@ class Rename {
     window = new JDialog(editor);
     JRootPane rootPane = window.getRootPane();
     window.setTitle("Rename");
-    window.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+    window.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
     Toolkit.registerWindowCloseKeys(rootPane, new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {

java/src/processing/mode/java/pdex/ShowUsage.java

@@ -16,10 +16,10 @@
 import java.util.stream.Collectors;
 
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
+import javax.swing.WindowConstants;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
@@ -63,7 +63,7 @@ class ShowUsage {
 
     { // Show Usage window
       window = new JDialog(editor);
-      window.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+      window.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
       window.setAutoRequestFocus(false);
       window.addComponentListener(new ComponentAdapter() {
         @Override

todo.txt

@@ -27,6 +27,7 @@ X update to Java 8u172
 _ Examples dialog causes high CPU load
 _   https://github.com/processing/processing/issues/5246
 
+
 contrib
 X updates to Japanese translation
 X   https://github.com/processing/processing/pull/5263
@@ -37,6 +38,7 @@ X   https://github.com/processing/processing/pull/5144
 X Update java.lang.UnsupportedClassVersionError message
 X   https://github.com/processing/processing/pull/5459
 
+
 welcome
 o just remove the welcome dialog; but what should the default behavior be?
 o   or should it only show up for people who have used <=2 but not 3?
@@ -98,6 +100,8 @@ _   https://github.com/processing/processing/pull/5126
 
 
 nasty ones
+_ errors inside setup() aren't coming through at all? 
+_   seen in Eclipse; have to turn on the debugger
 _ "Sketch disappeared" infinite pop up dialogs
 _   https://github.com/processing/processing/pull/4808
 _   https://github.com/processing/processing/issues/4805