fixing processing#4703 reveals another bug

benfry · benfry · commit cbfc31ccfef7 · 2019-01-20T10:28:14.000-08:00
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -255,6 +255,7 @@ public String preprocess(File srcFolder,
           writer.close();
         }
       } catch (RuntimeException re) {
+        re.printStackTrace();
         throw new SketchException("Could not write " + java.getAbsolutePath());
       }
     } catch (antlr.RecognitionException re) {
diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -1230,7 +1230,8 @@ protected void writeFooter(PrintWriter out, String className) {
     if ((mode == Mode.STATIC) || (mode == Mode.ACTIVE)) {
       // doesn't remove the original size() method,
       // but calling size() again in setup() is harmless.
-      if (!hasMethod("settings") && sizeInfo.hasSettings()) {
+      if (!hasMethod("settings") &&
+          sizeInfo != null && sizeInfo.hasSettings()) {
         out.println(indent + "public void settings() { " + sizeInfo.getSettings() + " }");
       }
 

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ public String preprocess(File srcFolder,`
`255`	`255`	`writer.close();`
`256`	`256`	`}`
`257`	`257`	`} catch (RuntimeException re) {`
	`258`	`+ re.printStackTrace();`
`258`	`259`	`throw new SketchException("Could not write " + java.getAbsolutePath());`
`259`	`260`	`}`
`260`	`261`	`} catch (antlr.RecognitionException re) {`
Original file line number	Diff line number	Diff line change
`@@ -1230,7 +1230,8 @@ protected void writeFooter(PrintWriter out, String className) {`
`1230`	`1230`	`if ((mode == Mode.STATIC) \|\| (mode == Mode.ACTIVE)) {`
`1231`	`1231`	`// doesn't remove the original size() method,`
`1232`	`1232`	`// but calling size() again in setup() is harmless.`
`1233`		`- if (!hasMethod("settings") && sizeInfo.hasSettings()) {`
	`1233`	`+ if (!hasMethod("settings") &&`
	`1234`	`+ sizeInfo != null && sizeInfo.hasSettings()) {`
`1234`	`1235`	`out.println(indent + "public void settings() { " + sizeInfo.getSettings() + " }");`
`1235`	`1236`	`}`
`1236`	`1237`