[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for UIDefaults

[Kaffe CVS]

PatchSet 5845 
Date: 2005/01/13 07:35:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for UIDefaults

2005-01-13  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-01-11  Michael Koch  <konqueror at gmx.de>

* javax/swing/UIDefaults.java (put): Handle value of null.

Members: 
	ChangeLog:1.3389->1.3390 
	libraries/javalib/javax/swing/UIDefaults.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3389 kaffe/ChangeLog:1.3390
--- kaffe/ChangeLog:1.3389	Thu Jan 13 07:15:01 2005
+++ kaffe/ChangeLog	Thu Jan 13 07:35:29 2005
@@ -1,6 +1,14 @@
 2005-01-13  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
+	
+	2005-01-11  Michael Koch  <konqueror at gmx.de>
+
+	* javax/swing/UIDefaults.java (put): Handle value of null.
+
+2005-01-13  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
 
 	2005-01-11  Chris Burdess  <dog at gnu.org>
 
Index: kaffe/libraries/javalib/javax/swing/UIDefaults.java
diff -u kaffe/libraries/javalib/javax/swing/UIDefaults.java:1.6 kaffe/libraries/javalib/javax/swing/UIDefaults.java:1.7
--- kaffe/libraries/javalib/javax/swing/UIDefaults.java:1.6	Wed Jan  5 17:27:37 2005
+++ kaffe/libraries/javalib/javax/swing/UIDefaults.java	Thu Jan 13 07:35:32 2005
@@ -286,7 +286,11 @@
 
   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;