[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing text fixes

[Kaffe CVS]

PatchSet 5737 
Date: 2005/04/22 23:28:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: swing text fixes

2005-04-22  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath:

        2005-04-17  Roman Kennke  <roman at kennke.org>

        * javax/swing/text/SimpleAttributeSet.java
        (addAttribute): Removed null pointer check.
        * javax/swing/text/StyleContext.java
        (NamedStyle.setResolveParent): Added null pointer check.

Members: 
	ChangeLog:1.3905->1.3906 
	libraries/javalib/javax/swing/text/SimpleAttributeSet.java:1.6->1.7 
	libraries/javalib/javax/swing/text/StyleContext.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3905 kaffe/ChangeLog:1.3906
--- kaffe/ChangeLog:1.3905	Fri Apr 22 23:24:59 2005
+++ kaffe/ChangeLog	Fri Apr 22 23:28:18 2005
@@ -4,6 +4,17 @@
 
 	2005-04-17  Roman Kennke  <roman at kennke.org>
 
+        * javax/swing/text/SimpleAttributeSet.java
+        (addAttribute): Removed null pointer check.
+        * javax/swing/text/StyleContext.java
+        (NamedStyle.setResolveParent): Added null pointer check.
+
+2005-04-22  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath:
+
+	2005-04-17  Roman Kennke  <roman at kennke.org>
+
         * javax/swing/UIManager.java:
         Make the UIManager respect the swing.defaultlaf system
         property.
Index: kaffe/libraries/javalib/javax/swing/text/SimpleAttributeSet.java
diff -u kaffe/libraries/javalib/javax/swing/text/SimpleAttributeSet.java:1.6 kaffe/libraries/javalib/javax/swing/text/SimpleAttributeSet.java:1.7
--- kaffe/libraries/javalib/javax/swing/text/SimpleAttributeSet.java:1.6	Fri Apr 22 23:23:31 2005
+++ kaffe/libraries/javalib/javax/swing/text/SimpleAttributeSet.java	Fri Apr 22 23:28:21 2005
@@ -63,10 +63,7 @@
 
   public void addAttribute(Object name, Object value)
   {
-    if (value == null)
-      tab.remove(name);
-    else
-      tab.put(name, value);
+    tab.put(name, value);
   }
 
   public void addAttributes(AttributeSet attributes)
Index: kaffe/libraries/javalib/javax/swing/text/StyleContext.java
diff -u kaffe/libraries/javalib/javax/swing/text/StyleContext.java:1.2 kaffe/libraries/javalib/javax/swing/text/StyleContext.java:1.3
--- kaffe/libraries/javalib/javax/swing/text/StyleContext.java:1.2	Sun Oct 24 13:39:22 2004
+++ kaffe/libraries/javalib/javax/swing/text/StyleContext.java	Fri Apr 22 23:28:22 2005
@@ -203,7 +203,11 @@
 
     public void setResolveParent(AttributeSet parent)
     {
-      attributes = StyleContext.this.addAttribute(attributes, ResolveAttribute, parent);
+      if (parent != null)
+        {
+          attributes = StyleContext.this.addAttribute
+            (attributes, ResolveAttribute, parent);
+        }
       fireStateChanged();
     }