From 26fa367a06d59872c52f532f9e2ff7b83c2c3f50 Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Sat, 30 May 2015 17:37:01 +0800
Subject: [PATCH] update FileConfig class...

Signed-off-by: j502647092 <jtb1@163.com>
---
 .../CityBuild/config/FileConfig.java          | 126 ++++++++++--------
 1 file changed, 72 insertions(+), 54 deletions(-)

diff --git a/src/cn/citycraft/CityBuild/config/FileConfig.java b/src/cn/citycraft/CityBuild/config/FileConfig.java
index dd6e038..6fb6863 100644
--- a/src/cn/citycraft/CityBuild/config/FileConfig.java
+++ b/src/cn/citycraft/CityBuild/config/FileConfig.java
@@ -1,5 +1,6 @@
 package cn.citycraft.CityBuild.config;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -7,6 +8,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.Reader;
 import java.io.Writer;
 import java.util.logging.Level;
 
@@ -30,63 +32,79 @@ import com.google.common.io.Files;
  */
 public class FileConfig extends YamlConfiguration {
 
-    public static FileConfig init(File file) {
-	return FileConfig.loadConfiguration(file);
-    }
-
-    public static FileConfig loadConfiguration(File file) {
-	Validate.notNull(file, "File cannot be null");
-	FileConfig config = new FileConfig();
-	try {
-	    config.load(file);
-	} catch (FileNotFoundException ex) {
-	} catch (IOException ex) {
-	    Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex);
-	} catch (InvalidConfigurationException ex) {
-	    Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex);
+	public static FileConfig init(File file) {
+		return FileConfig.loadConfiguration(file);
 	}
-	return config;
-    }
 
-    protected final DumperOptions yamlOptions = new DumperOptions();
-
-    protected final Representer yamlRepresenter = new YamlRepresenter();
-
-    protected final Yaml yaml = new Yaml(new YamlConstructor(),
-	    yamlRepresenter, yamlOptions);
-
-    @Override
-    public void load(File file) throws FileNotFoundException, IOException,
-	    InvalidConfigurationException {
-	Validate.notNull(file, "File cannot be null");
-	final FileInputStream stream = new FileInputStream(file);
-	load(new InputStreamReader(stream, Charsets.UTF_8));
-    }
-
-    @Override
-    public void save(File file) throws IOException {
-	Validate.notNull(file, "File cannot be null");
-	Files.createParentDirs(file);
-	String data = saveToString();
-	Writer writer = new OutputStreamWriter(new FileOutputStream(file),
-		Charsets.UTF_8);
-	try {
-	    writer.write(data);
-	} finally {
-	    writer.close();
+	public static FileConfig loadConfiguration(File file) {
+		Validate.notNull(file, "File cannot be null");
+		FileConfig config = new FileConfig();
+		try {
+			config.load(file);
+		} catch (FileNotFoundException ex) {
+		} catch (IOException ex) {
+			Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex);
+		} catch (InvalidConfigurationException ex) {
+			Bukkit.getLogger().log(Level.SEVERE, "Cannot load " + file, ex);
+		}
+		return config;
 	}
-    }
 
-    @Override
-    public String saveToString() {
-	yamlOptions.setIndent(options().indent());
-	yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-	yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-	String header = buildHeader();
-	String dump = yaml.dump(getValues(false));
-	if (dump.equals(BLANK_CONFIG)) {
-	    dump = "";
+	protected final DumperOptions yamlOptions = new DumperOptions();
+
+	protected final Representer yamlRepresenter = new YamlRepresenter();
+
+	protected final Yaml yaml = new Yaml(new YamlConstructor(),
+			yamlRepresenter, yamlOptions);
+
+	@Override
+	public void load(File file) throws FileNotFoundException, IOException,
+	InvalidConfigurationException {
+		Validate.notNull(file, "File cannot be null");
+		final FileInputStream stream = new FileInputStream(file);
+		load(new InputStreamReader(stream, Charsets.UTF_8));
+	}
+	@Override
+	public void load(Reader reader) throws IOException, InvalidConfigurationException {
+		BufferedReader input = (reader instanceof BufferedReader) ? (BufferedReader) reader
+				: new BufferedReader(reader);
+		StringBuilder builder = new StringBuilder();
+		try {
+			String line;
+			while ((line = input.readLine()) != null) {
+				builder.append(line);
+				builder.append('\n');
+			}
+		} finally {
+			input.close();
+		}
+		loadFromString(builder.toString());
+	}
+
+	@Override
+	public void save(File file) throws IOException {
+		Validate.notNull(file, "File cannot be null");
+		Files.createParentDirs(file);
+		String data = saveToString();
+		Writer writer = new OutputStreamWriter(new FileOutputStream(file),
+				Charsets.UTF_8);
+		try {
+			writer.write(data);
+		} finally {
+			writer.close();
+		}
+	}
+
+	@Override
+	public String saveToString() {
+		yamlOptions.setIndent(options().indent());
+		yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+		yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+		String header = buildHeader();
+		String dump = yaml.dump(getValues(false));
+		if (dump.equals(BLANK_CONFIG)) {
+			dump = "";
+		}
+		return header + dump;
 	}
-	return header + dump;
-    }
 }