include changes to aspect for default base aspect in artemis-gwt

artemis-backend-gwt/artemis-gwt/src/main/java/com/artemis/backends/gwt/emu/com/artemis/Aspect.java

@@ -1,6 +1,7 @@
 package com.artemis;
 
 import com.artemis.utils.BitVector;
+import java.lang.Iterable;
 import java.util.Collection;
 
 import com.artemis.utils.Bag;
@@ -212,14 +213,29 @@ public static Aspect.Builder one(Class<? extends Component>... types) {
 	public static Aspect.Builder one(Collection<Class<? extends Component>> types) {
 		return new Builder().one(types);
 	}
+
+    /**
+     * Changes whether the default aspect will be applied to this aspect 
+     * when used for a subscription.
+     * 
+     * @param defaults 
+     *          whether to apply default aspect
+     * 
+     * @return an aspect that will have the default aspect applied to it 
+     *          depending on the value.
+     */
+    public static Builder defaults(boolean defaults) {
+        return new Builder().defaults(defaults);
+    }
 
 	/**
 	 * Constructs instances of {@link Aspect}.
 	 */
 	public static class Builder {
-		private final Bag<Class<? extends Component>> allTypes;
-		private final Bag<Class<? extends Component>> exclusionTypes;
-		private final Bag<Class<? extends Component>> oneTypes;
+		final Bag<Class<? extends Component>> allTypes;
+		final Bag<Class<? extends Component>> exclusionTypes;
+		final Bag<Class<? extends Component>> oneTypes;
+        boolean defaults = true;
 
 		private Builder() {
 			allTypes = new Bag<Class<? extends Component>>();
@@ -251,6 +267,7 @@ public Builder copy() {
 			b.allTypes.addAll(allTypes);
 			b.exclusionTypes.addAll(exclusionTypes);
 			b.oneTypes.addAll(oneTypes);
+            b.defaults = defaults;
 			return b;
 		}
 
@@ -263,7 +280,7 @@ public Builder copy() {
 		 *
 		 * @return an aspect that can be matched against entities
 		 */
-		public Builder all(Collection<Class<? extends Component>> types) {
+		public Builder all(Iterable<Class<? extends Component>> types) {
 			for (Class<? extends Component> t : types) {
 				allTypes.add(t);
 			}
@@ -296,7 +313,7 @@ public Builder one(Class<? extends Component>... types) {
 		 *
 		 * @return an aspect that can be matched against entities
 		 */
-		public Builder one(Collection<Class<? extends Component>> types) {
+		public Builder one(Iterable<Class<? extends Component>> types) {
 			for (Class<? extends Component> t : types)
 				oneTypes.add(t);
 
@@ -335,12 +352,28 @@ public Builder exclude(Class<? extends Component>... types) {
 		 *
 		 * @return an aspect that can be matched against entities
 		 */
-		public Builder exclude(Collection<Class<? extends Component>> types) {
+		public Builder exclude(Iterable<Class<? extends Component>> types) {
 			for (Class<? extends Component> t : types)
 				exclusionTypes.add(t);
 
 			return this;
 		}
+
+        /**
+         * Changes whether the default aspect will be applied to this aspect 
+         * when used for a subscription.
+         * 
+         * @param defaults 
+         *          whether to apply default aspect
+         * 
+         * @return an aspect that will have the default aspect applied to it 
+         *          depending on the value.
+         */
+        public Builder defaults(boolean defaults) {
+            this.defaults = defaults;
+
+            return this;
+        }
 
 		/**
 		 * Bake an aspect.
@@ -394,6 +427,7 @@ public String toString() {
 				"all=" + append(allTypes) +
 				", one=" + append(oneTypes) +
 				", exclude=" + append(exclusionTypes) +
+                ", defaults=" + defaults +
 				']';
 		}