From 33ef4ffe5a74852f118c9262547b80de205a5811 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Wed, 24 Aug 2016 21:17:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 502647092 --- .../pw/yumc/YumCore/config/AbstractConfig.java | 3 +++ .../java/pw/yumc/YumCore/config/FileConfig.java | 15 ++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/pw/yumc/YumCore/config/AbstractConfig.java b/src/main/java/pw/yumc/YumCore/config/AbstractConfig.java index ad38bd3..6b38beb 100644 --- a/src/main/java/pw/yumc/YumCore/config/AbstractConfig.java +++ b/src/main/java/pw/yumc/YumCore/config/AbstractConfig.java @@ -86,6 +86,9 @@ public class AbstractConfig extends YamlConfiguration { public void save(final File file) throws IOException { Validate.notNull(file, "文件不得为 null"); Files.createParentDirs(file); + if (!file.exists()) { + file.createNewFile(); + } final Writer writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8); try { writer.write(data); diff --git a/src/main/java/pw/yumc/YumCore/config/FileConfig.java b/src/main/java/pw/yumc/YumCore/config/FileConfig.java index 163455f..c9b95d0 100644 --- a/src/main/java/pw/yumc/YumCore/config/FileConfig.java +++ b/src/main/java/pw/yumc/YumCore/config/FileConfig.java @@ -20,8 +20,6 @@ import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.Plugin; -import com.google.common.io.Files; - import pw.yumc.YumCore.bukkit.Log; import pw.yumc.YumCore.bukkit.P; @@ -354,7 +352,6 @@ public class FileConfig extends AbstractConfig { @Override public void save(final File file) throws IOException { Validate.notNull(file, "文件不得为 null"); - Files.createParentDirs(file); if (commentConfig != null) { data = commentConfig.saveToString(); } else { @@ -383,8 +380,7 @@ public class FileConfig extends AbstractConfig { */ private boolean needUpdate(final FileConfig newcfg, final FileConfig oldcfg) throws IOException { final String newver = newcfg.getString(CHECK_FIELD); - final String oldver = oldcfg.getString(CHECK_FIELD); - return newver != null && !newver.equalsIgnoreCase(oldver); + return newver != null && !newver.equalsIgnoreCase(oldcfg.getString(CHECK_FIELD)); } /** @@ -396,8 +392,8 @@ public class FileConfig extends AbstractConfig { final String filename = file.getName(); final InputStream filestream = plugin.getResource(file.getName()); final String errFileName = this.getErrName(filename); - loger.warning("错误的配置文件: " + filename + " 已备份为 " + errFileName); file.renameTo(new File(file.getParent(), errFileName)); + loger.warning(String.format("错误的配置文件: %s 已备份为 %s !", filename, errFileName)); if (filestream == null) { file.createNewFile(); } else { @@ -416,10 +412,11 @@ public class FileConfig extends AbstractConfig { final String filename = oldcfg.getConfigName(); try { final String newCfgName = this.getBakName(filename); - oldcfg.save(new File(file.getParent(), newCfgName)); - loger.warning("配置: " + filename + " 已备份为 " + newCfgName); + final File newcfg = new File(file.getParent(), newCfgName); + oldcfg.save(newcfg); + loger.warning(String.format("配置: %s 已备份为 %s !", filename, newCfgName)); } catch (final IOException e) { - loger.warning("配置: " + filename + "备份失败!"); + loger.warning(String.format("配置: %s 备份失败 异常: %s !", filename, e.getMessage())); } }