a bit of cleaning while looking for #610

Author: benfry

app/src/processing/app/Sketch.java

@@ -39,7 +39,6 @@
 import java.awt.event.KeyEvent;
 import java.io.*;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -79,11 +78,11 @@ public class Sketch {
   private int currentIndex;
 
   /**
-   * Number of SketchCode objects (tabs) in the current sketch. Note that this
-   * will be the same as code.length, because the getCode() method returns
-   * just the code[] array, rather than a copy of it, or an array that's been
-   * resized to just the relevant files themselves.
-   * https://download.processing.org/bugzilla/940.html
+   * Number of SketchCode objects (tabs) in the current sketch. Note
+   * that this will be the same as code.length, because the getCode()
+   * method returns just the code[] array, rather than a copy of it,
+   * or an array that's been resized to just the relevant files.
+   * (<a href="https://download.processing.org/bugzilla/940.html">Bugzilla 940</a>)
    */
   private int codeCount;
   private SketchCode[] code;
@@ -1692,8 +1691,10 @@ public String getName() {
 
   /**
    * Returns the name (without extension) of the main tab.
-   * Most uses of getName() prior to 4.0 beta 6 were to get the main class,
-   * but this allows the sketch to be decoupled from the main tab name.
+   * (This version still has underscores and is a legit class name.)
+   * Most getName() calls before 4.0 were to get the main class,
+   * so this method addition allows the sketch name to be decoupled
+   * from the name of the main tab.
    */
   public String getMainName() {
     return code[0].getPrettyName();

java/src/processing/mode/java/PreprocService.java

@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -103,7 +102,6 @@ public class PreprocService {
 
   /**
    * Create a new preprocessing service to support an editor.
-   * @param editor The editor supported by this service and receives issues.
    */
   public PreprocService(JavaMode javaMode, Sketch sketch) {
     this.javaMode = javaMode;
@@ -362,6 +360,7 @@ private PreprocSketch preprocessSketch(PreprocSketch prevResult) {
         String newPieceBuilt = getSketchTabContents(sc) + '\n';
         numLines += SourceUtil.getCount(newPieceBuilt, "\n");
         workBuffer.append(newPieceBuilt);
+
       } else if (sc.isExtension("java")) {
         tabStartsList.append(workBuffer.length());
         tabLineStarts.add(numLines);
@@ -377,7 +376,7 @@ private PreprocSketch preprocessSketch(PreprocSketch prevResult) {
         workBuffer.append(newPieceBuilt);
       }
     }
-    result.tabStartOffsets = tabStartsList.array();
+    result.tabStartOffsets = tabStartsList.toArray();
 
     String pdeStage = result.pdeCode = workBuffer.toString();
 
@@ -419,8 +418,6 @@ private PreprocSketch preprocessSketch(PreprocSketch prevResult) {
     }
 
     if (preprocessorResult.getPreprocessIssues().size() > 0) {
-      final int endNumLines = numLines;
-
       preprocessorResult.getPreprocessIssues().stream()
           .map((x) -> ProblemFactory.build(x, tabLineStarts))
           .forEach(result.otherProblems::add);
@@ -694,7 +691,7 @@ private void setupParser(boolean resolveBindings, String className,
   private Path createTemporaryFile(String content) {
     try {
       Path tempFile = Files.createTempFile(null, null);
-      Files.write(tempFile, content.getBytes(StandardCharsets.UTF_8));
+      Files.writeString(tempFile, content);
       return tempFile;
     } catch (IOException e) {
       throw new RuntimeException("Cannot write to temporary folder.");