src/jdk.charsets/share/classes/sun/nio/cs/ext/AbstractCharsetProvider.java

rev 13834 : 8151384: Examine sun.misc.ASCIICaseInsensitiveComparator
Reviewed-by: shade, sherman

*** 31,41 ****
  import java.util.ArrayList;
  import java.util.TreeMap;
  import java.util.Iterator;
  import java.util.Locale;
  import java.util.Map;
- import sun.misc.ASCIICaseInsensitiveComparator;
  
  
  /**
   * Abstract base class for charset providers.
   *
--- 31,40 ----
*** 47,72 ****
  {
  
      /* Maps canonical names to class names
       */
      private Map<String,String> classMap
!         = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER);
  
      /* Maps alias names to canonical names
       */
      private Map<String,String> aliasMap
!         = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER);
  
      /* Maps canonical names to alias-name arrays
       */
      private Map<String,String[]> aliasNameMap
!         = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER);
  
      /* Maps canonical names to soft references that hold cached instances
       */
      private Map<String,SoftReference<Charset>> cache
!         = new TreeMap<>(ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER);
  
      private String packagePrefix;
  
      protected AbstractCharsetProvider() {
          packagePrefix = "sun.nio.cs";
--- 46,71 ----
  {
  
      /* Maps canonical names to class names
       */
      private Map<String,String> classMap
!         = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
  
      /* Maps alias names to canonical names
       */
      private Map<String,String> aliasMap
!         = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
  
      /* Maps canonical names to alias-name arrays
       */
      private Map<String,String[]> aliasNameMap
!         = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
  
      /* Maps canonical names to soft references that hold cached instances
       */
      private Map<String,SoftReference<Charset>> cache
!         = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
  
      private String packagePrefix;
  
      protected AbstractCharsetProvider() {
          packagePrefix = "sun.nio.cs";