From 5acc85e53a8e9bdc253cd0fc92f27bf956146fb5 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Tue, 8 Nov 2016 17:12:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E5=8D=87init=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=88=B0=E6=8A=BD=E8=B1=A1=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 502647092 --- .../config/inject/AbstractInjectConfig.java | 22 ++++++++++++------- .../YumCore/config/inject/InjectConfig.java | 8 ------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java b/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java index 92c68bf..a8078d0 100644 --- a/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java +++ b/src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java @@ -1,15 +1,7 @@ package pw.yumc.YumCore.config.inject; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.HashMap; - import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; - import pw.yumc.YumCore.bukkit.Log; import pw.yumc.YumCore.commands.exception.CommandParseException; import pw.yumc.YumCore.config.annotation.ConfigNode; @@ -18,6 +10,13 @@ import pw.yumc.YumCore.config.annotation.Nullable; import pw.yumc.YumCore.config.annotation.ReadOnly; import pw.yumc.YumCore.config.exception.ConfigParseException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.HashMap; + /** * 抽象注入配置 * @@ -128,6 +127,12 @@ public abstract class AbstractInjectConfig { Log.d("设置字段 %s 为 %s ", field.getName(), value); } + /** + * 配置注入后的初始化操作(对象初始化也要在此处) + */ + protected void init() { + } + /** * 注入配置数据 * @@ -136,6 +141,7 @@ public abstract class AbstractInjectConfig { */ public void inject(ConfigurationSection config) { inject(config, false); + init(); } /** diff --git a/src/main/java/pw/yumc/YumCore/config/inject/InjectConfig.java b/src/main/java/pw/yumc/YumCore/config/inject/InjectConfig.java index bf3a163..8be5449 100644 --- a/src/main/java/pw/yumc/YumCore/config/inject/InjectConfig.java +++ b/src/main/java/pw/yumc/YumCore/config/inject/InjectConfig.java @@ -24,7 +24,6 @@ public abstract class InjectConfig extends AbstractInjectConfig { public InjectConfig(FileConfig config) { this.config = config; inject(config); - init(); } public InjectConfig(String name) { @@ -40,19 +39,12 @@ public abstract class InjectConfig extends AbstractInjectConfig { return config; } - /** - * 初始化配置(对象初始化也要在此处) - */ - public void init() { - } - /** * 重载配置文件 */ public void reload() { config.reload(); inject(config); - init(); } /**