diff options
author | Guilhem Lavaux <guilhem@kaffe.org> | 2006-06-08 20:19:53 +0000 |
---|---|---|
committer | Guilhem Lavaux <guilhem@kaffe.org> | 2006-06-08 20:19:53 +0000 |
commit | 2f94810a11e0e3cdeb4bed695a4bf9eb9ce41c34 (patch) | |
tree | c5e2c0011d6dd129dbdc8da0273cdaff7b1bc3f6 /javax/swing/plaf/basic/BasicRootPaneUI.java | |
parent | 56c5b96a2d3754736d13eebb73270fb8f925301d (diff) | |
download | classpath-2f94810a11e0e3cdeb4bed695a4bf9eb9ce41c34.tar.gz |
2006-06-07 Guilhem Lavaux <guilhem@kaffe.org>native_layer_merge_head_2006_06_06
* Merged HEAD as of 2006-06-06.
* native/jni/native-lib/cpproc.h
(CPIO_EXEC_NUM_PIPES): Compilation fix.
Diffstat (limited to 'javax/swing/plaf/basic/BasicRootPaneUI.java')
-rw-r--r-- | javax/swing/plaf/basic/BasicRootPaneUI.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/javax/swing/plaf/basic/BasicRootPaneUI.java b/javax/swing/plaf/basic/BasicRootPaneUI.java index 933db4c6b..e20bc2bb3 100644 --- a/javax/swing/plaf/basic/BasicRootPaneUI.java +++ b/javax/swing/plaf/basic/BasicRootPaneUI.java @@ -215,9 +215,8 @@ public class BasicRootPaneUI extends RootPaneUI JComponent.WHEN_IN_FOCUSED_WINDOW); if (newValue != null) { - Object[] keybindings = - (Object[]) UIManager.get - ("RootPane.defaultButtonWindowKeyBindings"); + Object[] keybindings = (Object[]) UIManager.get( + "RootPane.defaultButtonWindowKeyBindings"); LookAndFeel.loadKeyBindings(im, keybindings); } else |