From fec10d437afd7e3fe40118cecd11809f2b8d7c81 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 10 Feb 2005 16:18:42 +0000 Subject: 2005-02-10 Michael Koch * javax/swing/JTabbedPane.java (Page.setDisplayedMnemonicIndex): Handle empty menmonic. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/java-gui-20050128-branch@94834 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/javax/swing/JTabbedPane.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 672e9344db8..e7e779d1922 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-02-10 Michael Koch + + * javax/swing/JTabbedPane.java + (Page.setDisplayedMnemonicIndex): Handle empty menmonic. + 2005-02-10 Michael Koch * javax/swing/tree/DefaultMutableTreeNode.java: diff --git a/libjava/javax/swing/JTabbedPane.java b/libjava/javax/swing/JTabbedPane.java index 1111d5820d0..748ee214050 100644 --- a/libjava/javax/swing/JTabbedPane.java +++ b/libjava/javax/swing/JTabbedPane.java @@ -518,12 +518,12 @@ public class JTabbedPane extends JComponent implements Serializable, * or equal to title.length. */ public void setDisplayedMnemonicIndex(int index) - throws IllegalArgumentException + throws IllegalArgumentException { if (index < -1 || title != null && index >= title.length()) throw new IllegalArgumentException(); - if (title == null || title.charAt(index) != mnemonicKey) + if (title == null || mnemonicKey == 0 || title.charAt(index) != mnemonicKey) index = -1; underlinedChar = index; -- cgit v1.2.3