From 5fe4d18385a20deffe97faeaa50852cc59f31bb7 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Fri, 29 May 2015 09:08:36 -0700 Subject: [PATCH] 8081452: Move sun.nio.cs.AbstractCharsetProvider into jdk.charset/sun.nio.cs.ext To AbstractCharsetProvider class from base.java module to jdk.charsets module Reviewed-by: alanb --- .../share/classes/sun/nio/cs/ext}/AbstractCharsetProvider.java | 2 +- .../share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename jdk/src/{java.base/share/classes/sun/nio/cs => jdk.charsets/share/classes/sun/nio/cs/ext}/AbstractCharsetProvider.java (99%) diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java similarity index 99% rename from jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java rename to jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java index e10a9400280..972d6593573 100644 --- a/jdk/src/java.base/share/classes/sun/nio/cs/AbstractCharsetProvider.java +++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java @@ -23,7 +23,7 @@ * questions. */ -package sun.nio.cs; +package sun.nio.cs.ext; import java.lang.ref.SoftReference; import java.nio.charset.Charset; diff --git a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template index a25018a1235..19a278f4ba1 100644 --- a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template +++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template @@ -35,7 +35,6 @@ import java.nio.charset.spi.CharsetProvider; import sun.nio.cs.AbstractCharsetProvider; import java.security.AccessController; import java.security.PrivilegedAction; -import sun.nio.cs.AbstractCharsetProvider; /** * Provider for extended charsets.