mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 19:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2004-03-11  Dalibor Topic  <robilad@kaffe.org>

	* 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.

2004-03-11  Guilhem Lavaux <guilhem@kaffe.org>

	* java/text/AttributedStringIterator.java
	(getAllAttributesKey): Return only keys concerned
	by the current iterator.
	(getAttributes): Use strict inequality for
	end_index.

From-SVN: r79329
This commit is contained in:
Michael Koch 2004-03-11 15:50:34 +00:00
parent c21a266bf2
commit 1ce9c63d50
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libjava/ChangeLog
View File

@ -1,3 +1,18 @@
2004-03-11 Dalibor Topic <robilad@kaffe.org>
* 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.
2004-03-11 Guilhem Lavaux <guilhem@kaffe.org>
* java/text/AttributedStringIterator.java
(getAllAttributesKey): Return only keys concerned
by the current iterator.
(getAttributes): Use strict inequality for
end_index.
2004-03-11 Michael Koch <konqueror@gmx.de>
* java/net/HttpURLConnection.java:

11
libjava/java/text/AttributedString.java
View File

@ -1,5 +1,5 @@
/* AttributedString.java -- Models text with attributes
Copyright (C) 1998, 1999 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -39,6 +39,7 @@ exception statement from your version. */
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 @@ addAttribute(AttributedCharacterIterator.Attribute attrib, Object value)
* 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 @@ addAttribute(AttributedCharacterIterator.Attribute attrib, Object value,
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);
}
/*************************************************************************/

10
libjava/java/text/AttributedStringIterator.java
View File

@ -179,8 +179,12 @@ getAllAttributeKeys()
if (attribs == null)
return(s);
for (int i = 0; i < attribs.length; i++)
for (int i = 0; i < attribs.length; i++)
{
if (attribs[i].begin_index > getEndIndex()
|| attribs[i].end_index <= getBeginIndex())
continue;
Set key_set = attribs[i].attribs.keySet();
Iterator iter = key_set.iterator();
while (iter.hasNext())
@ -327,7 +331,7 @@ getAttribute(AttributedCharacterIterator.Attribute attrib)
// Check for attribute match and range match
if (obj.equals(attrib))
if ((ci.getIndex() >= attribs[i].begin_index) &&
(ci.getIndex() <= attribs[i].end_index))
(ci.getIndex() < attribs[i].end_index))
return(attribs[i].attribs.get(obj));
}
}
@ -351,7 +355,7 @@ getAttributes()
for (int i = 0; i < attribs.length; i++)
{
if ((ci.getIndex() >= attribs[i].begin_index) &&
(ci.getIndex() <= attribs[i].end_index))
(ci.getIndex() < attribs[i].end_index))
m.putAll(attribs[i].attribs);
}