Merge
diff --git a/make/java/nio/FILES_java.gmk b/make/java/nio/FILES_java.gmk
index d09a966..f50f2fd 100644
--- a/make/java/nio/FILES_java.gmk
+++ b/make/java/nio/FILES_java.gmk
@@ -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 \
diff --git a/src/share/classes/java/nio/charset/Charset.java b/src/share/classes/java/nio/charset/Charset.java
index 51dbe15..1a30ba9 100644
--- a/src/share/classes/java/nio/charset/Charset.java
+++ b/src/share/classes/java/nio/charset/Charset.java
@@ -215,7 +215,7 @@
* determined during virtual-machine startup and typically depends upon the
* locale and charset being used by the underlying operating system. </p>
*
- * <p>The {@link StandardCharset} class defines constants for each of the
+ * <p>The {@link StandardCharsets} class defines constants for each of the
* standard charsets.
*
* <h4>Terminology</h4>
diff --git a/src/share/classes/java/nio/charset/StandardCharset.java b/src/share/classes/java/nio/charset/StandardCharsets.java
similarity index 95%
rename from src/share/classes/java/nio/charset/StandardCharset.java
rename to src/share/classes/java/nio/charset/StandardCharsets.java
index edec058..b2572c3 100644
--- a/src/share/classes/java/nio/charset/StandardCharset.java
+++ b/src/share/classes/java/nio/charset/StandardCharsets.java
@@ -32,10 +32,10 @@
* @see <a href="Charset#standard">Standard Charsets</a>
* @since 1.7
*/
-public final class StandardCharset {
+public final class StandardCharsets {
- private StandardCharset() {
- throw new AssertionError("No java.nio.charset.StandardCharset instances for you!");
+ 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
diff --git a/src/share/classes/java/nio/file/Path.java b/src/share/classes/java/nio/file/Path.java
index 2d2e977..69e5086 100644
--- a/src/share/classes/java/nio/file/Path.java
+++ b/src/share/classes/java/nio/file/Path.java
@@ -72,7 +72,7 @@
* directory and is UTF-8 encoded.
* <pre>
* Path path = FileSystems.getDefault().getPath("logs", "access.log");
- * BufferReader reader = Files.newBufferedReader(path, StandardCharset.UTF_8);
+ * BufferReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8);
* </pre>
*
* <a name="interop"><h4>Interoperability</h4></a>
diff --git a/src/share/classes/java/util/zip/ZipCoder.java b/src/share/classes/java/util/zip/ZipCoder.java
index 6284491..12404cb 100644
--- a/src/share/classes/java/util/zip/ZipCoder.java
+++ b/src/share/classes/java/util/zip/ZipCoder.java
@@ -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) {
diff --git a/src/share/classes/java/util/zip/ZipFile.java b/src/share/classes/java/util/zip/ZipFile.java
index d1861ad..9693809 100644
--- a/src/share/classes/java/util/zip/ZipFile.java
+++ b/src/share/classes/java/util/zip/ZipFile.java
@@ -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);
}
/**
diff --git a/src/share/classes/java/util/zip/ZipInputStream.java b/src/share/classes/java/util/zip/ZipInputStream.java
index ebfcce1..a60adb8 100644
--- a/src/share/classes/java/util/zip/ZipInputStream.java
+++ b/src/share/classes/java/util/zip/ZipInputStream.java
@@ -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);
}
/**
diff --git a/src/share/classes/java/util/zip/ZipOutputStream.java b/src/share/classes/java/util/zip/ZipOutputStream.java
index c0b5948..91f7f75 100644
--- a/src/share/classes/java/util/zip/ZipOutputStream.java
+++ b/src/share/classes/java/util/zip/ZipOutputStream.java
@@ -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);
}
/**
diff --git a/src/share/classes/sun/awt/FontDescriptor.java b/src/share/classes/sun/awt/FontDescriptor.java
index e98ec65..fc1df5a 100644
--- a/src/share/classes/sun/awt/FontDescriptor.java
+++ b/src/share/classes/sun/awt/FontDescriptor.java
@@ -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;