diff options
| author | Roman Kennke <roman@kennke.org> | 2005-07-14 15:15:14 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2005-07-14 15:15:14 +0000 |
| commit | cea13c1cef49e402da479c26b0ff66153495c5d3 (patch) | |
| tree | fafa743b11535ac8f24c04f3e219b31c4e7accfd | |
| parent | 0b7590e4c3af1bcc7245bbe3b6e3bb354c5e9158 (diff) | |
| download | classpath-cea13c1cef49e402da479c26b0ff66153495c5d3.tar.gz | |
2005-07-14 Roman Kennke <roman@kennke.org>
* javax/swing/AbstractButton.java
(getActionCommand): If both the actionCommand and text fields
are null, then return "".
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | javax/swing/AbstractButton.java | 8 |
2 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-07-14 Roman Kennke <roman@kennke.org> + + * javax/swing/AbstractButton.java + (getActionCommand): If both the actionCommand and text fields + are null, then return "". + 2005-07-14 Guilhem Lavaux <guilhem@kaffe.org> * java/util/logging/Logger.java @@ -38,6 +44,9 @@ 2005-07-13 Roman Kennke <roman@kennke.org> * javax/swing/BoundedRangeModel.java: +2005-07-13 Roman Kennke <roman@kennke.org> + + * javax/swing/BoundedRangeModel.java: Added/Fixed interface API documentation. * javax/swing/ButtonModel.java: Added/Fixed interface API documentation. diff --git a/javax/swing/AbstractButton.java b/javax/swing/AbstractButton.java index abafb164f..8984c633c 100644 --- a/javax/swing/AbstractButton.java +++ b/javax/swing/AbstractButton.java @@ -608,8 +608,12 @@ public abstract class AbstractButton extends JComponent public String getActionCommand() { String ac = model.getActionCommand(); - - return (ac != null ? ac : text); + if (ac != null) + return ac; + else if (text != null) + return text; + else + return ""; } /** |