Merge branch 'master' into static_imports

java/test/resources/packageTest.expected

@@ -0,0 +1,33 @@
+package test.subtest;
+
+import processing.core.*;
+import processing.data.*;
+import processing.event.*;
+import processing.opengl.*;
+
+import java.util.*;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.io.File;
+import java.io.BufferedReader;
+import java.io.PrintWriter;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+
+public class packageTest extends PApplet {
+
+    public void setup() {
+List<String> test = new ArrayList<>();
+    noLoop();
+    }
+
+    static public void main(String[] passedArgs) {
+        String[] appletArgs = new String[] { "packageTest" };
+        if (passedArgs != null) {
+            PApplet.main(concat(appletArgs, passedArgs));
+        } else {
+            PApplet.main(appletArgs);
+        }
+    }
+}

java/test/resources/packageTest.pde

@@ -0,0 +1,3 @@
+import java.util.*;
+
+List<String> test = new ArrayList<>();