8348033: Tidy Nashorn code (#23)

Author: szegedi

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Console.java

@@ -123,7 +123,7 @@ public void close() {
 
     private void saveHistory() {
         try (Writer out = Files.newBufferedWriter(historyFile.toPath())) {
-            String lineSeparator = System.getProperty("line.separator");
+            String lineSeparator = System.lineSeparator();
 
             out.write(StreamSupport.stream(getHistory().spliterator(), false)
                                    .map(e -> e.line())

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/EditObject.java

@@ -42,9 +42,7 @@
 final class EditObject extends AbstractJSObject {
     private static final Set<String> props;
     static {
-        final HashSet<String> s = new HashSet<>();
-        s.add("editor");
-        props = Collections.unmodifiableSet(s);
+        props = Set.of("editor");
     }
 
     private final Console console;

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/ExternalEditor.java

@@ -26,7 +26,6 @@
 package org.openjdk.nashorn.tools.jjs;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.ClosedWatchServiceException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -46,7 +45,6 @@ final class ExternalEditor {
 
     private WatchService watcher;
     private Thread watchedThread;
-    private Path dir;
     private Path tmpfile;
 
     ExternalEditor(final Consumer<String> errorHandler, final Consumer<String> saveHandler, final Console input) {
@@ -69,9 +67,9 @@ private void edit(final String cmd, final String initialText) {
      */
     private void setupWatch(final String initialText) throws IOException {
         this.watcher = FileSystems.getDefault().newWatchService();
-        this.dir = Files.createTempDirectory("REPL");
+        Path dir = Files.createTempDirectory("REPL");
         this.tmpfile = Files.createTempFile(dir, null, ".js");
-        Files.write(tmpfile, initialText.getBytes(Charset.forName("UTF-8")));
+        Files.writeString(tmpfile, initialText);
         dir.register(watcher,
                 ENTRY_CREATE,
                 ENTRY_DELETE,
@@ -104,8 +102,7 @@ private void setupWatch(final String initialText) throws IOException {
     }
 
     private void launch(final String cmd) throws IOException {
-        ProcessBuilder pb = new ProcessBuilder(cmd, tmpfile.toString());
-        pb = pb.inheritIO();
+        ProcessBuilder pb = new ProcessBuilder(cmd, tmpfile.toString()).inheritIO();
 
         try {
             input.suspend();

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/HistoryObject.java

@@ -51,15 +51,7 @@
 final class HistoryObject extends AbstractJSObject {
     private static final Set<String> props;
     static {
-        final HashSet<String> s = new HashSet<>();
-        s.add("clear");
-        s.add("forEach");
-        s.add("load");
-        s.add("print");
-        s.add("save");
-        s.add("size");
-        s.add("toString");
-        props = Collections.unmodifiableSet(s);
+        props = Set.of("clear", "forEach", "load", "print", "save", "size", "toString");
     }
 
     private final History hist;

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/Main.java

@@ -205,7 +205,7 @@ protected int readEvalPrint(final Context context, final Global global) {
                 try {
                     source = in.readLine(prompt, prompt2);
                 } catch (final IOException ioe) {
-                    err.println(ioe.toString());
+                    err.println(ioe);
                     if (env._dump_on_error) {
                         ioe.printStackTrace(err);
                     }

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/NashornCompleter.java

@@ -29,13 +29,9 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 import jdk.internal.org.jline.reader.Candidate;
-import jdk.internal.org.jline.reader.Completer;
-import jdk.internal.org.jline.reader.LineReader;
-import jdk.internal.org.jline.reader.ParsedLine;
 import jdk.internal.org.jline.reader.UserInterruptException;
 import org.openjdk.nashorn.api.tree.AssignmentTree;
 import org.openjdk.nashorn.api.tree.BinaryTree;
@@ -155,15 +151,14 @@ String readMoreLines(final String firstLine, final Exception exp, final Console
             } catch (final Throwable th) {
                 if (th instanceof UserInterruptException) {
                     // Ctrl-C from user - discard the whole thing silently!
-                    return null;
                 } else {
                     // print anything else -- but still discard the code
                     err.println(th);
                     if (env._dump_on_error) {
                         th.printStackTrace(err);
                     }
-                    return null;
                 }
+                return null;
             }
 
             final String allLines = buf.toString();

src/org.openjdk.nashorn.shell/share/classes/org/openjdk/nashorn/tools/jjs/PropertiesHelper.java

@@ -26,7 +26,6 @@
 package org.openjdk.nashorn.tools.jjs;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/scripting/Formatter.java

@@ -104,7 +104,7 @@ static String format(final String format, final Object[] args) {
                             // convert double to long
                             args[index - 1] = ((Double) arg).longValue();
                         } else if (arg instanceof String
-                                && ((String) arg).length() > 0) {
+                                   && !((String) arg).isEmpty()) {
                             // convert string (first character) to int
                             args[index - 1] = (int) ((String) arg).charAt(0);
                         }
@@ -126,7 +126,7 @@ static String format(final String format, final Object[] args) {
                             // convert double to integer
                             args[index - 1] = ((Double) arg).intValue();
                         } else if (arg instanceof String
-                                && ((String) arg).length() > 0) {
+                                   && !((String) arg).isEmpty()) {
                             // get the first character from string
                             args[index - 1] = (int) ((String) arg).charAt(0);
                         }

src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/scripting/ScriptObjectMirror.java

@@ -740,7 +740,7 @@ private static void checkKey(final Object key) {
 
         if (!(key instanceof String)) {
             throw new ClassCastException("key should be a String. It is " + key.getClass().getName() + " instead.");
-        } else if (((String)key).length() == 0) {
+        } else if (((String) key).isEmpty()) {
             throw new IllegalArgumentException("key can not be empty");
         }
     }

src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/tree/ExportEntryTree.java

@@ -24,8 +24,6 @@
  */
 package org.openjdk.nashorn.api.tree;
 
-import java.util.List;
-
 /**
  * A Tree node for export entry in <a href="http://www.ecma-international.org/ecma-262/6.0/#sec-modules">Module information</a>.
  */