diff --git a/pom.xml b/pom.xml index 9860ef3..4e16560 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,11 @@ com.imyeyu.lang timi-lang - 0.0.2 + 0.0.3 jar + 21 true 21 21 @@ -28,10 +29,42 @@ maven-source-plugin 3.3.1 + + org.projectlombok + lombok-maven-plugin + 1.18.20.0 + + ${project.basedir}/src/main/java + ${project.build.directory}/delombok + false + UTF-8 + + + + generate-sources + + delombok + + + + + + org.projectlombok + lombok + 1.18.36 + + + org.apache.maven.plugins maven-javadoc-plugin 3.11.2 + + ${project.build.directory}/delombok + UTF-8 + UTF-8 + UTF-8 + @@ -60,7 +93,7 @@ com.imyeyu.io timi-io - 0.0.2 + 0.0.4 org.junit.jupiter diff --git a/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java b/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java index 7d3fa37..5c405c2 100644 --- a/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java +++ b/src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java @@ -3,6 +3,8 @@ package com.imyeyu.lang.mapper; import com.imyeyu.java.bean.Language; import com.imyeyu.java.bean.LanguageMapping; import com.imyeyu.utils.StringInterpolator; +import lombok.Getter; +import lombok.Setter; import java.util.Map; @@ -18,9 +20,11 @@ public abstract class AbstractLanguageMapper implements LanguageMapping { protected final StringInterpolator INTERPOLATOR = StringInterpolator.createDollarInterpolator(); /** 当前映射器所属语言 */ + @Getter protected final Language.Enum language; - /** 是否启用调试模式，启用后将抛出异常而不是返回默认值 */ + /** true 为启用调试模式 */ + @Setter protected boolean isDebugging = false; /** @@ -32,24 +36,6 @@ public abstract class AbstractLanguageMapper implements LanguageMapping { this.language = language; } - /** - * 获取当前映射器所属语言 - * - * @return 语言枚举 - */ - public Language.Enum getLanguage() { - return language; - } - - /** - * 设置调试模式，调试模式下，找不到映射时将抛出异常而不是返回默认值 - * - * @param debugging true 为启用调试模式 - */ - public void setDebugging(boolean debugging) { - isDebugging = debugging; - } - /** * 获取文本 * diff --git a/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java b/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java index a4a73f8..e65795a 100644 --- a/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java +++ b/src/main/java/com/imyeyu/lang/mapper/LanguageMap.java @@ -1,7 +1,6 @@ package com.imyeyu.lang.mapper; import com.imyeyu.java.TimiJava; -import com.imyeyu.java.bean.CallbackArgReturn; import com.imyeyu.java.bean.Language; import com.imyeyu.utils.Text; diff --git a/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java b/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java index 45b3940..a1bc69c 100644 --- a/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java +++ b/src/main/java/com/imyeyu/lang/multi/FileMultilingual.java @@ -36,16 +36,16 @@ public class FileMultilingual extends Multilingual { */ public void addAll(String path) { Language.Enum[] values = Language.Enum.values(); - for (int i = 0; i < values.length; i++) { - FileLanguageMap mapper = new FileLanguageMap(values[i]); + for (Language.Enum value : values) { + FileLanguageMap mapper = new FileLanguageMap(value); mapper.load(path); - if (multilingualMap.containsKey(values[i])) { - AbstractLanguageMapper existMapper = multilingualMap.get(values[i]); + if (multilingualMap.containsKey(value)) { + AbstractLanguageMapper existMapper = multilingualMap.get(value); if (existMapper instanceof LanguageMap map) { map.union(mapper); } } else { - add(values[i], mapper); + add(value, mapper); } } } diff --git a/src/main/java/com/imyeyu/lang/multi/Multilingual.java b/src/main/java/com/imyeyu/lang/multi/Multilingual.java index d0948ba..63bb21b 100644 --- a/src/main/java/com/imyeyu/lang/multi/Multilingual.java +++ b/src/main/java/com/imyeyu/lang/multi/Multilingual.java @@ -5,6 +5,7 @@ import com.imyeyu.java.bean.Language; import com.imyeyu.java.bean.LanguageMapping; import com.imyeyu.java.ref.Ref; import com.imyeyu.lang.mapper.AbstractLanguageMapper; +import lombok.Getter; import java.util.ArrayList; import java.util.HashMap; @@ -49,6 +50,7 @@ public class Multilingual implements LanguageMapping { protected final List> updateActiveListeners; /** 当前激活语言 */ + @Getter protected Language.Enum activated; /** 是否启用调试模式 */ @@ -121,20 +123,11 @@ public class Multilingual implements LanguageMapping { String[] localSp = activated.toString().split("_"); Locale.setDefault(new Locale(localSp[0], localSp[1])); - for (int i = 0; i < updateActiveListeners.size(); i++) { - updateActiveListeners.get(i).handler(activated); + for (CallbackArg updateActiveListener : updateActiveListeners) { + updateActiveListener.handler(activated); } } - /** - * 获取当前激活的语言 - * - * @return 当前激活语言 - */ - public Language.Enum getActivated() { - return activated; - } - /** * 设置调试模式 *

diff --git a/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java b/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java index b26ce6d..d3b3360 100644 --- a/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java +++ b/src/main/java/com/imyeyu/lang/multi/ResourcesMultilingual.java @@ -39,16 +39,16 @@ public class ResourcesMultilingual extends Multilingual { */ public void addAll(String path) { Language.Enum[] values = Language.Enum.values(); - for (int i = 0; i < values.length; i++) { - ResourcesLanguageMap mapper = new ResourcesLanguageMap(values[i]); + for (Language.Enum value : values) { + ResourcesLanguageMap mapper = new ResourcesLanguageMap(value); mapper.load(path); - if (multilingualMap.containsKey(values[i])) { - AbstractLanguageMapper existMapper = multilingualMap.get(values[i]); + if (multilingualMap.containsKey(value)) { + AbstractLanguageMapper existMapper = multilingualMap.get(value); if (existMapper instanceof LanguageMap map) { map.union(mapper); } } else { - add(values[i], mapper); + add(value, mapper); } } }