use loadStrings() instead of custom BufferedReader

benfry · benfry · commit cdabecebb355 · 2022-01-18T17:21:54.000-05:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -138,9 +138,8 @@ protected void loadKeywords(File keywordFile) throws IOException {
   @SuppressWarnings("SameParameterValue")
   protected void loadKeywords(File keywordFile,
                               String commentPrefix) throws IOException {
-    BufferedReader reader = PApplet.createReader(keywordFile);
-    String line;
-    while ((line = reader.readLine()) != null) {
+    String[] lines = PApplet.loadStrings(keywordFile);
+    for (String line : lines) {
       if (!line.trim().startsWith(commentPrefix)) {
         // Was difficult to make sure that mode authors were properly doing
         // tab-separated values. By definition, there can't be additional
@@ -173,7 +172,6 @@ protected void loadKeywords(File keywordFile,
         }
       }
     }
-    reader.close();
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -138,9 +138,8 @@ protected void loadKeywords(File keywordFile) throws IOException {`
`138`	`138`	`@SuppressWarnings("SameParameterValue")`
`139`	`139`	`protected void loadKeywords(File keywordFile,`
`140`	`140`	`String commentPrefix) throws IOException {`
`141`		`- BufferedReader reader = PApplet.createReader(keywordFile);`
`142`		`- String line;`
`143`		`- while ((line = reader.readLine()) != null) {`
	`141`	`+ String[] lines = PApplet.loadStrings(keywordFile);`
	`142`	`+ for (String line : lines) {`
`144`	`143`	`if (!line.trim().startsWith(commentPrefix)) {`
`145`	`144`	`// Was difficult to make sure that mode authors were properly doing`
`146`	`145`	`// tab-separated values. By definition, there can't be additional`
`@@ -173,7 +172,6 @@ protected void loadKeywords(File keywordFile,`
`173`	`172`	`}`
`174`	`173`	`}`
`175`	`174`	`}`
`176`		`- reader.close();`
`177`	`175`	`}`
`178`	`176`
`179`	`177`