From 1ce9c63d502d0a3f68d71c05a9186b84664905f5 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 11 Mar 2004 15:50:34 +0000 Subject: [multiple changes] 2004-03-11 Dalibor Topic * 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 * java/text/AttributedStringIterator.java (getAllAttributesKey): Return only keys concerned by the current iterator. (getAttributes): Use strict inequality for end_index. From-SVN: r79329 --- libjava/java/text/AttributedStringIterator.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'libjava/java/text/AttributedStringIterator.java') diff --git a/libjava/java/text/AttributedStringIterator.java b/libjava/java/text/AttributedStringIterator.java index d3193382bfd..77c5981703d 100644 --- a/libjava/java/text/AttributedStringIterator.java +++ b/libjava/java/text/AttributedStringIterator.java @@ -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); } -- cgit v1.2.3