diff --git a/src/com/massivecraft/massivecore/store/CollAbstract.java b/src/com/massivecraft/massivecore/store/CollAbstract.java index 8d606e05..c6b53b61 100644 --- a/src/com/massivecraft/massivecore/store/CollAbstract.java +++ b/src/com/massivecraft/massivecore/store/CollAbstract.java @@ -1,5 +1,6 @@ package com.massivecraft.massivecore.store; +import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map.Entry; @@ -57,17 +58,46 @@ public abstract class CollAbstract implements CollInterface return this.containsIdFixed(this.fixId(oid)); } - @Override public List getAll(Predictate where) { return MUtil.transform(this.getAll(), where); } - @Override public List getAll(Predictate where, Comparator orderby) { return MUtil.transform(this.getAll(), where, orderby); } - @Override public List getAll(Predictate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(), where, orderby, limit); } + @Override public List getAll(Iterable oids, Predictate where, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), where, orderby, limit, offset); } + @Override public List getAll(Iterable oids, Predictate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(oids), where, orderby, limit); } + @Override public List getAll(Iterable oids, Predictate where, Comparator orderby) { return MUtil.transform(this.getAll(oids), where, orderby); } + @Override public List getAll(Iterable oids, Predictate where, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), where, limit, offset); } + @Override public List getAll(Iterable oids, Predictate where, Integer limit) { return MUtil.transform(this.getAll(oids), where, limit); } + @Override public List getAll(Iterable oids, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), limit, offset); } + @Override public List getAll(Iterable oids, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(oids), limit); } + @Override public List getAll(Iterable oids, Predictate where) { return MUtil.transform(this.getAll(oids), where); } + @Override public List getAll(Iterable oids, Comparator orderby) { return MUtil.transform(this.getAll(oids), orderby); } + @Override public List getAll(Iterable oids, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), limit, offset); } + @Override public List getAll(Iterable oids, Integer limit) { return MUtil.transform(this.getAll(oids), limit); } + + @Override public List getAll(Iterable oids) + { + // Return Create + List ret = new ArrayList(); + + // Return Fill + for (Object oid : oids) + { + E e = this.get(oid); + if (e == null) continue; + ret.add(e); + } + + // Return Return + return ret; + } + @Override public List getAll(Predictate where, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), where, orderby, limit, offset); } - @Override public List getAll(Predictate where, Integer limit) { return MUtil.transform(this.getAll(), where, limit); } + @Override public List getAll(Predictate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(), where, orderby, limit); } + @Override public List getAll(Predictate where, Comparator orderby) { return MUtil.transform(this.getAll(), where, orderby); } @Override public List getAll(Predictate where, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), where, limit, offset); } + @Override public List getAll(Predictate where, Integer limit) { return MUtil.transform(this.getAll(), where, limit); } + @Override public List getAll(Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), limit, offset); } + @Override public List getAll(Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(), limit); } + @Override public List getAll(Predictate where) { return MUtil.transform(this.getAll(), where); } @Override public List getAll(Comparator orderby) { return MUtil.transform(this.getAll(), orderby); } - @Override public List getAll(Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(), orderby, limit); } - @Override public List getAll(Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), orderby, limit, offset); } - @Override public List getAll(Integer limit) { return MUtil.transform(this.getAll(), limit); } @Override public List getAll(Integer limit, Integer offset) { return MUtil.transform(this.getAll(), limit, offset); } + @Override public List getAll(Integer limit) { return MUtil.transform(this.getAll(), limit); } // -------------------------------------------- // // BEHAVIOR diff --git a/src/com/massivecraft/massivecore/store/CollInterface.java b/src/com/massivecraft/massivecore/store/CollInterface.java index d4bd1599..f3449633 100644 --- a/src/com/massivecraft/massivecore/store/CollInterface.java +++ b/src/com/massivecraft/massivecore/store/CollInterface.java @@ -53,18 +53,32 @@ public interface CollInterface public boolean containsEntity(Object entity); public Collection getAll(); - public List getAll(Predictate where); - public List getAll(Predictate where, Comparator orderby); - public List getAll(Predictate where, Comparator orderby, Integer limit); - public List getAll(Predictate where, Comparator orderby, Integer limit, Integer offset); - public List getAll(Predictate where, Integer limit); - public List getAll(Predictate where, Integer limit, Integer offset); - public List getAll(Comparator orderby); - public List getAll(Comparator orderby, Integer limit); - public List getAll(Comparator orderby, Integer limit, Integer offset); - public List getAll(Integer limit); - public List getAll(Integer limit, Integer offset); + public List getAll(Iterable oids, Predictate where, Comparator orderby, Integer limit, Integer offset); + public List getAll(Iterable oids, Predictate where, Comparator orderby, Integer limit); + public List getAll(Iterable oids, Predictate where, Comparator orderby); + public List getAll(Iterable oids, Predictate where, Integer limit, Integer offset); + public List getAll(Iterable oids, Predictate where, Integer limit); + public List getAll(Iterable oids, Comparator orderby, Integer limit, Integer offset); + public List getAll(Iterable oids, Comparator orderby, Integer limit); + public List getAll(Iterable oids, Predictate where); + public List getAll(Iterable oids, Comparator orderby); + public List getAll(Iterable oids, Integer limit, Integer offset); + public List getAll(Iterable oids, Integer limit); + public List getAll(Iterable oids); + + public List getAll(Predictate where, Comparator orderby, Integer limit, Integer offset); + public List getAll(Predictate where, Comparator orderby, Integer limit); + public List getAll(Predictate where, Comparator orderby); + public List getAll(Predictate where, Integer limit, Integer offset); + public List getAll(Predictate where, Integer limit); + public List getAll(Comparator orderby, Integer limit, Integer offset); + public List getAll(Comparator orderby, Integer limit); + public List getAll(Predictate where); + public List getAll(Comparator orderby); + public List getAll(Integer limit, Integer offset); + public List getAll(Integer limit); + // -------------------------------------------- // // BEHAVIOR // -------------------------------------------- //