--- old/make/java/nio/FILES_java.gmk 2011-05-03 16:50:21.000000000 -0700
+++ new/make/java/nio/FILES_java.gmk 2011-05-03 16:50:20.000000000 -0700
@@ -71,7 +71,7 @@
java/nio/charset/CoderMalfunctionError.java \
java/nio/charset/CodingErrorAction.java \
java/nio/charset/MalformedInputException.java \
- java/nio/charset/StandardCharset.java \
+ java/nio/charset/StandardCharsets.java \
java/nio/charset/UnmappableCharacterException.java \
\
java/nio/charset/spi/CharsetProvider.java \
--- old/src/share/classes/java/nio/charset/Charset.java 2011-05-03 16:50:22.000000000 -0700
+++ new/src/share/classes/java/nio/charset/Charset.java 2011-05-03 16:50:22.000000000 -0700
@@ -215,7 +215,7 @@
* determined during virtual-machine startup and typically depends upon the
* locale and charset being used by the underlying operating system.
*
- * The {@link StandardCharset} class defines constants for each of the
+ *
The {@link StandardCharsets} class defines constants for each of the
* standard charsets.
*
*
Terminology
--- old/src/share/classes/java/nio/file/Path.java 2011-05-03 16:50:23.000000000 -0700
+++ new/src/share/classes/java/nio/file/Path.java 2011-05-03 16:50:23.000000000 -0700
@@ -72,7 +72,7 @@
* directory and is UTF-8 encoded.
*
* Path path = FileSystems.getDefault().getPath("logs", "access.log");
- * BufferReader reader = Files.newBufferedReader(path, StandardCharset.UTF_8);
+ * BufferReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8);
*
*
* Interoperability
--- old/src/share/classes/java/util/zip/ZipCoder.java 2011-05-03 16:50:24.000000000 -0700
+++ new/src/share/classes/java/util/zip/ZipCoder.java 2011-05-03 16:50:24.000000000 -0700
@@ -28,7 +28,7 @@
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharset;
+import java.nio.charset.StandardCharsets;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
@@ -107,7 +107,7 @@
if (isUTF8)
return getBytes(s);
if (utf8 == null)
- utf8 = new ZipCoder(StandardCharset.UTF_8);
+ utf8 = new ZipCoder(StandardCharsets.UTF_8);
return utf8.getBytes(s);
}
@@ -116,7 +116,7 @@
if (isUTF8)
return toString(ba, len);
if (utf8 == null)
- utf8 = new ZipCoder(StandardCharset.UTF_8);
+ utf8 = new ZipCoder(StandardCharsets.UTF_8);
return utf8.toString(ba, len);
}
@@ -132,7 +132,7 @@
private ZipCoder(Charset cs) {
this.cs = cs;
- this.isUTF8 = cs.name().equals(StandardCharset.UTF_8.name());
+ this.isUTF8 = cs.name().equals(StandardCharsets.UTF_8.name());
}
static ZipCoder get(Charset charset) {
--- old/src/share/classes/java/util/zip/ZipFile.java 2011-05-03 16:50:25.000000000 -0700
+++ new/src/share/classes/java/util/zip/ZipFile.java 2011-05-03 16:50:25.000000000 -0700
@@ -31,7 +31,7 @@
import java.io.EOFException;
import java.io.File;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Enumeration;
@@ -141,7 +141,7 @@
* @since 1.3
*/
public ZipFile(File file, int mode) throws IOException {
- this(file, mode, StandardCharset.UTF_8);
+ this(file, mode, StandardCharsets.UTF_8);
}
/**
--- old/src/share/classes/java/util/zip/ZipInputStream.java 2011-05-03 16:50:27.000000000 -0700
+++ new/src/share/classes/java/util/zip/ZipInputStream.java 2011-05-03 16:50:26.000000000 -0700
@@ -30,7 +30,7 @@
import java.io.EOFException;
import java.io.PushbackInputStream;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharset;
+import java.nio.charset.StandardCharsets;
import static java.util.zip.ZipConstants64.*;
/**
@@ -76,7 +76,7 @@
* @param in the actual input stream
*/
public ZipInputStream(InputStream in) {
- this(in, StandardCharset.UTF_8);
+ this(in, StandardCharsets.UTF_8);
}
/**
--- old/src/share/classes/java/util/zip/ZipOutputStream.java 2011-05-03 16:50:29.000000000 -0700
+++ new/src/share/classes/java/util/zip/ZipOutputStream.java 2011-05-03 16:50:29.000000000 -0700
@@ -28,7 +28,7 @@
import java.io.OutputStream;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharset;
+import java.nio.charset.StandardCharsets;
import java.util.Vector;
import java.util.HashSet;
import static java.util.zip.ZipConstants64.*;
@@ -101,7 +101,7 @@
* @param out the actual output stream
*/
public ZipOutputStream(OutputStream out) {
- this(out, StandardCharset.UTF_8);
+ this(out, StandardCharsets.UTF_8);
}
/**
--- old/src/share/classes/sun/awt/FontDescriptor.java 2011-05-03 16:50:30.000000000 -0700
+++ new/src/share/classes/sun/awt/FontDescriptor.java 2011-05-03 16:50:30.000000000 -0700
@@ -26,7 +26,7 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import java.nio.charset.StandardCharset;
+import java.nio.charset.StandardCharsets;
import sun.nio.cs.HistoricallyNamedCharset;
public class FontDescriptor implements Cloneable {
@@ -105,8 +105,8 @@
if (useUnicode && unicodeEncoder == null) {
try {
this.unicodeEncoder = isLE?
- StandardCharset.UTF_16LE.newEncoder():
- StandardCharset.UTF_16BE.newEncoder();
+ StandardCharsets.UTF_16LE.newEncoder():
+ StandardCharsets.UTF_16BE.newEncoder();
} catch (IllegalArgumentException x) {}
}
return useUnicode;
--- old/src/share/classes/java/nio/charset/StandardCharset.java 2011-05-03 16:50:32.000000000 -0700
+++ /dev/null 2011-05-03 16:50:32.000000000 -0700
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 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
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.nio.charset;
-
-/**
- * Constant definitions for the standard {@link Charset Charsets}. These
- * charsets are guaranteed to be available on every implementation of the Java
- * platform.
- *
- * @see Standard Charsets
- * @since 1.7
- */
-public final class StandardCharset {
-
- private StandardCharset() {
- throw new AssertionError("No java.nio.charset.StandardCharset instances for you!");
- }
- /**
- * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the
- * Unicode character set
- */
- public static final Charset US_ASCII = Charset.forName("US-ASCII");
- /**
- * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1
- */
- public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
- /**
- * Eight-bit UCS Transformation Format
- */
- public static final Charset UTF_8 = Charset.forName("UTF-8");
- /**
- * Sixteen-bit UCS Transformation Format, big-endian byte order
- */
- public static final Charset UTF_16BE = Charset.forName("UTF-16BE");
- /**
- * Sixteen-bit UCS Transformation Format, little-endian byte order
- */
- public static final Charset UTF_16LE = Charset.forName("UTF-16LE");
- /**
- * Sixteen-bit UCS Transformation Format, byte order identified by an
- * optional byte-order mark
- */
- public static final Charset UTF_16 = Charset.forName("UTF-16");
-}
--- /dev/null 2011-05-03 16:50:32.000000000 -0700
+++ new/src/share/classes/java/nio/charset/StandardCharsets.java 2011-05-03 16:50:32.000000000 -0700
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.nio.charset;
+
+/**
+ * Constant definitions for the standard {@link Charset Charsets}. These
+ * charsets are guaranteed to be available on every implementation of the Java
+ * platform.
+ *
+ * @see Standard Charsets
+ * @since 1.7
+ */
+public final class StandardCharsets {
+
+ private StandardCharsets() {
+ throw new AssertionError("No java.nio.charset.StandardCharsets instances for you!");
+ }
+ /**
+ * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the
+ * Unicode character set
+ */
+ public static final Charset US_ASCII = Charset.forName("US-ASCII");
+ /**
+ * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1
+ */
+ public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+ /**
+ * Eight-bit UCS Transformation Format
+ */
+ public static final Charset UTF_8 = Charset.forName("UTF-8");
+ /**
+ * Sixteen-bit UCS Transformation Format, big-endian byte order
+ */
+ public static final Charset UTF_16BE = Charset.forName("UTF-16BE");
+ /**
+ * Sixteen-bit UCS Transformation Format, little-endian byte order
+ */
+ public static final Charset UTF_16LE = Charset.forName("UTF-16LE");
+ /**
+ * Sixteen-bit UCS Transformation Format, byte order identified by an
+ * optional byte-order mark
+ */
+ public static final Charset UTF_16 = Charset.forName("UTF-16");
+}