diff options
Diffstat (limited to 'libjava/classpath/java/text')
| -rw-r--r-- | libjava/classpath/java/text/AttributedString.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/java/text/ChoiceFormat.java | 10 | ||||
| -rw-r--r-- | libjava/classpath/java/text/CollationElementIterator.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/java/text/Collator.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/text/DateFormat.java | 90 | ||||
| -rw-r--r-- | libjava/classpath/java/text/DateFormatSymbols.java | 98 | ||||
| -rw-r--r-- | libjava/classpath/java/text/DecimalFormat.java | 53 | ||||
| -rw-r--r-- | libjava/classpath/java/text/DecimalFormatSymbols.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/java/text/Format.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/text/MessageFormat.java | 8 | ||||
| -rw-r--r-- | libjava/classpath/java/text/NumberFormat.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/text/RuleBasedCollator.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/text/SimpleDateFormat.java | 30 |
13 files changed, 175 insertions, 134 deletions
diff --git a/libjava/classpath/java/text/AttributedString.java b/libjava/classpath/java/text/AttributedString.java index 6785bd3..cb338bf 100644 --- a/libjava/classpath/java/text/AttributedString.java +++ b/libjava/classpath/java/text/AttributedString.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.text; +import gnu.java.lang.CPStringBuilder; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -182,7 +184,7 @@ public class AttributedString if ((begin < 0) || (end < begin) || end > aci.getEndIndex()) throw new IllegalArgumentException("Bad index values"); - StringBuffer sb = new StringBuffer(""); + CPStringBuilder sb = new CPStringBuilder(""); // Get the valid attribute list Set allAttribs = aci.getAllAttributeKeys(); diff --git a/libjava/classpath/java/text/ChoiceFormat.java b/libjava/classpath/java/text/ChoiceFormat.java index 629701c..a552dd4 100644 --- a/libjava/classpath/java/text/ChoiceFormat.java +++ b/libjava/classpath/java/text/ChoiceFormat.java @@ -39,6 +39,8 @@ exception statement from your version. */ package java.text; +import gnu.java.lang.CPStringBuilder; + import java.util.Vector; /** @@ -98,8 +100,8 @@ public class ChoiceFormat extends NumberFormat int index = 0, max = newPattern.length(); Vector stringVec = new Vector (); Vector limitVec = new Vector (); - StringBuffer buf = new StringBuffer (); - + final CPStringBuilder buf = new CPStringBuilder (); + while (true) { // Find end of double. @@ -442,7 +444,7 @@ public class ChoiceFormat extends NumberFormat this.choiceLimits = (double[]) choiceLimits.clone(); } - private void quoteString (StringBuffer dest, String text) + private void quoteString (CPStringBuilder dest, String text) { int max = text.length(); for (int i = 0; i < max; ++i) @@ -473,7 +475,7 @@ public class ChoiceFormat extends NumberFormat */ public String toPattern () { - StringBuffer result = new StringBuffer (); + CPStringBuilder result = new CPStringBuilder (); for (int i = 0; i < choiceLimits.length; ++i) { result.append(choiceLimits[i]); diff --git a/libjava/classpath/java/text/CollationElementIterator.java b/libjava/classpath/java/text/CollationElementIterator.java index 08c5cb5..f6e0022a 100644 --- a/libjava/classpath/java/text/CollationElementIterator.java +++ b/libjava/classpath/java/text/CollationElementIterator.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.text; +import gnu.java.lang.CPStringBuilder; + import java.util.ArrayList; /* Written using "Java Class Libraries", 2nd edition, plus online @@ -416,7 +418,7 @@ public final class CollationElementIterator */ public void setText(CharacterIterator source) { - StringBuffer expand = new StringBuffer(); + CPStringBuilder expand = new CPStringBuilder(); // For now assume we read from the beginning of the string. for (char c = source.first(); diff --git a/libjava/classpath/java/text/Collator.java b/libjava/classpath/java/text/Collator.java index 16ee6b1..d6cb5ac 100644 --- a/libjava/classpath/java/text/Collator.java +++ b/libjava/classpath/java/text/Collator.java @@ -406,10 +406,12 @@ public abstract class Collator implements Comparator<Object>, Cloneable // Decompose a single character and append results to the buffer. // FIXME: for libgcj this is a native method which handles // decomposition. For Classpath, for now, it does nothing. + /* final void decomposeCharacter (char c, StringBuffer buf) { buf.append (c); } + */ /** * This is the current collation decomposition setting. diff --git a/libjava/classpath/java/text/DateFormat.java b/libjava/classpath/java/text/DateFormat.java index 53b757e..dabcb86 100644 --- a/libjava/classpath/java/text/DateFormat.java +++ b/libjava/classpath/java/text/DateFormat.java @@ -219,80 +219,6 @@ public abstract class DateFormat extends Format implements Cloneable * In the U.S. locale, this is 'z'. */ public static final int TIMEZONE_FIELD = 17; - /** - * Represents the position of the ISO year - * pattern character in the array of - * localized pattern characters. - * In the U.S. locale, this is 'Y'. - * This is a GNU extension in accordance with - * the CLDR data used. This value may - * differ from the normal year value. - */ - public static final int ISO_YEAR_FIELD = 18; - /** - * Represents the position of the localized - * day of the week pattern character in the - * array of localized pattern characters. - * In the U.S. locale, this is 'e'. - * This is a GNU extension in accordance with - * the CLDR data used. This value only - * differs from the day of the week with - * numeric formatting, in which case the - * locale's first day of the week is used. - */ - public static final int LOCALIZED_DAY_OF_WEEK_FIELD = 19; - /** - * Represents the position of the extended year - * pattern character in the array of - * localized pattern characters. - * In the U.S. locale, this is 'u'. - * This is a GNU extension in accordance with - * the CLDR data used. This value modifies - * the year value, so as to incorporate the era. - * For example, in the Gregorian calendar system, - * the extended year is negative instead of being - * marked as BC. - */ - public static final int EXTENDED_YEAR_FIELD = 20; - /** - * Represents the position of the modified Julian - * day pattern character in the array of - * localized pattern characters. - * In the U.S. locale, this is 'g'. - * This is a GNU extension in accordance with - * the CLDR data used. This value differs - * from the standard Julian day in that days - * are marked from midnight onwards rather than - * noon, and the local time zone affects the value. - * In simple terms, it can be thought of as all - * the date fields represented as a single number. - */ - public static final int MODIFIED_JULIAN_DAY_FIELD = 21; - /** - * Represents the position of the millisecond - * in the day pattern character in the array of - * localized pattern characters. - * In the U.S. locale, this is 'A'. - * This is a GNU extension in accordance with - * the CLDR data used. This value represents - * all the time fields (excluding the time zone) - * numerically, giving the number of milliseconds - * into the day (e.g. 10 in the morning would - * be 10 * 60 * 60 * 1000). Any daylight savings - * offset also affects this value. - */ - public static final int MILLISECOND_IN_DAY_FIELD = 22; - /** - * Represents the position of the RFC822 - * timezone pattern character in the array of - * localized pattern characters. - * In the U.S. locale, this is 'Z'. - * This is a GNU extension in accordance with - * the CLDR data used. The value is the offset - * of the current time from GMT e.g. -0500 would - * be five hours prior to GMT. - */ - public static final int RFC822_TIMEZONE_FIELD = 23; public static class Field extends Format.Field { @@ -336,18 +262,6 @@ public abstract class DateFormat extends Format implements Cloneable = new Field("hour0", Calendar.HOUR); public static final DateFormat.Field TIME_ZONE = new Field("timezone", Calendar.ZONE_OFFSET); - public static final DateFormat.Field ISO_YEAR - = new Field("iso year", Calendar.YEAR); - public static final DateFormat.Field LOCALIZED_DAY_OF_WEEK - = new Field("localized day of week", Calendar.DAY_OF_WEEK); - public static final DateFormat.Field EXTENDED_YEAR - = new Field("extended year", Calendar.YEAR); - public static final DateFormat.Field MODIFIED_JULIAN_DAY - = new Field("julian day", -1); - public static final DateFormat.Field MILLISECOND_IN_DAY - = new Field("millisecond in day", -1); - public static final DateFormat.Field RFC822_TIME_ZONE - = new Field("rfc822 timezone", Calendar.ZONE_OFFSET); static final DateFormat.Field[] allFields = { @@ -355,9 +269,7 @@ public abstract class DateFormat extends Format implements Cloneable HOUR_OF_DAY0, MINUTE, SECOND, MILLISECOND, DAY_OF_WEEK, DAY_OF_YEAR, DAY_OF_WEEK_IN_MONTH, WEEK_OF_YEAR, WEEK_OF_MONTH, AM_PM, HOUR1, HOUR0, - TIME_ZONE, ISO_YEAR, LOCALIZED_DAY_OF_WEEK, - EXTENDED_YEAR, MODIFIED_JULIAN_DAY, MILLISECOND_IN_DAY, - RFC822_TIME_ZONE + TIME_ZONE }; // For deserialization diff --git a/libjava/classpath/java/text/DateFormatSymbols.java b/libjava/classpath/java/text/DateFormatSymbols.java index 406376a..ed953dd0 100644 --- a/libjava/classpath/java/text/DateFormatSymbols.java +++ b/libjava/classpath/java/text/DateFormatSymbols.java @@ -40,12 +40,17 @@ package java.text; import gnu.java.locale.LocaleHelper; +import java.io.IOException; + import java.text.spi.DateFormatSymbolsProvider; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.MissingResourceException; +import java.util.Properties; import java.util.ResourceBundle; import java.util.ServiceLoader; import java.util.TimeZone; @@ -74,6 +79,27 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable String[] weekdays; /** + * The set of properties for obtaining the metazone data. + */ + private static transient final Properties properties; + + /** + * Reads in the properties. + */ + static + { + properties = new Properties(); + try + { + properties.load(DateFormatSymbols.class.getResourceAsStream("metazones.properties")); + } + catch (IOException exception) + { + System.out.println("Failed to load weeks resource: " + exception); + } + } + + /** * The timezone strings supplied by the runtime. */ private String[][] runtimeZoneStrings; @@ -109,11 +135,71 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable List<String[]> allZones = new ArrayList<String[]>(); try { - int index = 0; - String data = res.getString("zoneStrings"); - String[] zones = data.split("\u00a9"); - for (int a = 0; a < zones.length; ++a) - allZones.add(zones[a].split("\u00ae")); + Map<String,String[]> systemZones = new HashMap<String,String[]>(); + while (true) + { + int index = 0; + String country = locale.getCountry(); + String data = res.getString("zoneStrings"); + String[] zones = data.split("\u00a9"); + for (int a = 0; a < zones.length; ++a) + { + String[] strings = zones[a].split("\u00ae"); + String type = properties.getProperty(strings[0] + "." + country); + if (type == null) + type = properties.getProperty(strings[0] + ".DEFAULT"); + if (type != null) + strings[0] = type; + if (strings.length < 5) + { + String[] newStrings = new String[5]; + System.arraycopy(strings, 0, newStrings, 0, strings.length); + for (int b = strings.length; b < newStrings.length; ++b) + newStrings[b] = ""; + strings = newStrings; + } + String[] existing = systemZones.get(strings[0]); + if (existing != null && existing.length > 1) + { + for (int b = 1; b < existing.length; ++b) + if (!existing[b].equals("")) + strings[b] = existing[b]; + } + systemZones.put(strings[0], strings); + } + if (res.getLocale() == Locale.ROOT) + break; + else + res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", + LocaleHelper.getFallbackLocale(res.getLocale()), + ClassLoader.getSystemClassLoader()); + } + /* Final sanity check for missing values */ + for (String[] zstrings : systemZones.values()) + { + if (zstrings[1].equals("") && zstrings[2].equals("")) + { + for (Map.Entry<Object,Object> entry : properties.entrySet()) + { + String val = (String) entry.getValue(); + if (val.equals(zstrings[0])) + { + String key = (String) entry.getKey(); + String metazone = key.substring(0, key.indexOf(".")); + String type = properties.getProperty(metazone + "." + locale.getCountry()); + if (type == null) + type = properties.getProperty(metazone + ".DEFAULT"); + if (type != null) + { + String[] ostrings = systemZones.get(type); + zstrings[1] = ostrings[1]; + zstrings[2] = ostrings[2]; + } + } + } + } + } + allZones.addAll(systemZones.values()); } catch (MissingResourceException e) { @@ -189,9 +275,9 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable shortMonths = getStringArray(res, "shortMonths"); shortWeekdays = getStringArray(res, "shortWeekdays"); weekdays = getStringArray(res, "weekdays"); - runtimeZoneStrings = getZoneStrings(res, locale); dateFormats = formatsForKey(res, "DateFormat"); timeFormats = formatsForKey(res, "TimeFormat"); + runtimeZoneStrings = getZoneStrings(res, locale); } /** diff --git a/libjava/classpath/java/text/DecimalFormat.java b/libjava/classpath/java/text/DecimalFormat.java index 61732c1..4251744 100644 --- a/libjava/classpath/java/text/DecimalFormat.java +++ b/libjava/classpath/java/text/DecimalFormat.java @@ -43,6 +43,8 @@ exception statement from your version. */ package java.text; +import gnu.java.lang.CPStringBuilder; + import java.math.BigDecimal; import java.math.BigInteger; @@ -71,7 +73,7 @@ import java.util.Locale; * Generally, to get an instance of DecimalFormat you should call the factory * methods in the <code>NumberFormat</code> base class. * - * @author Mario Torre <neugens@limasoftware.net> + * @author Mario Torre (neugens@limasoftware.net) * @author Tom Tromey (tromey@cygnus.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) */ @@ -310,7 +312,7 @@ public class DecimalFormat extends NumberFormat * field. If used on output defines the offsets of the alignment field. * @return The String representation of this long. */ - public StringBuffer format(Object obj, StringBuffer sbuf, FieldPosition pos) + public final StringBuffer format(Object obj, StringBuffer sbuf, FieldPosition pos) { if (obj instanceof BigInteger) { @@ -588,7 +590,7 @@ public class DecimalFormat extends NumberFormat return Double.valueOf(Double.NaN); // this will be our final number - StringBuffer number = new StringBuffer(); + CPStringBuilder number = new CPStringBuilder(); // special character char minus = symbols.getMinusSign(); @@ -799,7 +801,30 @@ public class DecimalFormat extends NumberFormat */ public void setCurrency(Currency currency) { - symbols.setCurrency(currency); + Currency current = symbols.getCurrency(); + if (current != currency) + { + String oldSymbol = symbols.getCurrencySymbol(); + int len = oldSymbol.length(); + symbols.setCurrency(currency); + String newSymbol = symbols.getCurrencySymbol(); + int posPre = positivePrefix.indexOf(oldSymbol); + if (posPre != -1) + positivePrefix = positivePrefix.substring(0, posPre) + + newSymbol + positivePrefix.substring(posPre+len); + int negPre = negativePrefix.indexOf(oldSymbol); + if (negPre != -1) + negativePrefix = negativePrefix.substring(0, negPre) + + newSymbol + negativePrefix.substring(negPre+len); + int posSuf = positiveSuffix.indexOf(oldSymbol); + if (posSuf != -1) + positiveSuffix = positiveSuffix.substring(0, posSuf) + + newSymbol + positiveSuffix.substring(posSuf+len); + int negSuf = negativeSuffix.indexOf(oldSymbol); + if (negSuf != -1) + negativeSuffix = negativeSuffix.substring(0, negSuf) + + newSymbol + negativeSuffix.substring(negSuf+len); + } } /** @@ -1003,7 +1028,7 @@ public class DecimalFormat extends NumberFormat */ private String patternChars (DecimalFormatSymbols syms) { - StringBuffer buf = new StringBuffer (); + CPStringBuilder buf = new CPStringBuilder (); buf.append(syms.getDecimalSeparator()); buf.append(syms.getDigit()); @@ -1028,9 +1053,9 @@ public class DecimalFormat extends NumberFormat * @param patChars * @return A StringBuffer with special characters quoted. */ - private StringBuffer quoteFix(String text, String patChars) + private CPStringBuilder quoteFix(String text, String patChars) { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); int len = text.length(); char ch; @@ -1058,7 +1083,7 @@ public class DecimalFormat extends NumberFormat */ private String computePattern(DecimalFormatSymbols symbols) { - StringBuffer mainPattern = new StringBuffer(); + StringBuilder mainPattern = new StringBuilder(); // We have to at least emit a zero for the minimum number of // digits. Past that we need hash marks up to the grouping @@ -1225,7 +1250,7 @@ public class DecimalFormat extends NumberFormat private int scanFix(String pattern, DecimalFormatSymbols sourceSymbols, int start, boolean prefix) { - StringBuffer buffer = new StringBuffer(); + CPStringBuilder buffer = new CPStringBuilder(); // the number portion is always delimited by one of those // characters @@ -1296,7 +1321,7 @@ public class DecimalFormat extends NumberFormat currencySymbol = this.symbols.getCurrencySymbol(); // if \u00A4 is doubled, we use the international currency symbol - if (i < len && pattern.charAt(i + 1) == '\u00A4') + if ((i + 1) < len && pattern.charAt(i + 1) == '\u00A4') { currencySymbol = this.symbols.getInternationalCurrencySymbol(); i++; @@ -1320,7 +1345,7 @@ public class DecimalFormat extends NumberFormat else if (ch == '\'') { // QUOTE - if (i < len && pattern.charAt(i + 1) == '\'') + if ((i + 1) < len && pattern.charAt(i + 1) == '\'') { // we need to add ' to the buffer buffer.append(ch); @@ -1599,7 +1624,7 @@ public class DecimalFormat extends NumberFormat DecimalFormatSymbols sourceSymbols, int start) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); // the number portion is always delimited by one of those // characters @@ -1692,7 +1717,7 @@ public class DecimalFormat extends NumberFormat else if (ch == '\'') { // QUOTE - if (i < len && pattern.charAt(i + 1) == '\'') + if ((i + 1) < len && pattern.charAt(i + 1) == '\'') { // we need to add ' to the buffer buffer.append(ch); @@ -2180,7 +2205,7 @@ public class DecimalFormat extends NumberFormat else { char zero = symbols.getZeroDigit(); - StringBuffer _result = new StringBuffer(src); + CPStringBuilder _result = new CPStringBuilder(src); for (int i = len; i < minimumDigits; i++) { _result.append(zero); diff --git a/libjava/classpath/java/text/DecimalFormatSymbols.java b/libjava/classpath/java/text/DecimalFormatSymbols.java index f87ebbf..b7edf39 100644 --- a/libjava/classpath/java/text/DecimalFormatSymbols.java +++ b/libjava/classpath/java/text/DecimalFormatSymbols.java @@ -170,6 +170,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { res = null; } + locale = loc; currency = Currency.getInstance("XXX"); currencySymbol = "?"; intlCurrencySymbol = "XXX"; @@ -204,7 +205,6 @@ public class DecimalFormatSymbols implements Cloneable, Serializable percent = safeGetChar (res, "percent", '%'); perMill = safeGetChar (res, "perMill", '\u2030'); zeroDigit = safeGetChar (res, "zeroDigit", '0'); - locale = loc; } /** @@ -430,7 +430,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable public void setCurrency (Currency currency) { intlCurrencySymbol = currency.getCurrencyCode(); - currencySymbol = currency.getSymbol(); + currencySymbol = currency.getSymbol(locale); this.currency = currency; } diff --git a/libjava/classpath/java/text/Format.java b/libjava/classpath/java/text/Format.java index 38fda34..7159f46 100644 --- a/libjava/classpath/java/text/Format.java +++ b/libjava/classpath/java/text/Format.java @@ -81,7 +81,7 @@ public abstract class Format implements Serializable, Cloneable * It performs no actions, but acts as a default constructor for * subclasses. */ - public Format () + protected Format () { } diff --git a/libjava/classpath/java/text/MessageFormat.java b/libjava/classpath/java/text/MessageFormat.java index 5a595f5..c5579bf 100644 --- a/libjava/classpath/java/text/MessageFormat.java +++ b/libjava/classpath/java/text/MessageFormat.java @@ -194,7 +194,7 @@ public class MessageFormat extends Format // Helper that returns the text up to the next format opener. The // text is put into BUFFER. Returns index of character after end of // string. Throws IllegalArgumentException on error. - private static int scanString(String pat, int index, StringBuffer buffer) + private static int scanString(String pat, int index, StringBuilder buffer) { int max = pat.length(); buffer.setLength(0); @@ -234,7 +234,7 @@ public class MessageFormat extends Format // This helper retrieves a single part of a format element. Returns // the index of the terminating character. private static int scanFormatElement(String pat, int index, - StringBuffer buffer, char term) + StringBuilder buffer, char term) { int max = pat.length(); buffer.setLength(0); @@ -281,7 +281,7 @@ public class MessageFormat extends Format // This is used to parse a format element and whatever non-format // text might trail it. - private static int scanFormat(String pat, int index, StringBuffer buffer, + private static int scanFormat(String pat, int index, StringBuilder buffer, Vector elts, Locale locale) { MessageFormatElement mfe = new MessageFormatElement (); @@ -342,7 +342,7 @@ public class MessageFormat extends Format { pattern = newPattern; - StringBuffer tempBuffer = new StringBuffer (); + StringBuilder tempBuffer = new StringBuilder (); int index = scanString (newPattern, 0, tempBuffer); leader = tempBuffer.toString(); diff --git a/libjava/classpath/java/text/NumberFormat.java b/libjava/classpath/java/text/NumberFormat.java index 4a72f44..0a436d0 100644 --- a/libjava/classpath/java/text/NumberFormat.java +++ b/libjava/classpath/java/text/NumberFormat.java @@ -653,7 +653,7 @@ public abstract class NumberFormat extends Format implements Cloneable /** * This is a default constructor for use by subclasses. */ - public NumberFormat () + protected NumberFormat () { } diff --git a/libjava/classpath/java/text/RuleBasedCollator.java b/libjava/classpath/java/text/RuleBasedCollator.java index 7ec18dc..fdd1446 100644 --- a/libjava/classpath/java/text/RuleBasedCollator.java +++ b/libjava/classpath/java/text/RuleBasedCollator.java @@ -404,7 +404,7 @@ public class RuleBasedCollator extends Collator { boolean ignoreChars = (base_offset == 0); int operator = -1; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean doubleQuote = false; boolean eatingChars = false; boolean nextIsModifier = false; diff --git a/libjava/classpath/java/text/SimpleDateFormat.java b/libjava/classpath/java/text/SimpleDateFormat.java index 934fb42..4dcda4f 100644 --- a/libjava/classpath/java/text/SimpleDateFormat.java +++ b/libjava/classpath/java/text/SimpleDateFormat.java @@ -40,6 +40,8 @@ exception statement from your version. */ package java.text; +import gnu.java.lang.CPStringBuilder; + import gnu.java.text.AttributedFormatBuffer; import gnu.java.text.FormatBuffer; import gnu.java.text.FormatCharacterIterator; @@ -61,6 +63,8 @@ import java.util.regex.Pattern; /** * SimpleDateFormat provides convenient methods for parsing and formatting * dates using Gregorian calendars (see java.util.GregorianCalendar). + * This class is not thread-safe; external synchronisation should be applied + * if an instance is to be accessed from multiple threads. */ public class SimpleDateFormat extends DateFormat { @@ -139,9 +143,9 @@ public class SimpleDateFormat extends DateFormat */ public String toString() { - StringBuilder builder; + CPStringBuilder builder; - builder = new StringBuilder(getClass().getName()); + builder = new CPStringBuilder(getClass().getName()); builder.append("[field="); builder.append(field); builder.append(", size="); @@ -231,10 +235,16 @@ public class SimpleDateFormat extends DateFormat */ private static final long serialVersionUID = 4774881970558875024L; - // This string is specified in the root of the CLDR. We set it here - // rather than doing a DateFormatSymbols(Locale.US).getLocalPatternChars() - // since someone could theoretically change those values (though unlikely). - private static final String standardChars = "GyMdkHmsSEDFwWahKzYeugAZ"; + // This string is specified in the Java class libraries. + private static final String standardChars = "GyMdkHmsSEDFwWahKzZ"; + + /** + * Represents the position of the RFC822 timezone pattern character + * in the array of localized pattern characters. In the + * U.S. locale, this is 'Z'. The value is the offset of the current + * time from GMT e.g. -0500 would be five hours prior to GMT. + */ + private static final int RFC822_TIMEZONE_FIELD = 18; /** * Reads the serialized version of this object. @@ -322,7 +332,7 @@ public class SimpleDateFormat extends DateFormat // Look for the terminating quote. However, if we // see a '', that represents a literal quote and // we must iterate. - StringBuilder buf = new StringBuilder(); + CPStringBuilder buf = new CPStringBuilder(); int oldPos = i + 1; do { @@ -372,7 +382,7 @@ public class SimpleDateFormat extends DateFormat */ public String toString() { - StringBuilder output = new StringBuilder(getClass().getName()); + CPStringBuilder output = new CPStringBuilder(getClass().getName()); output.append("[tokens="); output.append(tokens); output.append(", formatData="); @@ -554,7 +564,7 @@ public class SimpleDateFormat extends DateFormat String oldChars, String newChars) { int len = pattern.length(); - StringBuilder buf = new StringBuilder(len); + CPStringBuilder buf = new CPStringBuilder(len); boolean quoted = false; for (int i = 0; i < len; i++) { @@ -802,7 +812,7 @@ public class SimpleDateFormat extends DateFormat buffer.append (zoneID); break; case RFC822_TIMEZONE_FIELD: - buffer.setDefaultAttribute(DateFormat.Field.RFC822_TIME_ZONE); + buffer.setDefaultAttribute(DateFormat.Field.TIME_ZONE); int pureMinutes = (calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET)) / (1000 * 60); String sign = (pureMinutes < 0) ? "-" : "+"; |