diff options
| author | Michael Koch <konqueror@gmx.de> | 2005-01-11 13:24:19 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2005-01-11 13:24:19 +0000 |
| commit | 8f6293598e15cb1fba188682a2112d0984335d5d (patch) | |
| tree | 98cea2b966e9a0e46241d235e9aecd9ebdda55f5 | |
| parent | 151b9cd2729fa7683db577fa490a790fc821b64c (diff) | |
2005-01-11 Michael Koch <konqueror@gmx.de>
* javax/swing/UIDefaults.java (put): Handle value of null.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/java-gui-branch@93185 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/javax/swing/UIDefaults.java | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c5862f2bb3a..db04e923b70 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 2005-01-11 Michael Koch <konqueror@gmx.de> + * javax/swing/UIDefaults.java (put): Handle value of null. + +2005-01-11 Michael Koch <konqueror@gmx.de> + * java/awt/Robot.java, java/awt/Scrollbar.java, java/awt/print/PrinterJob.java, diff --git a/libjava/javax/swing/UIDefaults.java b/libjava/javax/swing/UIDefaults.java index 0bd5f7399da..6af188afecd 100644 --- a/libjava/javax/swing/UIDefaults.java +++ b/libjava/javax/swing/UIDefaults.java @@ -286,7 +286,11 @@ public class UIDefaults extends Hashtable public Object put(Object key, Object value) { - Object old = super.put(key, value); + Object old; + if (value != null) + old = super.put(key, value); + else + old = super.remove(key); if (key instanceof String && old != value) firePropertyChange((String) key, old, value); return old; |