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

18
src/main/java/org/bukkit/configuration/MemoryConfiguration.java
View File

@@ -2,6 +2,8 @@ package org.bukkit.configuration;
import java.util.Map;
import org.apache.commons.lang.Validate;
/**
* This is a {@link Configuration} implementation that does not save or load
* from any source, and stores all values in memory only.
@@ -29,9 +31,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
@Override
public void addDefault(String path, Object value) {
if (path == null) {
throw new IllegalArgumentException("Path may not be null");
}
Validate.notNull(path, "Path may not be null");
if (defaults == null) {
defaults = new MemoryConfiguration();
@@ -41,9 +41,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
}
public void addDefaults(Map<String, Object> defaults) {
if (defaults == null) {
throw new IllegalArgumentException("Defaults may not be null");
}
Validate.notNull(defaults, "Defaults may not be null");
for (Map.Entry<String, Object> entry : defaults.entrySet()) {
addDefault(entry.getKey(), entry.getValue());
@@ -51,17 +49,13 @@ public class MemoryConfiguration extends MemorySection implements Configuration
}
public void addDefaults(Configuration defaults) {
if (defaults == null) {
throw new IllegalArgumentException("Defaults may not be null");
}
Validate.notNull(defaults, "Defaults may not be null");
addDefaults(defaults.getValues(true));
}
public void setDefaults(Configuration defaults) {
if (defaults == null) {
throw new IllegalArgumentException("Defaults may not be null");
}
Validate.notNull(defaults, "Defaults may not be null");
this.defaults = defaults;
}