Adjust filtering

api/src/main/java/com/github/skjolber/packing/api/ContainerConstraint.java

@@ -1,6 +1,6 @@
 package com.github.skjolber.packing.api;
 
-import com.github.skjolber.packing.api.packager.LoadableFilterBuilder;
+import com.github.skjolber.packing.api.packager.LoadableItemFilterBuilder;
 
 /**
  * 
@@ -10,6 +10,6 @@
 
 public interface ContainerConstraint {
 
-	LoadableFilterBuilder<?> newLoadableFilterBuilder();
+	LoadableItemFilterBuilder<?> newLoadableFilterBuilder();
 
 }

api/src/main/java/com/github/skjolber/packing/api/packager/DefaultLoadableItemFilter.java

@@ -1,27 +1,20 @@
 package com.github.skjolber.packing.api.packager;
-import java.util.List;
 
 public class DefaultLoadableItemFilter implements LoadableItemFilter {
 
-	protected final List<LoadableItem> loadableItems;
+	protected final LoadableItems loadableItems;
 
-	public DefaultLoadableItemFilter(List<LoadableItem> loadableItems) {
+	public DefaultLoadableItemFilter(LoadableItems loadableItems) {
 		this.loadableItems = loadableItems;
 	}
 
 	@Override
-	public List<LoadableItem> getLoadableItems() {
-		return loadableItems;
-	}
-
-	@Override
-	public boolean loaded(int index) {
+	public void loaded(int index) {
 		LoadableItem loadableItem = loadableItems.get(index);
 		loadableItem.decrement();
 		if(loadableItem.isEmpty()) {
 			loadableItems.remove(index);
 		}
-		return false;
 	}
 
 }

api/src/main/java/com/github/skjolber/packing/api/packager/LoadableItem.java

@@ -10,10 +10,12 @@ public class LoadableItem {
 
 	protected Loadable loadable;
 	protected int count;
+	protected int index;
 
-	public LoadableItem(Loadable loadable, int count) {
+	public LoadableItem(Loadable loadable, int count, int index) {
 		this.loadable = loadable;
 		this.count = count;
+		this.index = index;
 	}
 
 	public Loadable getLoadable() {

api/src/main/java/com/github/skjolber/packing/api/packager/LoadableItemFilter.java

@@ -1,7 +1,5 @@
 package com.github.skjolber.packing.api.packager;
 
-import java.util.List;
-
 /**
  * 
  * The items which are available for load into some particular container.
@@ -10,15 +8,14 @@
 
 public interface LoadableItemFilter {
 
-	List<LoadableItem> getLoadableItems();
-
 	/**
 	 * 
-	 * Notify stackable from item was loaded
+	 * Notify loadable was loaded
 	 * 
 	 * @param index
 	 * @return true if some loadable item was excluded due to this loaded item
 	 */
 
-	boolean loaded(int index);
+	void loaded(int index);
+
 }

api/src/main/java/com/github/skjolber/packing/api/packager/LoadableFilterBuilder.java → api/src/main/java/com/github/skjolber/packing/api/packager/LoadableItemFilterBuilder.java

@@ -14,14 +14,14 @@
  */
 
 @SuppressWarnings("unchecked")
-public abstract class LoadableFilterBuilder<B extends LoadableFilterBuilder<B>> {
+public abstract class LoadableItemFilterBuilder<B extends LoadableItemFilterBuilder<B>> {
 
 	protected Stack stack;
 	protected Container container;
 	protected ContainerStackValue stackValue;
-	protected List<LoadableItem> loadableItems;
+	protected LoadableItems loadableItems;
 
-	public B withLoadableItems(List<LoadableItem> loadableItems) {
+	public B withLoadableItems(LoadableItems loadableItems) {
 		this.loadableItems = loadableItems;
 		return (B)this;
 	}

api/src/main/java/com/github/skjolber/packing/api/packager/LoadableItems.java

@@ -0,0 +1,13 @@
+package com.github.skjolber.packing.api.packager;
+
+import java.util.List;
+
+/**
+ * 
+ * The items which are available for load into some particular container.
+ * 
+ */
+
+public interface LoadableItems extends List<LoadableItem>{
+
+}