Only fetch from a query's mapped source

danschultz · Sep 22, 2011 · f0d9fb3 · f0d9fb3
1 parent b33bf3f
commit f0d9fb3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/src/mesh/model/source/FixtureSource.as b/src/mesh/model/source/FixtureSource.as
@@ -64,23 +64,21 @@ package mesh.model.source
 		 */
 		override public function fetch(request:AsyncRequest, query:Query):void
 		{
-			if (query.entityType == _entityType) {
-				var entities:Array = [];
-				for each (var hash:Object in _fixtures) {
-					var entity:Entity = newInstance(_entityType);
-					entity.fromObject(hash);
-					entities.push(entity);
-				}
-
-				if (query is RemoteQuery) {
-					entities = entities.filter(function(entity:Entity, ...args):Boolean
-					{
-						return query.contains(entity);
-					});
-				}
-
-				request.result(new ArrayList(entities));
+			var entities:Array = [];
+			for each (var hash:Object in _fixtures) {
+				var entity:Entity = newInstance(_entityType);
+				entity.fromObject(hash);
+				entities.push(entity);
+			}
+
+			if (query is RemoteQuery) {
+				entities = entities.filter(function(entity:Entity, ...args):Boolean
+				{
+					return query.contains(entity);
+				});
 			}
+
+			request.result(new ArrayList(entities));
 		}
 
 		/**

diff --git a/src/mesh/model/source/MultiSource.as b/src/mesh/model/source/MultiSource.as
@@ -85,9 +85,7 @@ package mesh.model.source
 		 */
 		override public function fetch(request:AsyncRequest, query:Query):void
 		{
-			for each (var source:Source in _mapping) {
-				source.fetch(request, query);
-			}
+			sourceFor(query.entityType).fetch(request, query);
 		}
 
 		/**