(original) (raw)

--- webrev.01/jdk.patch 2011-12-02 13:41:42.924019685 -0500 +++ webrev.02/jdk.patch 2011-12-05 15:12:57.725375302 -0500 @@ -1,5 +1,5 @@ ---- old/src/share/classes/java/text/AttributedCharacterIterator.java 2011-12-02 13:41:37.638094825 -0500 -+++ new/src/share/classes/java/text/AttributedCharacterIterator.java 2011-12-02 13:41:37.534096303 -0500 +--- old/src/share/classes/java/text/AttributedCharacterIterator.java 2011-12-05 15:12:52.317454507 -0500 ++++ new/src/share/classes/java/text/AttributedCharacterIterator.java 2011-12-05 15:12:52.210456074 -0500 @@ -97,7 +97,7 @@ private String name; @@ -18,8 +18,8 @@ if (instance != null) { return instance; } else { ---- old/src/share/classes/java/text/AttributedString.java 2011-12-02 13:41:37.953090347 -0500 -+++ new/src/share/classes/java/text/AttributedString.java 2011-12-02 13:41:37.845091883 -0500 +--- old/src/share/classes/java/text/AttributedString.java 2011-12-05 15:12:52.652449601 -0500 ++++ new/src/share/classes/java/text/AttributedString.java 2011-12-05 15:12:52.547451139 -0500 @@ -61,8 +61,8 @@ int runArraySize; // current size of the arrays int runCount; // actual number of runs, <= runArraySize @@ -49,18 +49,7 @@ if (mapsDiffer(last, attrs)) { setAttributes(attrs, index - start + offset); -@@ -139,8 +139,8 @@ - * and the attributes parameter is not an empty Map (attributes - * cannot be applied to a 0-length range). - */ -- public AttributedString(String text, -- Map attributes) -+ public AttributedString(String text, -+ Map<k, v=""> attributes) - { - if (text == null || attributes == null) { - throw new NullPointerException(); -@@ -156,13 +156,13 @@ +@@ -156,13 +156,22 @@ int attributeCount = attributes.size(); if (attributeCount > 0) { createRunAttributeDataVectors(); @@ -70,15 +59,23 @@ + Vector</k,>