From e630d509ed35e0d65ef1ba8dfd1968e288a42cac Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 18 Oct 2013 14:50:12 +0200 Subject: [PATCH] Add in lazy option without implementing it. --- src/com/massivecraft/mcore/MCoreConf.java | 7 ++----- src/com/massivecraft/mcore/MCoreConfColl.java | 4 ++-- src/com/massivecraft/mcore/store/Coll.java | 15 ++++++++++----- .../massivecraft/mcore/store/CollInterface.java | 7 +++++-- src/com/massivecraft/mcore/store/SenderColl.java | 10 +++++----- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/com/massivecraft/mcore/MCoreConf.java b/src/com/massivecraft/mcore/MCoreConf.java index 3497b642..113e3e82 100644 --- a/src/com/massivecraft/mcore/MCoreConf.java +++ b/src/com/massivecraft/mcore/MCoreConf.java @@ -5,7 +5,6 @@ import java.util.Map; import org.bukkit.permissions.Permissible; -import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.store.Entity; import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.PermUtil; @@ -16,10 +15,8 @@ public class MCoreConf extends Entity // META // -------------------------------------------- // - public static MCoreConf get() - { - return MCoreConfColl.get().get(MCore.INSTANCE); - } + protected static transient MCoreConf i; + public static MCoreConf get() { return i; } // -------------------------------------------- // // OVERRIDE diff --git a/src/com/massivecraft/mcore/MCoreConfColl.java b/src/com/massivecraft/mcore/MCoreConfColl.java index f04836d6..3d0ba317 100644 --- a/src/com/massivecraft/mcore/MCoreConfColl.java +++ b/src/com/massivecraft/mcore/MCoreConfColl.java @@ -14,7 +14,7 @@ public class MCoreConfColl extends Coll public static MCoreConfColl get() { return i; } private MCoreConfColl() { - super("mcore_conf", MCoreConf.class, MStore.getDb(ConfServer.dburi), MCore.get(), true, false); + super("mcore_conf", MCoreConf.class, MStore.getDb(ConfServer.dburi), MCore.get()); } // -------------------------------------------- // @@ -25,7 +25,7 @@ public class MCoreConfColl extends Coll public void init() { super.init(); - this.get(MCore.INSTANCE); + MCoreConf.i = this.get(MCore.INSTANCE, true); } @Override diff --git a/src/com/massivecraft/mcore/store/Coll.java b/src/com/massivecraft/mcore/store/Coll.java index 691031ee..cc78583a 100644 --- a/src/com/massivecraft/mcore/store/Coll.java +++ b/src/com/massivecraft/mcore/store/Coll.java @@ -153,7 +153,11 @@ public class Coll implements CollInterface // -------------------------------------------- // // BEHAVIOR // -------------------------------------------- // - + + protected boolean lazy; + @Override public boolean isLazy() { return this.lazy; } + @Override public void setLazy(boolean lazy) { this.lazy = lazy; } + protected boolean creative; @Override public boolean isCreative() { return this.creative; } @Override public void setCreative(boolean creative) { this.creative = creative; } @@ -754,7 +758,7 @@ public class Coll implements CollInterface // CONSTRUCT // -------------------------------------------- // - public Coll(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing, Comparator idComparator, Comparator entityComparator) + public Coll(String name, Class entityClass, Db db, Plugin plugin, boolean lazy, boolean creative, boolean lowercasing, Comparator idComparator, Comparator entityComparator) { // Setup the name and the parsed parts this.name = name; @@ -771,6 +775,7 @@ public class Coll implements CollInterface // WHAT DO WE HANDLE? this.entityClass = entityClass; + this.lazy = lazy; this.creative = creative; this.lowercasing = lowercasing; @@ -800,14 +805,14 @@ public class Coll implements CollInterface }; } - public Coll(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing) + public Coll(String name, Class entityClass, Db db, Plugin plugin, boolean lazy, boolean creative, boolean lowercasing) { - this(name, entityClass, db, plugin, creative, lowercasing, null, null); + this(name, entityClass, db, plugin, lazy, creative, lowercasing, null, null); } public Coll(String name, Class entityClass, Db db, Plugin plugin) { - this(name, entityClass, db, plugin, false, false); + this(name, entityClass, db, plugin, false, false, false); } @Override diff --git a/src/com/massivecraft/mcore/store/CollInterface.java b/src/com/massivecraft/mcore/store/CollInterface.java index c38f02df..5d184c2f 100644 --- a/src/com/massivecraft/mcore/store/CollInterface.java +++ b/src/com/massivecraft/mcore/store/CollInterface.java @@ -52,11 +52,14 @@ public interface CollInterface // BEHAVIOR // -------------------------------------------- // + public boolean isLazy(); + public void setLazy(boolean lazy); + public boolean isCreative(); - public void setCreative(boolean val); + public void setCreative(boolean creative); public boolean isLowercasing(); - public void setLowercasing(boolean val); + public void setLowercasing(boolean lowercasing); // A default entity will not be saved. // This is often used together with creative collections to save disc space. diff --git a/src/com/massivecraft/mcore/store/SenderColl.java b/src/com/massivecraft/mcore/store/SenderColl.java index 51bd1c9d..c3a14928 100644 --- a/src/com/massivecraft/mcore/store/SenderColl.java +++ b/src/com/massivecraft/mcore/store/SenderColl.java @@ -25,19 +25,19 @@ public class SenderColl> extends Coll implements Se // CONSTRUCT // -------------------------------------------- // - public SenderColl(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing, Comparator idComparator, Comparator entityComparator) + public SenderColl(String name, Class entityClass, Db db, Plugin plugin, boolean lazy, boolean creative, boolean lowercasing, Comparator idComparator, Comparator entityComparator) { - super(name, entityClass, db, plugin, creative, lowercasing, idComparator, entityComparator); + super(name, entityClass, db, plugin, lazy, creative, lowercasing, idComparator, entityComparator); } - public SenderColl(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing) + public SenderColl(String name, Class entityClass, Db db, Plugin plugin, boolean lazy, boolean creative, boolean lowercasing) { - super(name, entityClass, db, plugin, creative, lowercasing); + super(name, entityClass, db, plugin, lazy, creative, lowercasing); } public SenderColl(String name, Class entityClass, Db db, Plugin plugin) { - super(name, entityClass, db, plugin, true, true); + super(name, entityClass, db, plugin, true, true, true); } // -------------------------------------------- //