organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-22769 Rename of the ICU4J data folder to not contain a version (code)

Browse source
This commit is contained in:
Mihai Nita 2024-05-08 14:42:20 -07:00 • committed by Mihai Nita
parent 9720a210ac
commit 29620612ef
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4j/main/core/src/main/java/com/ibm/icu/impl/ICUData.java
View file

@ -33,12 +33,13 @@ public final class ICUData {
* The ICU data package name.
* This is normally the name of the .dat package, and the prefix (plus '/')
* of the package entry names.
* Not used when loading from resources packaged in the .jar.
*/
static final String PACKAGE_NAME = "icudt" + VersionInfo.ICU_DATA_VERSION_PATH;
/**
* The data path to be used with Class.getResourceAsStream().
*/
public static final String ICU_BUNDLE = "data/" + PACKAGE_NAME;
public static final String ICU_BUNDLE = "data/icudata";
/**
* The base name of ICU data to be used with ClassLoader.getResourceAsStream(),

8
icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java
View file

@ -9,6 +9,7 @@
package com.ibm.icu.util;
import com.ibm.icu.impl.ICUData;
import java.util.concurrent.ConcurrentHashMap;
/**
@ -230,7 +231,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
public static final VersionInfo ICU_VERSION;
/**
* Data version string for ICU's internal data.
* Data version string for ICU's data file.
* Not used when loading from resources packaged in the .jar.
* Used for appending to data path (e.g. icudt43b)
* @internal
* @deprecated This API is ICU internal only.
@ -703,8 +705,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
if (TZDATA_VERSION == null) {
synchronized (VersionInfo.class) {
if (TZDATA_VERSION == null) {
UResourceBundle tzbundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt"
+ VersionInfo.ICU_DATA_VERSION_PATH, "zoneinfo64");
UResourceBundle tzbundle =
UResourceBundle.getBundleInstance("com/ibm/icu/impl/" + ICUData.ICU_BUNDLE, "zoneinfo64");
TZDATA_VERSION = tzbundle.getString("TZVersion");
}
}