--- old/jdk/src/jdk.jline/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java	2015-06-18 03:06:12.937302538 -0700
+++ new/jdk/src/jdk.jline/share/classes/jdk/internal/jline/console/internal/ConsoleRunner.java	2015-06-18 03:06:12.768301317 -0700
@@ -6,13 +6,13 @@
  *
  * http://www.opensource.org/licenses/bsd-license.php
  */
-package jline.console.internal;
- 
-import jline.console.ConsoleReader;
-import jline.console.completer.ArgumentCompleter;
-import jline.console.completer.Completer;
-import jline.console.history.FileHistory;
-import jline.internal.Configuration;
+package jdk.internal.jline.console.internal;
+
+import jdk.internal.jline.console.ConsoleReader;
+import jdk.internal.jline.console.completer.ArgumentCompleter;
+import jdk.internal.jline.console.completer.Completer;
+import jdk.internal.jline.console.history.FileHistory;
+import jdk.internal.jline.internal.Configuration;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -37,17 +37,17 @@
     // FIXME: This is really ugly... re-write this
 
     public static void main(final String[] args) throws Exception {
-        List<String> argList = new ArrayList(Arrays.asList(args));
+        List<String> argList = new ArrayList<String>(Arrays.asList(args));
         if (argList.size() == 0) {
             usage();
             return;
         }
- 
+
         String historyFileName = System.getProperty(ConsoleRunner.property, null);
- 
+
         String mainClass = argList.remove(0);
         ConsoleReader reader = new ConsoleReader();
- 
+
         if (historyFileName != null) {
             reader.setHistory(new FileHistory(new File(Configuration.getUserHome(),
                 String.format(".jline-%s.%s.history", mainClass, historyFileName))));
@@ -56,24 +56,24 @@
             reader.setHistory(new FileHistory(new File(Configuration.getUserHome(),
                 String.format(".jline-%s.history", mainClass))));
         }
- 
+
         String completors = System.getProperty(ConsoleRunner.class.getName() + ".completers", "");
         List<Completer> completorList = new ArrayList<Completer>();
- 
+
         for (StringTokenizer tok = new StringTokenizer(completors, ","); tok.hasMoreTokens();) {
             Object obj = Class.forName(tok.nextToken()).newInstance();
             completorList.add((Completer) obj);
         }
- 
+
         if (completorList.size() > 0) {
             reader.addCompleter(new ArgumentCompleter(completorList));
         }
- 
+
         ConsoleReaderInputStream.setIn(reader);
- 
+
         try {
-            Class type = Class.forName(mainClass);
-            Method method = type.getMethod("main", new Class[]{String[].class});
+            Class<?> type = Class.forName(mainClass);
+            Method method = type.getMethod("main", String[].class);
             method.invoke(null);
         }
         finally {
@@ -81,7 +81,7 @@
             ConsoleReaderInputStream.restoreIn();
         }
     }
- 
+
     private static void usage() {
         System.out.println("Usage: \n   java " + "[-Djline.history='name'] "
             + ConsoleRunner.class.getName()