[kaffe] CVS kaffe (dalibor): Small fix for FOP

Kaffe CVS cvs-commits at kaffe.org
Thu Dec 4 07:10:02 PST 2003


PatchSet 4197 
Date: 2003/12/04 15:07:14
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Small fix for FOP

2003-12-04  Dalibor Topic <robilad at kaffe.org>

        Fixed a problem in FOP 0.25.4.

        * libraries/javalib/java/text/AttributedString.java
        (addAttribute(AttributedCharacterIterator.Attribute,Object,int,int)):
        Use HashMap instead of Hashtable since value can be null, and you
        can not store a null value in a Hashtable.

Members: 
	ChangeLog:1.1788->1.1789 
	libraries/javalib/java/text/AttributedString.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1788 kaffe/ChangeLog:1.1789
--- kaffe/ChangeLog:1.1788	Thu Dec  4 03:27:47 2003
+++ kaffe/ChangeLog	Thu Dec  4 15:07:14 2003
@@ -1,5 +1,14 @@
 2003-12-04  Dalibor Topic <robilad at kaffe.org>
 
+	Fixed a problem in FOP 0.25.4.
+
+	* libraries/javalib/java/text/AttributedString.java
+	(addAttribute(AttributedCharacterIterator.Attribute,Object,int,int)):
+	Use HashMap instead of Hashtable since value can be null, and you 
+	can not store a null value in a Hashtable.
+
+2003-12-04  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/java/text/FormatCharacterIterator.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/text/AttributedString.java
diff -u kaffe/libraries/javalib/java/text/AttributedString.java:1.1 kaffe/libraries/javalib/java/text/AttributedString.java:1.2
--- kaffe/libraries/javalib/java/text/AttributedString.java:1.1	Mon Nov 11 12:01:53 2002
+++ kaffe/libraries/javalib/java/text/AttributedString.java	Thu Dec  4 15:07:16 2003
@@ -39,6 +39,7 @@
 package java.text;
 
 import java.util.Iterator;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.HashSet;
 import java.util.Map;
@@ -329,7 +330,7 @@
   * of the string.
   *
   * @param attrib The attribute to add.
-  * @param value The value of the attribute.
+  * @param value The value of the attribute, which may be null.
   * @param begin_index The beginning index of the subrange.
   * @param end_index The ending index of the subrange.
   *
@@ -342,10 +343,10 @@
   if (attrib == null)
     throw new IllegalArgumentException("null attribute");
 
-  Hashtable ht = new Hashtable();
-  ht.put(attrib, value);
+  HashMap hm = new HashMap();
+  hm.put(attrib, value);
 
-  addAttributes(ht, begin_index, end_index);
+  addAttributes(hm, begin_index, end_index);
 }
 
 /*************************************************************************/




More information about the kaffe mailing list