jdk/src/java.base/share/classes/sun/net/idn/StringPrep.java

*** 48,58 ****
  import java.text.ParseException;
  
  import sun.text.Normalizer;
  import sun.text.normalizer.CharTrie;
  import sun.text.normalizer.Trie;
- import sun.text.normalizer.NormalizerImpl;
  import sun.text.normalizer.VersionInfo;
  import sun.text.normalizer.UCharacter;
  import sun.text.normalizer.UCharacterIterator;
  import sun.text.normalizer.UTF16;
  import sun.net.idn.UCharacterDirection;
--- 48,57 ----
*** 225,235 ****
          // get the options
          doNFKC            = ((indexes[OPTIONS] & NORMALIZATION_ON) > 0);
          checkBiDi         = ((indexes[OPTIONS] & CHECK_BIDI_ON) > 0);
          sprepUniVer   = getVersionInfo(reader.getUnicodeVersion());
          normCorrVer   = getVersionInfo(indexes[NORM_CORRECTNS_LAST_UNI_VERSION]);
!         VersionInfo normUniVer = NormalizerImpl.getUnicodeVersion();
          if(normUniVer.compareTo(sprepUniVer) < 0 && /* the Unicode version of SPREP file must be less than the Unicode Vesion of the normalization data */
             normUniVer.compareTo(normCorrVer) < 0 && /* the Unicode version of the NormalizationCorrections.txt file should be less than the Unicode Vesion of the normalization data */
             ((indexes[OPTIONS] & NORMALIZATION_ON) > 0) /* normalization turned on*/
             ){
              throw new IOException("Normalization Correction version not supported");
--- 224,234 ----
          // get the options
          doNFKC            = ((indexes[OPTIONS] & NORMALIZATION_ON) > 0);
          checkBiDi         = ((indexes[OPTIONS] & CHECK_BIDI_ON) > 0);
          sprepUniVer   = getVersionInfo(reader.getUnicodeVersion());
          normCorrVer   = getVersionInfo(indexes[NORM_CORRECTNS_LAST_UNI_VERSION]);
!         VersionInfo normUniVer = UCharacter.getUnicodeVersion();
          if(normUniVer.compareTo(sprepUniVer) < 0 && /* the Unicode version of SPREP file must be less than the Unicode Vesion of the normalization data */
             normUniVer.compareTo(normCorrVer) < 0 && /* the Unicode version of the NormalizationCorrections.txt file should be less than the Unicode Vesion of the normalization data */
             ((indexes[OPTIONS] & NORMALIZATION_ON) > 0) /* normalization turned on*/
             ){
              throw new IOException("Normalization Correction version not supported");
*** 352,362 ****
           */
          return new StringBuffer(
              Normalizer.normalize(
                  src.toString(),
                  java.text.Normalizer.Form.NFKC,
!                 Normalizer.UNICODE_3_2|NormalizerImpl.BEFORE_PRI_29));
      }
      /*
      boolean isLabelSeparator(int ch){
          int result = getCodePointValue(ch);
          if( (result & 0x07)  == LABEL_SEPARATOR){
--- 351,361 ----
           */
          return new StringBuffer(
              Normalizer.normalize(
                  src.toString(),
                  java.text.Normalizer.Form.NFKC,
!                 Normalizer.UNICODE_3_2));
      }
      /*
      boolean isLabelSeparator(int ch){
          int result = getCodePointValue(ch);
          if( (result & 0x07)  == LABEL_SEPARATOR){