8349687: Some more tidying of Nashorn codebase (#25)

Author: szegedi

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

@@ -96,7 +96,7 @@ class Console implements AutoCloseable {
                 in.getHistory().add(line.toString());
             }
         }
-        Runtime.getRuntime().addShutdownHook(new Thread((Runnable)this::saveHistory));
+        Runtime.getRuntime().addShutdownHook(new Thread(this::saveHistory));
         bind(DOCUMENTATION_SHORTCUT, ()->showDocumentation(docHelper));
     }
 

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

@@ -182,7 +182,7 @@ private void print() {
 
     private Object iterate(final JSObject func) {
         for (History.Entry e : hist) {
-            if (JSType.toBoolean(func.call(this, e.line().toString()))) {
+            if (JSType.toBoolean(func.call(this, e.line()))) {
                 break; // return true from callback to skip iteration
             }
         }

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

@@ -88,7 +88,7 @@ static boolean isAvailable() {
                 fm.setLocation(StandardLocation.CLASS_PATH, getFiles(classPath));
             } else {
                 // no classpath set. Make sure that it is empty and not any default like "."
-                fm.setLocation(StandardLocation.CLASS_PATH, Collections.<File>emptyList());
+                fm.setLocation(StandardLocation.CLASS_PATH, Collections.emptyList());
             }
         } else {
             // javac is not available - caller should have checked!

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

@@ -289,7 +289,7 @@ private void evalImpl(final Context context, final Global global, final String s
         }
     }
 
-    private static String JAVADOC_BASE = "https://docs.oracle.com/javase/%d/docs/api/";
+    private static final String JAVADOC_BASE = "https://docs.oracle.com/javase/%d/docs/api/";
     private static void openBrowserForJavadoc(ScriptFunction browse, String relativeUrl) {
         try {
             final URI uri = new URI(String.format(JAVADOC_BASE, Runtime.version().feature()) + relativeUrl);

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

@@ -90,7 +90,7 @@ final List<String> getPackageProperties(final String pkg) {
             if (Main.DEBUG) {
                 exp.printStackTrace();
             }
-            return Collections.<String>emptyList();
+            return Collections.emptyList();
         }
     }
 

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

@@ -90,7 +90,7 @@ List<String> getProperties(final Object obj) {
             if (pkgsHelper != null) {
                 return pkgsHelper.getPackageProperties(((NativeJavaPackage)obj).getName());
             } else {
-                return Collections.<String>emptyList();
+                return Collections.emptyList();
             }
         }
 

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

@@ -50,7 +50,7 @@ public ExpressionTree getExpression() {
 
     @Override
     public boolean isStar() {
-        return ((UnaryNode) node).isTokenType(TokenType.YIELD_STAR);
+        return node.isTokenType(TokenType.YIELD_STAR);
     }
 
     @Override

src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/ClassEmitter.java

@@ -430,7 +430,7 @@ static String disassemble(final byte[] bytecode) {
             cr.accept(tcv, 0);
         }
 
-        return new String(baos.toByteArray());
+        return baos.toString();
     }
 
     /**

src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CodeGenerator.java

@@ -3047,7 +3047,7 @@ public boolean enterSwitchNode(final SwitchNode switchNode) {
             }
             // TABLESWITCH needs (range + 3) 32-bit values; LOOKUPSWITCH needs ((size * 2) + 2). Choose the one with
             // smaller representation, favor TABLESWITCH when they're equal size.
-            if (range + 1 <= (size * 2)) {
+            if (range + 1 <= (size * 2L)) {
                 final Label[] table = new Label[(int)range];
                 Arrays.fill(table, defaultLabel);
                 for (int i = 0; i < size; i++) {

src/org.openjdk.nashorn/share/classes/org/openjdk/nashorn/internal/codegen/CompilerConstants.java

@@ -193,25 +193,25 @@ public enum CompilerConstants {
     private final Class<?> type;
     private final int slot;
 
-    private CompilerConstants() {
+    CompilerConstants() {
         this.symbolName = name();
         this.type = null;
         this.slot = -1;
     }
 
-    private CompilerConstants(final String symbolName) {
+    CompilerConstants(final String symbolName) {
         this(symbolName, -1);
     }
 
-    private CompilerConstants(final String symbolName, final int slot) {
+    CompilerConstants(final String symbolName, final int slot) {
         this(symbolName, null, slot);
     }
 
-    private CompilerConstants(final String symbolName, final Class<?> type) {
+    CompilerConstants(final String symbolName, final Class<?> type) {
         this(symbolName, type, -1);
     }
 
-    private CompilerConstants(final String symbolName, final Class<?> type, final int slot) {
+    CompilerConstants(final String symbolName, final Class<?> type, final int slot) {
         this.symbolName = symbolName;
         this.type       = type;
         this.slot       = slot;