2006-01-31 Roman Kennke <kennke@aicas.com>

	* javax/swing/plaf/basic/BasicTextUI.java
	(createKeymap): Don't store KeyBindings[] as focusInputMap in
	UIManager. Added FIXME regarding the implementation of this method.

1 files changed, 6 insertions, 4 deletions

diff --git a/javax/swing/plaf/basic/BasicTextUI.java b/javax/swing/plaf/basic/BasicTextUI.java
index fc3889484..413f4c64b 100644
--- a/javax/swing/plaf/basic/BasicTextUI.java
+++ b/javax/swing/plaf/basic/BasicTextUI.java
@@ -621,6 +621,11 @@ public abstract class BasicTextUI extends TextUI
    */
   protected Keymap createKeymap()
   {
+    // FIXME: It seems to me that this method implementation is wrong. It seems
+    // to fetch the focusInputMap and transform it to the KeyBinding/Keymap
+    // implemenation. I would think that it should be done the other way,
+    // fetching the keybindings (from prefix + ".bindings") and transform
+    // it to the newer InputMap/ActionMap implementation.
     JTextComponent.KeyBinding[] bindings = null;
     String prefix = getPropertyPrefix();
     InputMapUIResource m = (InputMapUIResource) UIManager.get(prefix + ".focusInputMap");
@@ -637,10 +642,7 @@ public abstract class BasicTextUI extends TextUI
           }
       }
     if (bindings == null)
-      {
-        bindings = new JTextComponent.KeyBinding[0];
-        UIManager.put(prefix + ".focusInputMap", bindings);
-      }
+      bindings = new JTextComponent.KeyBinding[0];
 
     Keymap km = JTextComponent.addKeymap(getKeymapName(), 
                                          JTextComponent.getKeymap(JTextComponent.DEFAULT_KEYMAP));