ICU4N.Support: Factored out AssemblyExtensions and TypeExtensions in …

…favor of J2N's implementation

src/ICU4N/Impl/ICUData.cs

@@ -1,6 +1,8 @@
 using ICU4N.Logging;
 using ICU4N.Support;
+using ICU4N.Support.Globalization;
 using ICU4N.Util;
+using J2N;
 using System;
 using System.IO;
 using System.Reflection;
@@ -81,13 +83,13 @@ public sealed class ICUData
 
         public static bool Exists(string resourceName)
         {
-            return typeof(ICUData).FindAndGetManifestResourceStream(resourceName) != null;
+            return typeof(ICUData).FindAndGetManifestResourceStream(ResourceUtil.ConvertResourceName(resourceName)) != null;
         }
 
         private static Stream GetStream(Type root, string resourceName, bool required)
         {
             Stream i;
-            i = root.FindAndGetManifestResourceStream(resourceName);
+            i = root.FindAndGetManifestResourceStream(ResourceUtil.ConvertResourceName(resourceName));
             if (i == null && required)
             {
                 throw new MissingManifestResourceException("could not locate data " + resourceName +
@@ -103,7 +105,7 @@ private static Stream GetStream(Type root, string resourceName, bool required)
         internal static Stream GetStream(Assembly loader, string resourceName, bool required)
         {
             Stream i = null;
-            i = loader.FindAndGetManifestResourceStream(resourceName);
+            i = loader.FindAndGetManifestResourceStream(ResourceUtil.ConvertResourceName(resourceName));
             if (i == null && required)
             {
                 throw new MissingManifestResourceException("could not locate data " + loader.ToString() + " Resource: " + resourceName);

src/ICU4N/Impl/ICUResourceBundle.cs

@@ -1,7 +1,7 @@
-using ICU4N.Support;
-using ICU4N.Support.Collections;
+using ICU4N.Support.Collections;
+using ICU4N.Support.Globalization;
 using ICU4N.Util;
-using J2N.Collections;
+using J2N;
 using J2N.Collections.Generic.Extensions;
 using System;
 using System.Collections.Generic;
@@ -708,7 +708,7 @@ private static void AddLocaleIDsFromListFile(string bn, Assembly root, ISet<stri
         {
             try
             {
-                using (Stream s = root.FindAndGetManifestResourceStream(bn + FULL_LOCALE_NAMES_LIST))
+                using (Stream s = root.FindAndGetManifestResourceStream(ResourceUtil.ConvertResourceName(bn + FULL_LOCALE_NAMES_LIST)))
                 {
                     if (s != null)
                     {

src/ICU4N/Support/Globalization/ResourceUtil.cs

@@ -0,0 +1,15 @@
+namespace ICU4N.Support.Globalization
+{
+    internal static class ResourceUtil
+    {
+        /// <summary>
+        /// Change from JDK-style resource path (Impl/Data/icudt60b/brkitr) to .NET style (Impl.Data.brkitr).
+        /// This method also removes the version number from the path so we don't have to change it internally
+        /// from one release to the next.
+        /// </summary>
+        public static string ConvertResourceName(string name)
+        {
+            return name.Replace('/', '.').Replace("." + ICU4N.Impl.ICUData.PackageName, "");
+        }
+    }
+}