diff --git a/app/.classpath b/app/.classpath
index 3fb1a2481..fa715a50e 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -10,7 +10,8 @@
-
+
+
diff --git a/core/build.xml b/core/build.xml
index 556b0cf75..db633fff9 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -78,8 +78,8 @@
-
-
+
+
diff --git a/core/library-test/byte-buddy-1.11.19.jar b/core/library-test/byte-buddy-1.11.19.jar
new file mode 100644
index 000000000..ff79833e0
Binary files /dev/null and b/core/library-test/byte-buddy-1.11.19.jar differ
diff --git a/core/library-test/hamcrest-core-1.3.jar b/core/library-test/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/core/library-test/hamcrest-core-1.3.jar differ
diff --git a/core/library-test/junit-4.13.2.jar b/core/library-test/junit-4.13.2.jar
new file mode 100644
index 000000000..6da55d8b8
Binary files /dev/null and b/core/library-test/junit-4.13.2.jar differ
diff --git a/core/library-test/junit-4.8.1.jar b/core/library-test/junit-4.8.1.jar
deleted file mode 100644
index 524cd65ce..000000000
Binary files a/core/library-test/junit-4.8.1.jar and /dev/null differ
diff --git a/core/library-test/mockito-all-1.10.19.jar b/core/library-test/mockito-all-1.10.19.jar
deleted file mode 100644
index c831489cd..000000000
Binary files a/core/library-test/mockito-all-1.10.19.jar and /dev/null differ
diff --git a/core/library-test/mockito-core-4.0.0.jar b/core/library-test/mockito-core-4.0.0.jar
new file mode 100644
index 000000000..d191b44ea
Binary files /dev/null and b/core/library-test/mockito-core-4.0.0.jar differ
diff --git a/core/library-test/objenesis-3.2.jar b/core/library-test/objenesis-3.2.jar
new file mode 100644
index 000000000..1888e2ea1
Binary files /dev/null and b/core/library-test/objenesis-3.2.jar differ
diff --git a/java/.classpath b/java/.classpath
index fa8666d22..5607a9971 100644
--- a/java/.classpath
+++ b/java/.classpath
@@ -24,6 +24,7 @@
-
+
+
diff --git a/java/build.xml b/java/build.xml
index 36bf9b824..8377a5e7d 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -75,8 +75,11 @@
-
-
+
+
+
+
+
diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
index 70918cc5e..1fc5b5360 100644
--- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+++ b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java
@@ -325,6 +325,10 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
public void exitMethodCall(ProcessingParser.MethodCallContext ctx) {
String methodName = ctx.getChild(0).getText();
+ // Check if calling on something other than this.
+ //System.out.println(ctx.getParent());
+
+ // If referring to the applet, check for rewrites.
if (SIZE_METHOD_NAME.equals(methodName) || FULLSCREEN_METHOD_NAME.equals(methodName)) {
handleSizeCall(ctx);
} else if (PIXEL_DENSITY_METHOD_NAME.equals(methodName)) {
diff --git a/java/test/lib/hamcrest-core-1.3.jar b/java/test/lib/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/java/test/lib/hamcrest-core-1.3.jar differ
diff --git a/java/test/lib/junit-4.13.2.jar b/java/test/lib/junit-4.13.2.jar
new file mode 100644
index 000000000..6da55d8b8
Binary files /dev/null and b/java/test/lib/junit-4.13.2.jar differ
diff --git a/java/test/lib/junit-4.8.1.jar b/java/test/lib/junit-4.8.1.jar
deleted file mode 100644
index 524cd65ce..000000000
Binary files a/java/test/lib/junit-4.8.1.jar and /dev/null differ
diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java
index dfc184a25..9d9a39e8d 100644
--- a/java/test/processing/mode/java/ParserTests.java
+++ b/java/test/processing/mode/java/ParserTests.java
@@ -390,4 +390,9 @@ public class ParserTests {
expectGood("colorimport");
}
+ /*@Test
+ public void testPGraphicsStandalone() {
+ expectGood("pgraphics");
+ }*/
+
}
diff --git a/java/test/resources/pgraphics.expected b/java/test/resources/pgraphics.expected
new file mode 100644
index 000000000..e69de29bb
diff --git a/java/test/resources/pgraphics.pde b/java/test/resources/pgraphics.pde
new file mode 100644
index 000000000..b0a765813
--- /dev/null
+++ b/java/test/resources/pgraphics.pde
@@ -0,0 +1,10 @@
+PGraphics gfx;
+
+void setup() {
+
+ gfx = createGraphics(width, height);
+ gfx.smooth();
+}
+
+void draw() {
+}