Chronika/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making MemorySection much more efficient; Addresses BUKKIT-1454

Browse Source
This commit is contained in:
Wesley Wolfe
2012-04-30 16:54:00 -05:00
parent f922cd87be
commit ae518078eb
6 changed files with 137 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
View File

@@ -7,6 +7,7 @@ import java.io.InputStream;
import java.util.Map;
import java.util.logging.Level;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.ConfigurationSection;
@@ -44,9 +45,7 @@ public class YamlConfiguration extends FileConfiguration {
@Override
public void loadFromString(String contents) throws InvalidConfigurationException {
if (contents == null) {
throw new IllegalArgumentException("Contents cannot be null");
}
Validate.notNull(contents, "Contents cannot be null");
Map<?, ?> input;
try {
@@ -167,9 +166,7 @@ public class YamlConfiguration extends FileConfiguration {
* @throws IllegalArgumentException Thrown is file is null
*/
public static YamlConfiguration loadConfiguration(File file) {
if (file == null) {
throw new IllegalArgumentException("File cannot be null");
}
Validate.notNull(file, "File cannot be null");
YamlConfiguration config = new YamlConfiguration();
@@ -196,9 +193,7 @@ public class YamlConfiguration extends FileConfiguration {
* @throws IllegalArgumentException Thrown is stream is null
*/
public static YamlConfiguration loadConfiguration(InputStream stream) {
if (stream == null) {
throw new IllegalArgumentException("Stream cannot be null");
}
Validate.notNull(stream, "Stream cannot be null");
YamlConfiguration config = new YamlConfiguration();