src/java.base/share/classes/jdk/internal/icu/impl/Norm2AllModes.java

rev 57619 : [mq]: 8174270

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, 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

@@ -28,15 +28,18 @@
  *   Copyright (C) 2009-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
 
-package sun.text.normalizer;
+package jdk.internal.icu.impl;
 
 import java.io.IOException;
 
-final class Norm2AllModes {
+import jdk.internal.icu.text.Normalizer2;
+import jdk.internal.icu.util.VersionInfo;
+
+public final class Norm2AllModes {
     // Public API dispatch via Normalizer2 subclasses -------------------------- ***
 
     // Normalizer2 implementation for the old UNORM_NONE.
     public static final class NoopNormalizer2 extends Normalizer2 {
         @Override

@@ -263,11 +266,13 @@
     public static final NoopNormalizer2 NOOP_NORMALIZER2=new NoopNormalizer2();
 
     private static final class Norm2AllModesSingleton {
         private Norm2AllModesSingleton(String name) {
             try {
-                String DATA_FILE_NAME = "/sun/text/resources/" + name + ".nrm";
+                @SuppressWarnings("deprecation")
+                String DATA_FILE_NAME = "/jdk/internal/icu/impl/data/icudt" +
+                    VersionInfo.ICU_DATA_VERSION_PATH + "/" + name + ".nrm";
                 NormalizerImpl impl=new NormalizerImpl().load(DATA_FILE_NAME);
                 allModes=new Norm2AllModes(impl);
             } catch (RuntimeException e) {
                 exception=e;
             }