jdk-sandbox: comparison jdk/src/share/classes/java/util/Formatter.java

equal deleted inserted replaced

-:0b2c3a61f004
+:a23e3f47c5a8
 /*
-* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.UnsupportedCharsetException;
 import java.text.DateFormatSymbols;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.util.Calendar;
 * @author  Iris Clark
 * @since 1.5
 */
 public final class Formatter implements Closeable, Flushable {
 private Appendable a;
-private Locale l;
+private final Locale l;
 private IOException lastException;
-private char zero = '0';
+private final char zero;
 private static double scaleUp;
 // 1 (sign) + 19 (max # sig digits) + 1 ('.') + 1 ('e') + 1 (sign)
 // + 3 (max # exp digits) + 4 (error) = 30
 private static final int MAX_FD_CHARS = 30;
-// Initialize internal data.
+/**
-private void init(Appendable a, Locale l) {
+* Returns a charset object for the given charset name.
+* @throws NullPointerException          is csn is null
+* @throws UnsupportedEncodingException  if the charset is not supported
+*/
+private static Charset toCharset(String csn)
+throws UnsupportedEncodingException
+{
+Objects.nonNull(csn, "charsetName");
+try {
+return Charset.forName(csn);
+} catch (IllegalCharsetNameException|UnsupportedCharsetException unused) {
+// UnsupportedEncodingException should be thrown
+throw new UnsupportedEncodingException(csn);
+}
+}
+private static final Appendable nonNullAppendable(Appendable a) {
+if (a == null)
+return new StringBuilder();
+return a;
+}
+/* Private constructors */
+private Formatter(Locale l, Appendable a) {
 this.a = a;
 this.l = l;
-setZero();
+this.zero = getZero(l);
+}
+private Formatter(Charset charset, Locale l, File file)
+throws FileNotFoundException
+{
+this(l,
+new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), charset)));
 }
 /**
 * Constructs a new formatter.
 *
 * #toString toString()}.  The locale used is the {@linkplain
 * Locale#getDefault() default locale} for this instance of the Java
 * virtual machine.
 */
 public Formatter() {
-init(new StringBuilder(), Locale.getDefault(Locale.Category.FORMAT));
+this(Locale.getDefault(Locale.Category.FORMAT), new StringBuilder());
 }
 /**
 * Constructs a new formatter with the specified destination.
 *
 * @param  a
 *         Destination for the formatted output.  If {@code a} is
 *         {@code null} then a {@link StringBuilder} will be created.
 */
 public Formatter(Appendable a) {
-if (a == null)
+this(Locale.getDefault(Locale.Category.FORMAT), nonNullAppendable(a));
-a = new StringBuilder();
-init(a, Locale.getDefault(Locale.Category.FORMAT));
 }
 /**
 * Constructs a new formatter with the specified locale.
 *
 *         The {@linkplain java.util.Locale locale} to apply during
 *         formatting.  If {@code l} is {@code null} then no localization
 *         is applied.
 */
 public Formatter(Locale l) {
-init(new StringBuilder(), l);
+this(l, new StringBuilder());
 }
 /**
 * Constructs a new formatter with the specified destination and locale.
 *
 *         The {@linkplain java.util.Locale locale} to apply during
 *         formatting.  If {@code l} is {@code null} then no localization
 *         is applied.
 */
 public Formatter(Appendable a, Locale l) {
-if (a == null)
+this(l, nonNullAppendable(a));
-a = new StringBuilder();
-init(a, l);
 }
 /**
 * Constructs a new formatter with the specified file name.
 *
 *          regular file and a new regular file of that name cannot be
 *          created, or if some other error occurs while opening or
 *          creating the file
 */
 public Formatter(String fileName) throws FileNotFoundException {
-init(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fileName))),
+this(Locale.getDefault(Locale.Category.FORMAT),
-Locale.getDefault(Locale.Category.FORMAT));
+new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fileName))));
 }
 /**
 * Constructs a new formatter with the specified file name and charset.
 *
 *          If the named charset is not supported
 */
 public Formatter(String fileName, String csn, Locale l)
 throws FileNotFoundException, UnsupportedEncodingException
 {
-init(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(fileName), csn)),
+this(toCharset(csn), l, new File(fileName));
-l);
 }
 /**
 * Constructs a new formatter with the specified file.
 *
 *          regular file and a new regular file of that name cannot be
 *          created, or if some other error occurs while opening or
 *          creating the file
 */
 public Formatter(File file) throws FileNotFoundException {
-init(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file))),
+this(Locale.getDefault(Locale.Category.FORMAT),
-Locale.getDefault(Locale.Category.FORMAT));
+new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file))));
 }
 /**
 * Constructs a new formatter with the specified file and charset.
 *
 *          If the named charset is not supported
 */
 public Formatter(File file, String csn, Locale l)
 throws FileNotFoundException, UnsupportedEncodingException
 {
-init(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), csn)),
+this(toCharset(csn), l, file);
-l);
 }
 /**
 * Constructs a new formatter with the specified print stream.
 *
 *
 * @param  ps
 *         The stream to use as the destination of this formatter.
 */
 public Formatter(PrintStream ps) {
-if (ps == null)
+this(Locale.getDefault(Locale.Category.FORMAT),
-throw new NullPointerException();
+(Appendable)Objects.nonNull(ps));
-init((Appendable)ps, Locale.getDefault(Locale.Category.FORMAT));
 }
 /**
 * Constructs a new formatter with the specified output stream.
 *
 * @param  os
 *         The output stream to use as the destination of this formatter.
 *         The output will be buffered.
 */
 public Formatter(OutputStream os) {
-init(new BufferedWriter(new OutputStreamWriter(os)),
+this(Locale.getDefault(Locale.Category.FORMAT),
-Locale.getDefault(Locale.Category.FORMAT));
+new BufferedWriter(new OutputStreamWriter(os)));
 }
 /**
 * Constructs a new formatter with the specified output stream and
 * charset.
 *          If the named charset is not supported
 */
 public Formatter(OutputStream os, String csn, Locale l)
 throws UnsupportedEncodingException
 {
-init(new BufferedWriter(new OutputStreamWriter(os, csn)), l);
+this(l, new BufferedWriter(new OutputStreamWriter(os, csn)));
 }
-private void setZero() {
+private static char getZero(Locale l) {
 if ((l != null) && !l.equals(Locale.US)) {
 DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(l);
-zero = dfs.getZeroDigit();
+return dfs.getZeroDigit();
+} else {
+return '0';
 }
 }
 /**
 * Returns the locale set by the construction of this formatter.

changeset 7966	a23e3f47c5a8
parent 7816	55a18147b4bf
child 8166	13423c0952ad