From 42dd04c2a5fba0fccfd8744fec62f0f5c408a1f2 Mon Sep 17 00:00:00 2001 From: Timi Date: Mon, 8 Dec 2025 16:55:37 +0800 Subject: [PATCH] update Language.Enum --- .../lang/mapper/AbstractLanguageMapper.java | 6 ++--- .../imyeyu/lang/mapper/FileLanguageMap.java | 2 +- .../com/imyeyu/lang/mapper/LanguageMap.java | 2 +- .../lang/mapper/PropertiesLanguageMap.java | 2 +- .../lang/mapper/ResourcesLanguageMap.java | 2 +- .../imyeyu/lang/multi/FileMultilingual.java | 2 +- .../com/imyeyu/lang/multi/Multilingual.java | 26 +++++++++---------- .../lang/multi/ResourcesMultilingual.java | 2 +- src/test/java/test/TestLang.java | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java b/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java index 203a10e..c09b5d1 100644 --- a/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java +++ b/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java @@ -14,15 +14,15 @@ public abstract class AbstractLanguageMapper implements LanguageMapping { protected final StringInterpolator INTERPOLATOR = StringInterpolator.createDollarInterpolator(); - protected final Language language; + protected final Language.Enum language; protected boolean isDebugging = false; - public AbstractLanguageMapper(Language language) { + public AbstractLanguageMapper(Language.Enum language) { this.language = language; } - public Language getLanguage() { + public Language.Enum getLanguage() { return language; } diff --git a/src/main/java/com/imyeyu/lang/mapper/FileLanguageMap.java b/src/main/java/com/imyeyu/lang/mapper/FileLanguageMap.java index c837f05..20fad94 100644 --- a/src/main/java/com/imyeyu/lang/mapper/FileLanguageMap.java +++ b/src/main/java/com/imyeyu/lang/mapper/FileLanguageMap.java @@ -18,7 +18,7 @@ public class FileLanguageMap extends PropertiesLanguageMap { * * @param language 所属语言 */ - public FileLanguageMap(Language language) { + public FileLanguageMap(Language.Enum language) { super(language); } diff --git a/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java b/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java index f921dfc..b635093 100644 --- a/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java +++ b/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java @@ -31,7 +31,7 @@ public class LanguageMap extends AbstractLanguageMapper { * * @param language 所属语言 */ - public LanguageMap(Language language) { + public LanguageMap(Language.Enum language) { super(language); this.map = new HashMap<>(); } diff --git a/src/main/java/com/imyeyu/lang/mapper/PropertiesLanguageMap.java b/src/main/java/com/imyeyu/lang/mapper/PropertiesLanguageMap.java index 18ae14a..f5d124b 100644 --- a/src/main/java/com/imyeyu/lang/mapper/PropertiesLanguageMap.java +++ b/src/main/java/com/imyeyu/lang/mapper/PropertiesLanguageMap.java @@ -16,7 +16,7 @@ public class PropertiesLanguageMap extends LanguageMap { * * @param language 所属语言 */ - public PropertiesLanguageMap(Language language) { + public PropertiesLanguageMap(Language.Enum language) { super(language); } diff --git a/src/main/java/com/imyeyu/lang/mapper/ResourcesLanguageMap.java b/src/main/java/com/imyeyu/lang/mapper/ResourcesLanguageMap.java index 0eae46d..f1eef44 100644 --- a/src/main/java/com/imyeyu/lang/mapper/ResourcesLanguageMap.java +++ b/src/main/java/com/imyeyu/lang/mapper/ResourcesLanguageMap.java @@ -18,7 +18,7 @@ public class ResourcesLanguageMap extends PropertiesLanguageMap { * * @param language 所属语言 */ - public ResourcesLanguageMap(Language language) { + public ResourcesLanguageMap(Language.Enum language) { super(language); } diff --git a/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java b/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java index 3384666..8aefaa0 100644 --- a/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java +++ b/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java @@ -12,7 +12,7 @@ import com.imyeyu.lang.mapper.LanguageMap; public class FileMultilingual extends Multilingual { public void addAll(String path) { - Language[] values = Language.values(); + Language.Enum[] values = Language.Enum.values(); for (int i = 0; i < values.length; i++) { FileLanguageMap mapper = new FileLanguageMap(values[i]); mapper.load(path); diff --git a/src/main/java/com/imyeyu/lang/multi/Multilingual.java b/src/main/java/com/imyeyu/lang/multi/Multilingual.java index 18df8a9..a8c340d 100644 --- a/src/main/java/com/imyeyu/lang/multi/Multilingual.java +++ b/src/main/java/com/imyeyu/lang/multi/Multilingual.java @@ -42,11 +42,11 @@ import java.util.Objects; */ public class Multilingual implements LanguageMapping { - protected final Map multilingualMap; - protected final List> updateActiveListeners; + protected final Map multilingualMap; + protected final List> updateActiveListeners; /** 当前激活语言 */ - protected Language activated; + protected Language.Enum activated; protected boolean isDebugging = false; @@ -54,14 +54,14 @@ public class Multilingual implements LanguageMapping { multilingualMap = new HashMap<>(); updateActiveListeners = new ArrayList<>(); - activated = Ref.toType(Language.class, Locale.getDefault().toString()); + activated = Ref.toType(Language.Enum.class, Locale.getDefault().toString()); if (activated == null) { - activated = Language.zh_CN; + activated = Language.Enum.zh_CN; } } - public void add(Language language, AbstractLanguageMapper mapper) { + public void add(Language.Enum language, AbstractLanguageMapper mapper) { mapper.setDebugging(isDebugging); multilingualMap.put(language, mapper); } @@ -71,7 +71,7 @@ public class Multilingual implements LanguageMapping { * * @param callback 回调 */ - public void addUpdateActiveListeners(CallbackArg callback) { + public void addUpdateActiveListeners(CallbackArg callback) { updateActiveListeners.add(callback); } @@ -90,7 +90,7 @@ public class Multilingual implements LanguageMapping { * @param languageName 激活语言 */ public void setActivated(String languageName) { - setActivated(Ref.toType(Language.class, languageName)); + setActivated(Ref.toType(Language.Enum.class, languageName)); } /** @@ -98,7 +98,7 @@ public class Multilingual implements LanguageMapping { * * @param activated 激活语言 */ - public void setActivated(Language activated) { + public void setActivated(Language.Enum activated) { Objects.requireNonNull(activated); this.activated = activated; @@ -110,13 +110,13 @@ public class Multilingual implements LanguageMapping { } } - public Language getActivated() { + public Language.Enum getActivated() { return activated; } public void setDebugging(boolean debugging) { isDebugging = debugging; - for (Map.Entry item : multilingualMap.entrySet()) { + for (Map.Entry item : multilingualMap.entrySet()) { item.getValue().setDebugging(true); } } @@ -128,7 +128,7 @@ public class Multilingual implements LanguageMapping { * @return 映射表 */ public AbstractLanguageMapper map(String lang) { - Language language = Ref.toType(Language.class, lang); + Language.Enum language = Ref.toType(Language.Enum.class, lang); if (language == null) { throw new RuntimeException("not support language: " + lang); } @@ -141,7 +141,7 @@ public class Multilingual implements LanguageMapping { * @param lang 语言 * @return 映射表 */ - public AbstractLanguageMapper map(Language lang) { + public AbstractLanguageMapper map(Language.Enum lang) { return multilingualMap.get(lang); } diff --git a/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java b/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java index b8cb341..dd42ec5 100644 --- a/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java +++ b/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java @@ -12,7 +12,7 @@ import com.imyeyu.lang.mapper.ResourcesLanguageMap; public class ResourcesMultilingual extends Multilingual { public void addAll(String path) { - Language[] values = Language.values(); + Language.Enum[] values = Language.Enum.values(); for (int i = 0; i < values.length; i++) { ResourcesLanguageMap mapper = new ResourcesLanguageMap(values[i]); mapper.load(path); diff --git a/src/test/java/test/TestLang.java b/src/test/java/test/TestLang.java index d60a169..b4e76ec 100644 --- a/src/test/java/test/TestLang.java +++ b/src/test/java/test/TestLang.java @@ -14,7 +14,7 @@ public class TestLang { @Test public void testArgs() { - ResourcesLanguageMap map = new ResourcesLanguageMap(Language.zh_CN); + ResourcesLanguageMap map = new ResourcesLanguageMap(Language.Enum.zh_CN); map.load("zh_CN.lang"); System.out.println(map.textArgs("test", Map.of("msg", "hello world"))); }