aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2005-02-10 16:18:42 +0000
committerMichael Koch <konqueror@gmx.de>2005-02-10 16:18:42 +0000
commitfec10d437afd7e3fe40118cecd11809f2b8d7c81 (patch)
tree9457fa7444fc5a06336b74046890a3ba8027e6c1
parenta00c28a2f6af7a18adf99ccef016e9c6599784d7 (diff)
2005-02-10 Michael Koch <konqueror@gmx.de>
* 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
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/javax/swing/JTabbedPane.java4
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,5 +1,10 @@
2005-02-10 Michael Koch <konqueror@gmx.de>
+ * javax/swing/JTabbedPane.java
+ (Page.setDisplayedMnemonicIndex): Handle empty menmonic.
+
+2005-02-10 Michael Koch <konqueror@gmx.de>
+
* javax/swing/tree/DefaultMutableTreeNode.java:
Reworked Javadocs all over.
(getPathToRoot): Fixed direction of result array initialization.
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;