--- old/src/java.base/share/classes/java/util/Formatter.java 2015-08-07 21:15:01.990584787 +0400 +++ new/src/java.base/share/classes/java/util/Formatter.java 2015-08-07 21:15:01.782584796 +0400 @@ -267,7 +267,7 @@ * {@link Date} and {@link TemporalAccessor TemporalAccessor} * *
  • Percent - produces a literal {@code '%'} - * ('\u0025') + * ('\u0025') * *
  • Line Separator - produces the platform-specific line separator * @@ -356,7 +356,7 @@ * * {@code '%'} * percent - * The result is a literal {@code '%'} ('\u0025') + * The result is a literal {@code '%'} ('\u0025') * * {@code 'n'} * line separator @@ -644,7 +644,7 @@ * "{@code 1$}", the second by "{@code 2$}", etc. * *

    Another way to reference arguments by position is to use the - * {@code '<'} ('\u003c') flag, which causes the argument for + * {@code '<'} ('\u003c') flag, which causes the argument for * the previous format specifier to be re-used. For example, the following two * statements would produce identical strings: * @@ -701,7 +701,7 @@ * * *
    {@code 'b'} - * '\u0062' + * '\u0062' * Produces either "{@code true}" or "{@code false}" as returned by * {@link Boolean#toString(boolean)}. * @@ -715,11 +715,11 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'B'} - * '\u0042' + * '\u0042' * The upper-case variant of {@code 'b'}. * *
    {@code 'h'} - * '\u0068' + * '\u0068' * Produces a string representing the hash code value of the object. * *

    If the argument, arg is {@code null}, then the @@ -730,11 +730,11 @@ * FormatFlagsConversionMismatchException} will be thrown. * *

    {@code 'H'} - * '\u0048' + * '\u0048' * The upper-case variant of {@code 'h'}. * *
    {@code 's'} - * '\u0073' + * '\u0073' * Produces a string. * *

    If the argument is {@code null}, then the result is @@ -748,7 +748,7 @@ * will be thrown. * *

    {@code 'S'} - * '\u0053' + * '\u0053' * The upper-case variant of {@code 's'}. * *
    @@ -758,15 +758,15 @@ * * *
    {@code '-'} - * '\u002d' - * Left justifies the output. Spaces ('\u0020') will be + * '\u002d' + * Left justifies the output. Spaces ('\u0020') will be * added at the end of the converted value as required to fill the minimum * width of the field. If the width is not provided, then a {@link * MissingFormatWidthException} will be thrown. If this flag is not given * then the output will be right-justified. * *
    {@code '#'} - * '\u0023' + * '\u0023' * Requires the output use an alternate form. The definition of the * form is specified by the conversion. * @@ -775,7 +775,7 @@ *

    The width is the minimum number of characters to * be written to the * output. If the length of the converted value is less than the width then - * the output will be padded by '  ' ('\u0020') + * the output will be padded by '  ' ('\u0020') * until the total number of characters equals the width. The padding is on * the left by default. If the {@code '-'} flag is given, then the padding * will be on the right. If the width is not specified then there is no @@ -799,7 +799,7 @@ * * *
    {@code 'c'} - * '\u0063' + * '\u0063' * Formats the argument as a Unicode character as described in Unicode Character * Representation. This may be more than one 16-bit {@code char} in @@ -809,7 +809,7 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'C'} - * '\u0043' + * '\u0043' * The upper-case variant of {@code 'c'}. * *
    @@ -859,7 +859,7 @@ * java.text.DecimalFormatSymbols#getDecimalSeparator decimal separator} is * substituted. * - *

  • If the {@code ','} ('\u002c') + *
  • If the {@code ','} ('\u002c') * flag is given, then the locale-specific {@linkplain * java.text.DecimalFormatSymbols#getGroupingSeparator grouping separator} is * inserted by scanning the integer part of the string from least significant @@ -873,15 +873,15 @@ * the length of the string is equal to the requested field width. * *
  • If the value is negative and the {@code '('} flag is given, then a - * {@code '('} ('\u0028') is prepended and a {@code ')'} - * ('\u0029') is appended. + * {@code '('} ('\u0028') is prepended and a {@code ')'} + * ('\u0029') is appended. * *
  • If the value is negative (or floating-point negative zero) and - * {@code '('} flag is not given, then a {@code '-'} ('\u002d') + * {@code '('} flag is not given, then a {@code '-'} ('\u002d') * is prepended. * *
  • If the {@code '+'} flag is given and the value is positive or zero (or - * floating-point positive zero), then a {@code '+'} ('\u002b') + * floating-point positive zero), then a {@code '+'} ('\u002b') * will be prepended. * * @@ -900,7 +900,7 @@ * * *
    {@code 'd'} - * '\u0064' + * '\u0064' * Formats the argument as a decimal integer. The localization algorithm is applied. * @@ -911,7 +911,7 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'o'} - * '\u006f' + * '\u006f' * Formats the argument as an integer in base eight. No localization * is applied. * @@ -933,7 +933,7 @@ * thrown. * *
    {@code 'x'} - * '\u0078' + * '\u0078' * Formats the argument as an integer in base sixteen. No * localization is applied. * @@ -951,17 +951,17 @@ * the field width with leading zeros after the radix indicator or sign (if * present). * - *

    If {@code '('}, '  ', {@code '+'}, or + *

    If {@code '('}, '  ', {@code '+'}, or * {@code ','} flags are given then a {@link * FormatFlagsConversionMismatchException} will be thrown. * *

    {@code 'X'} - * '\u0058' + * '\u0058' * The upper-case variant of {@code 'x'}. The entire string * representing the number will be converted to {@linkplain * String#toUpperCase upper case} including the {@code 'x'} (if any) and * all hexadecimal digits {@code 'a'} - {@code 'f'} - * ('\u0061' - '\u0066'). + * ('\u0061' - '\u0066'). * *
    * @@ -980,24 +980,24 @@ * * *
    {@code '+'} - * '\u002b' + * '\u002b' * Requires the output to include a positive sign for all positive * numbers. If this flag is not given then only negative values will * include a sign. * - *

    If both the {@code '+'} and '  ' flags are given + *

    If both the {@code '+'} and '  ' flags are given * then an {@link IllegalFormatFlagsException} will be thrown. * - *

    '  ' - * '\u0020' + *
    '  ' + * '\u0020' * Requires the output to include a single extra space - * ('\u0020') for non-negative values. + * ('\u0020') for non-negative values. * - *

    If both the {@code '+'} and '  ' flags are given + *

    If both the {@code '+'} and '  ' flags are given * then an {@link IllegalFormatFlagsException} will be thrown. * *

    {@code '0'} - * '\u0030' + * '\u0030' * Requires the output to be padded with leading {@linkplain * java.text.DecimalFormatSymbols#getZeroDigit zeros} to the minimum field * width following any sign or radix indicator except when converting NaN @@ -1008,17 +1008,17 @@ * {@link IllegalFormatFlagsException} will be thrown. * *
    {@code ','} - * '\u002c' + * '\u002c' * Requires the output to include the locale-specific {@linkplain * java.text.DecimalFormatSymbols#getGroupingSeparator group separators} as * described in the "group" section of the * localization algorithm. * *
    {@code '('} - * '\u0028' + * '\u0028' * Requires the output to prepend a {@code '('} - * ('\u0028') and append a {@code ')'} - * ('\u0029') to negative values. + * ('\u0028') and append a {@code ')'} + * ('\u0029') to negative values. * *
    * @@ -1029,7 +1029,7 @@ * *
  • The output is right-justified within the {@code width} * - *
  • Negative numbers begin with a {@code '-'} ('\u002d') + *
  • Negative numbers begin with a {@code '-'} ('\u002d') * *
  • Positive numbers and zero do not include a sign or extra leading * space @@ -1042,7 +1042,7 @@ * be written to the output. This includes any signs, digits, grouping * separators, radix indicator, and parentheses. If the length of the * converted value is less than the width then the output will be padded by - * spaces ('\u0020') until the total number of characters equals + * spaces ('\u0020') until the total number of characters equals * width. The padding is on the left by default. If {@code '-'} flag is * given then the padding will be on the right. If width is not specified then * there is no minimum. @@ -1058,7 +1058,7 @@ * * *
    {@code 'd'} - * '\u0064' + * '\u0064' * Requires the output to be formatted as a decimal integer. The localization algorithm is applied. * @@ -1066,18 +1066,18 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'o'} - * '\u006f' + * '\u006f' * Requires the output to be formatted as an integer in base eight. * No localization is applied. * *

    If x is negative then the result will be a signed value - * beginning with {@code '-'} ('\u002d'). Signed output is + * beginning with {@code '-'} ('\u002d'). Signed output is * allowed for this type because unlike the primitive types it is not * possible to create an unsigned equivalent without assuming an explicit * data-type size. * *

    If x is positive or zero and the {@code '+'} flag is given - * then the result will begin with {@code '+'} ('\u002b'). + * then the result will begin with {@code '+'} ('\u002b'). * *

    If the {@code '#'} flag is given then the output will always begin * with {@code '0'} prefix. @@ -1089,18 +1089,18 @@ * FormatFlagsConversionMismatchException} will be thrown. * *

    {@code 'x'} - * '\u0078' + * '\u0078' * Requires the output to be formatted as an integer in base * sixteen. No localization is applied. * *

    If x is negative then the result will be a signed value - * beginning with {@code '-'} ('\u002d'). Signed output is + * beginning with {@code '-'} ('\u002d'). Signed output is * allowed for this type because unlike the primitive types it is not * possible to create an unsigned equivalent without assuming an explicit * data-type size. * *

    If x is positive or zero and the {@code '+'} flag is given - * then the result will begin with {@code '+'} ('\u002b'). + * then the result will begin with {@code '+'} ('\u002b'). * *

    If the {@code '#'} flag is given then the output will always begin * with the radix indicator {@code "0x"}. @@ -1113,12 +1113,12 @@ * FormatFlagsConversionMismatchException} will be thrown. * *

    {@code 'X'} - * '\u0058' + * '\u0058' * The upper-case variant of {@code 'x'}. The entire string * representing the number will be converted to {@linkplain * String#toUpperCase upper case} including the {@code 'x'} (if any) and * all hexadecimal digits {@code 'a'} - {@code 'f'} - * ('\u0061' - '\u0066'). + * ('\u0061' - '\u0066'). * *
    * @@ -1152,7 +1152,7 @@ * * *
    {@code 'e'} - * '\u0065' + * '\u0065' * Requires the output to be formatted using computerized scientific notation. The localization algorithm is applied. @@ -1179,7 +1179,7 @@ * integer part of a, as a single decimal digit, followed by the * decimal separator followed by decimal digits representing the fractional * part of a, followed by the exponent symbol {@code 'e'} - * ('\u0065'), followed by the sign of the exponent, followed + * ('\u0065'), followed by the sign of the exponent, followed * by a representation of n as a decimal integer, as produced by the * method {@link Long#toString(long, int)}, and zero-padded to include at * least two digits. @@ -1200,12 +1200,12 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'E'} - * '\u0045' + * '\u0045' * The upper-case variant of {@code 'e'}. The exponent symbol - * will be {@code 'E'} ('\u0045'). + * will be {@code 'E'} ('\u0045'). * *
    {@code 'g'} - * '\u0067' + * '\u0067' * Requires the output to be formatted in general scientific notation * as described below. The localization * algorithm is applied. @@ -1230,11 +1230,11 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'G'} - * '\u0047' + * '\u0047' * The upper-case variant of {@code 'g'}. * *
    {@code 'f'} - * '\u0066' + * '\u0066' * Requires the output to be formatted using decimal * format. The localization algorithm is * applied. @@ -1266,7 +1266,7 @@ * appropriate. * *
    {@code 'a'} - * '\u0061' + * '\u0061' * Requires the output to be formatted in hexadecimal exponential * form. No localization is applied. * @@ -1274,11 +1274,11 @@ * (absolute value) of the argument x. * *

    If x is negative or a negative-zero value then the result - * will begin with {@code '-'} ('\u002d'). + * will begin with {@code '-'} ('\u002d'). * *

    If x is positive or a positive-zero value and the * {@code '+'} flag is given then the result will begin with {@code '+'} - * ('\u002b'). + * ('\u002b'). * *

    The formatting of the magnitude m depends upon its value. * @@ -1295,7 +1295,7 @@ * exponent fields. The significand is represented by the characters * {@code "0x1."} followed by the hexadecimal representation of the rest * of the significand as a fraction. The exponent is represented by - * {@code 'p'} ('\u0070') followed by a decimal string of the + * {@code 'p'} ('\u0070') followed by a decimal string of the * unbiased exponent as if produced by invoking {@link * Integer#toString(int) Integer.toString} on the exponent value. If the * precision is specified, the value is rounded to the given number of @@ -1319,12 +1319,12 @@ * FormatFlagsConversionMismatchException} will be thrown. * *

    {@code 'A'} - * '\u0041' + * '\u0041' * The upper-case variant of {@code 'a'}. The entire string * representing the number will be converted to upper case including the - * {@code 'x'} ('\u0078') and {@code 'p'} - * ('\u0070' and all hexadecimal digits {@code 'a'} - - * {@code 'f'} ('\u0061' - '\u0066'). + * {@code 'x'} ('\u0078') and {@code 'p'} + * ('\u0070' and all hexadecimal digits {@code 'a'} - + * {@code 'f'} ('\u0061' - '\u0066'). * *
    * @@ -1357,7 +1357,7 @@ * separators, decimal separators, exponential symbol, radix indicator, * parentheses, and strings representing infinity and NaN as applicable. If * the length of the converted value is less than the width then the output - * will be padded by spaces ('\u0020') until the total number of + * will be padded by spaces ('\u0020') until the total number of * characters equals width. The padding is on the left by default. If the * {@code '-'} flag is given then the padding will be on the right. If width * is not specified then there is no minimum. @@ -1386,7 +1386,7 @@ * * *
    {@code 'e'} - * '\u0065' + * '\u0065' * Requires the output to be formatted using computerized scientific notation. The localization algorithm is applied. @@ -1409,7 +1409,7 @@ * integer part of a, as a single decimal digit, followed by the * decimal separator followed by decimal digits representing the fractional * part of a, followed by the exponent symbol {@code 'e'} - * ('\u0065'), followed by the sign of the exponent, followed + * ('\u0065'), followed by the sign of the exponent, followed * by a representation of n as a decimal integer, as produced by the * method {@link Long#toString(long, int)}, and zero-padded to include at * least two digits. @@ -1428,12 +1428,12 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'E'} - * '\u0045' + * '\u0045' * The upper-case variant of {@code 'e'}. The exponent symbol - * will be {@code 'E'} ('\u0045'). + * will be {@code 'E'} ('\u0045'). * *
    {@code 'g'} - * '\u0067' + * '\u0067' * Requires the output to be formatted in general scientific notation * as described below. The localization * algorithm is applied. @@ -1458,11 +1458,11 @@ * FormatFlagsConversionMismatchException} will be thrown. * *
    {@code 'G'} - * '\u0047' + * '\u0047' * The upper-case variant of {@code 'g'}. * *
    {@code 'f'} - * '\u0066' + * '\u0066' * Requires the output to be formatted using decimal * format. The localization algorithm is * applied. @@ -1510,10 +1510,10 @@ * * *
    {@code 't'} - * '\u0074' + * '\u0074' * Prefix for date and time conversion characters. *
    {@code 'T'} - * '\u0054' + * '\u0054' * The upper-case variant of {@code 't'}. * *
    @@ -1530,52 +1530,52 @@ * * *
    {@code 'H'} - * '\u0048' + * '\u0048' * Hour of the day for the 24-hour clock, formatted as two digits with * a leading zero as necessary i.e. {@code 00 - 23}. {@code 00} * corresponds to midnight. * *
    {@code 'I'} - * '\u0049' + * '\u0049' * Hour for the 12-hour clock, formatted as two digits with a leading * zero as necessary, i.e. {@code 01 - 12}. {@code 01} corresponds to * one o'clock (either morning or afternoon). * *
    {@code 'k'} - * '\u006b' + * '\u006b' * Hour of the day for the 24-hour clock, i.e. {@code 0 - 23}. * {@code 0} corresponds to midnight. * *
    {@code 'l'} - * '\u006c' + * '\u006c' * Hour for the 12-hour clock, i.e. {@code 1 - 12}. {@code 1} * corresponds to one o'clock (either morning or afternoon). * *
    {@code 'M'} - * '\u004d' + * '\u004d' * Minute within the hour formatted as two digits with a leading zero * as necessary, i.e. {@code 00 - 59}. * *
    {@code 'S'} - * '\u0053' + * '\u0053' * Seconds within the minute, formatted as two digits with a leading * zero as necessary, i.e. {@code 00 - 60} ("{@code 60}" is a special * value required to support leap seconds). * *
    {@code 'L'} - * '\u004c' + * '\u004c' * Millisecond within the second formatted as three digits with * leading zeros as necessary, i.e. {@code 000 - 999}. * *
    {@code 'N'} - * '\u004e' + * '\u004e' * Nanosecond within the second, formatted as nine digits with leading * zeros as necessary, i.e. {@code 000000000 - 999999999}. The precision * of this value is limited by the resolution of the underlying operating * system or hardware. * *
    {@code 'p'} - * '\u0070' + * '\u0070' * Locale-specific {@linkplain * java.text.DateFormatSymbols#getAmPmStrings morning or afternoon} marker * in lower case, e.g."{@code am}" or "{@code pm}". Use of the @@ -1585,7 +1585,7 @@ * upper-case output.) * *
    {@code 'z'} - * '\u007a' + * '\u007a' * RFC 822 * style numeric time zone offset from GMT, e.g. {@code -0800}. This * value will be adjusted as necessary for Daylight Saving Time. For @@ -1594,7 +1594,7 @@ * instance of the Java virtual machine. * *
    {@code 'Z'} - * '\u005a' + * '\u005a' * A string representing the abbreviation for the time zone. This * value will be adjusted as necessary for Daylight Saving Time. For * {@code long}, {@link Long}, and {@link Date} the time zone used is @@ -1603,13 +1603,13 @@ * supersede the locale of the argument (if any). * *
    {@code 's'} - * '\u0073' + * '\u0073' * Seconds since the beginning of the epoch starting at 1 January 1970 * {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE/1000} to * {@code Long.MAX_VALUE/1000}. * *
    {@code 'Q'} - * '\u004f' + * '\u004f' * Milliseconds since the beginning of the epoch starting at 1 January * 1970 {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE} to * {@code Long.MAX_VALUE}. The precision of this value is limited by @@ -1622,68 +1622,68 @@ * * *
    {@code 'B'} - * '\u0042' + * '\u0042' * Locale-specific {@linkplain java.text.DateFormatSymbols#getMonths * full month name}, e.g. {@code "January"}, {@code "February"}. * *
    {@code 'b'} - * '\u0062' + * '\u0062' * Locale-specific {@linkplain * java.text.DateFormatSymbols#getShortMonths abbreviated month name}, * e.g. {@code "Jan"}, {@code "Feb"}. * *
    {@code 'h'} - * '\u0068' + * '\u0068' * Same as {@code 'b'}. * *
    {@code 'A'} - * '\u0041' + * '\u0041' * Locale-specific full name of the {@linkplain * java.text.DateFormatSymbols#getWeekdays day of the week}, * e.g. {@code "Sunday"}, {@code "Monday"} * *
    {@code 'a'} - * '\u0061' + * '\u0061' * Locale-specific short name of the {@linkplain * java.text.DateFormatSymbols#getShortWeekdays day of the week}, * e.g. {@code "Sun"}, {@code "Mon"} * *
    {@code 'C'} - * '\u0043' + * '\u0043' * Four-digit year divided by {@code 100}, formatted as two digits * with leading zero as necessary, i.e. {@code 00 - 99} * *
    {@code 'Y'} - * '\u0059' Year, formatted to at least + * '\u0059' Year, formatted to at least * four digits with leading zeros as necessary, e.g. {@code 0092} equals * {@code 92} CE for the Gregorian calendar. * *
    {@code 'y'} - * '\u0079' + * '\u0079' * Last two digits of the year, formatted with leading zeros as * necessary, i.e. {@code 00 - 99}. * *
    {@code 'j'} - * '\u006a' + * '\u006a' * Day of year, formatted as three digits with leading zeros as * necessary, e.g. {@code 001 - 366} for the Gregorian calendar. * {@code 001} corresponds to the first day of the year. * *
    {@code 'm'} - * '\u006d' + * '\u006d' * Month, formatted as two digits with leading zeros as necessary, * i.e. {@code 01 - 13}, where "{@code 01}" is the first month of the * year and ("{@code 13}" is a special value required to support lunar * calendars). * *
    {@code 'd'} - * '\u0064' + * '\u0064' * Day of month, formatted as two digits with leading zeros as * necessary, i.e. {@code 01 - 31}, where "{@code 01}" is the first day * of the month. * *
    {@code 'e'} - * '\u0065' + * '\u0065' * Day of month, formatted as two digits, i.e. {@code 1 - 31} where * "{@code 1}" is the first day of the month. * @@ -1695,30 +1695,30 @@ * * *
    {@code 'R'} - * '\u0052' + * '\u0052' * Time formatted for the 24-hour clock as {@code "%tH:%tM"} * *
    {@code 'T'} - * '\u0054' + * '\u0054' * Time formatted for the 24-hour clock as {@code "%tH:%tM:%tS"}. * *
    {@code 'r'} - * '\u0072' + * '\u0072' * Time formatted for the 12-hour clock as {@code "%tI:%tM:%tS * %Tp"}. The location of the morning or afternoon marker * ({@code '%Tp'}) may be locale-dependent. * *
    {@code 'D'} - * '\u0044' + * '\u0044' * Date formatted as {@code "%tm/%td/%ty"}. * *
    {@code 'F'} - * '\u0046' + * '\u0046' * ISO 8601 * complete date formatted as {@code "%tY-%tm-%td"}. * *
    {@code 'c'} - * '\u0063' + * '\u0063' * Date and time formatted as {@code "%ta %tb %td %tT %tZ %tY"}, * e.g. {@code "Sun Jul 20 16:17:00 EDT 1969"}. * @@ -1731,7 +1731,7 @@ *

    The width is the minimum number of characters to * be written to the output. If the length of the converted value is less than * the {@code width} then the output will be padded by spaces - * ('\u0020') until the total number of characters equals width. + * ('\u0020') until the total number of characters equals width. * The padding is on the left by default. If the {@code '-'} flag is given * then the padding will be on the right. If width is not specified then there * is no minimum. @@ -1746,12 +1746,12 @@ * * *
    {@code '%'} - * The result is a literal {@code '%'} ('\u0025') + * The result is a literal {@code '%'} ('\u0025') * *

    The width is the minimum number of characters to * be written to the output including the {@code '%'}. If the length of the * converted value is less than the {@code width} then the output will be - * padded by spaces ('\u0020') until the total number of + * padded by spaces ('\u0020') until the total number of * characters equals width. The padding is on the left. If width is not * specified then just the {@code '%'} is output. * @@ -1801,7 +1801,7 @@ * * *

  • Relative indexing is used when the format specifier contains a - * {@code '<'} ('\u003c') flag which causes the argument for + * {@code '<'} ('\u003c') flag which causes the argument for * the previous format specifier to be re-used. If there is no previous * argument, then a {@link MissingFormatArgumentException} is thrown. *