summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-03-24 12:58:47 +0000
committerRoman Kennke <roman@kennke.org>2006-03-24 12:58:47 +0000
commite5466b68ed93e3706b71d9666f0008d1ead1501f (patch)
treece229db0450fe10daba0e55b08ca2f84d89b1833
parent134d0e3aa6e9dde949c1e7f2cde8e07fccb49e2a (diff)
downloadclasspath-e5466b68ed93e3706b71d9666f0008d1ead1501f.tar.gz
2006-03-24 Roman Kennke <kennke@aicas.com>
* javax/swing/JTabbedPane.java (getSelectedComponent): Return null when no component is selected.
-rw-r--r--ChangeLog6
-rw-r--r--javax/swing/JTabbedPane.java6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 394bf71a5..8590009d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-24 Roman Kennke <kennke@aicas.com>
+
+ * javax/swing/JTabbedPane.java
+ (getSelectedComponent): Return null when no component is
+ selected.
+
2006-03-24 Mark Wielaard <mark@klomp.org>
* NEWS: Add cursor and selection improvements.
diff --git a/javax/swing/JTabbedPane.java b/javax/swing/JTabbedPane.java
index ff61dde30..a5e8fd0a7 100644
--- a/javax/swing/JTabbedPane.java
+++ b/javax/swing/JTabbedPane.java
@@ -959,7 +959,11 @@ public class JTabbedPane extends JComponent implements Serializable,
*/
public Component getSelectedComponent()
{
- return getComponentAt(getSelectedIndex());
+ int selectedIndex = getSelectedIndex();
+ Component selected = null;
+ if (selectedIndex >= 0)
+ selected = getComponentAt(selectedIndex);
+ return selected;
}
/**