--- old/jdk/src/jdk.jline/share/classes/jdk/internal/jline/console/KeyMap.java	2015-06-18 03:06:00.569213079 -0700
+++ new/jdk/src/jdk.jline/share/classes/jdk/internal/jline/console/KeyMap.java	2015-06-18 03:06:00.357211545 -0700
@@ -6,7 +6,7 @@
  *
  * http://www.opensource.org/licenses/bsd-license.php
  */
-package jline.console;
+package jdk.internal.jline.console;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@
  * @since 2.6
  */
 public class KeyMap {
-    
+
     public static final String VI_MOVE        = "vi-move";
     public static final String VI_INSERT      = "vi-insert";
     public static final String EMACS          = "emacs";
@@ -34,7 +34,7 @@
     private Object anotherKey = null;
     private String name;
     private boolean isViKeyMap;
-    
+
     public KeyMap(String name, boolean isViKeyMap) {
         this(name, new Object[KEYMAP_LENGTH], isViKeyMap);
     }
@@ -44,11 +44,11 @@
         this.name = name;
         this.isViKeyMap = isViKeyMap;
     }
-    
+
     public boolean isViKeyMap() {
         return isViKeyMap;
     }
-    
+
     public String getName() {
         return name;
     }
@@ -85,21 +85,21 @@
     }
 
     public void bindIfNotBound( CharSequence keySeq, Object function ) {
-        
+
         bind (this, keySeq, function, true);
     }
-    
+
     public void bind( CharSequence keySeq, Object function ) {
-        
+
         bind (this, keySeq, function, false);
     }
-    
+
     private static void bind( KeyMap map, CharSequence keySeq, Object function ) {
-        
+
         bind (map, keySeq, function, false);
     }
-    
-    private static void bind( KeyMap map, CharSequence keySeq, Object function, 
+
+    private static void bind( KeyMap map, CharSequence keySeq, Object function,
             boolean onlyIfNotBound ) {
 
         if (keySeq != null && keySeq.length() > 0) {
@@ -125,13 +125,13 @@
                         map.anotherKey = function;
                     } else {
                         Object op = map.mapping[c];
-                        if (onlyIfNotBound == false 
-                            || op == null 
-                            || op == Operation.DO_LOWERCASE_VERSION 
+                        if (onlyIfNotBound == false
+                            || op == null
+                            || op == Operation.DO_LOWERCASE_VERSION
                             || op == Operation.VI_MOVEMENT_MODE ) {
-                            
+
                         }
-                        
+
                         map.mapping[c] = function;
                     }
                 }
@@ -148,7 +148,7 @@
     }
 
     private static void bindArrowKeys(KeyMap map) {
-        
+
         // MS-DOS
         bind( map, "\033[0A", Operation.PREVIOUS_HISTORY );
         bind( map, "\033[0B", Operation.BACKWARD_CHAR );
@@ -224,27 +224,27 @@
     public static char meta( char c ) {
         return (char) (c | 0x80);
     }
-    
+
     public static Map<String, KeyMap> keyMaps() {
         Map<String, KeyMap> keyMaps = new HashMap<String, KeyMap>();
-        
+
         KeyMap emacs = emacs();
         bindArrowKeys(emacs);
         keyMaps.put(EMACS, emacs);
         keyMaps.put(EMACS_STANDARD, emacs);
         keyMaps.put(EMACS_CTLX, (KeyMap) emacs.getBound("\u0018"));
         keyMaps.put(EMACS_META, (KeyMap) emacs.getBound("\u001b"));
-        
+
         KeyMap viMov = viMovement();
         bindArrowKeys(viMov);
         keyMaps.put(VI_MOVE, viMov);
         keyMaps.put("vi-command", viMov);
-        
+
         KeyMap viIns = viInsertion();
         bindArrowKeys(viIns);
         keyMaps.put(VI_INSERT, viIns);
         keyMaps.put("vi", viIns);
-        
+
         return keyMaps;
     }
 
@@ -420,7 +420,7 @@
                         null,                               /* Control-A */
                         null,                               /* Control-B */
                         Operation.INTERRUPT,                /* Control-C */
-                        /* 
+                        /*
                          * ^D is supposed to move down half a screen. In bash
                          * appears to be ignored.
                          */
@@ -438,13 +438,13 @@
                         null,                               /* Control-O */
                         Operation.VI_PREVIOUS_HISTORY,      /* Control-P */
                         /*
-                         * My testing with readline is the ^Q is ignored. 
+                         * My testing with readline is the ^Q is ignored.
                          * Maybe this should be null?
                          */
                         Operation.QUOTED_INSERT,            /* Control-Q */
-                        
+
                         /*
-                         * TODO - Very broken.  While in forward/reverse 
+                         * TODO - Very broken.  While in forward/reverse
                          * history search the VI keyset should go out the
                          * window and we need to enter a very simple keymap.
                          */