Add added/removed signals on the NodeList class.

.gitignore

@@ -22,6 +22,12 @@ bin-release/*
 .sourceMate
 .sourceMateMetadataSettings
 
+# IntelliJ
+.idea
+*.iml
+*.ipr
+*.iws
+
 # OS X
 Icon
 Thumbs.db

examples/no-dependencies/asteroids/net/richardlord/asteroids/Asteroids.as

@@ -1,5 +1,6 @@
 package net.richardlord.asteroids
 {
+	import flash.display.DisplayObjectContainer;
 	import net.richardlord.ash.core.Game;
 	import net.richardlord.ash.tick.FrameTickProvider;
 	import net.richardlord.asteroids.components.GameState;
@@ -11,9 +12,8 @@ package net.richardlord.asteroids
 	import net.richardlord.asteroids.systems.MovementSystem;
 	import net.richardlord.asteroids.systems.RenderSystem;
 	import net.richardlord.asteroids.systems.SystemPriorities;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
-	import flash.display.DisplayObjectContainer;
 
 
 	public class Asteroids

examples/no-dependencies/asteroids/net/richardlord/asteroids/EntityCreator.as

@@ -28,11 +28,6 @@ package net.richardlord.asteroids
 
 		public function destroyEntity( entity : Entity ) : void
 		{
-			if ( entity.has( Display ) )
-			{
-				var display : Display = entity.get( Display );
-				display.displayObject.parent.removeChild( display.displayObject );
-			}
 			game.removeEntity( entity );
 		}
 

examples/no-dependencies/asteroids/net/richardlord/asteroids/systems/GunControlSystem.as

@@ -8,7 +8,7 @@ package net.richardlord.asteroids.systems
 	import net.richardlord.asteroids.components.GunControls;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.GunControlNode;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
 	public class GunControlSystem extends System
 	{

examples/no-dependencies/asteroids/net/richardlord/asteroids/systems/MotionControlSystem.as

@@ -7,7 +7,7 @@ package net.richardlord.asteroids.systems
 	import net.richardlord.asteroids.components.MotionControls;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.MotionControlNode;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
 	public class MotionControlSystem extends System
 	{

examples/no-dependencies/asteroids/net/richardlord/asteroids/systems/RenderSystem.as

@@ -25,6 +25,18 @@ package net.richardlord.asteroids.systems
 		override public function addToGame( game : Game ) : void
 		{
 			nodes = game.getFamily( RenderNode );
+			nodes.nodeAdded.add( addToDisplay );
+			nodes.nodeRemoved.add( removeFromDisplay );
+		}
+
+		private function addToDisplay( node : RenderNode ) : void
+		{
+			container.addChild( node.display.displayObject );
+		}
+
+		private function removeFromDisplay( node : RenderNode ) : void
+		{
+			container.removeChild( node.display.displayObject );
 		}
 
 		override public function update( time : Number ) : void
@@ -40,10 +52,6 @@ package net.richardlord.asteroids.systems
 				displayObject = display.displayObject;
 				position = node.position;
 
-				if( !displayObject.parent )
-				{
-					container.addChild( displayObject );
-				}
 				displayObject.x = position.position.x;
 				displayObject.y = position.position.y;
 				displayObject.rotation = position.rotation * 180 / Math.PI;

examples/no-dependencies/asteroids/net/richardlord/utils/KeyPoll.as → examples/no-dependencies/asteroids/net/richardlord/input/KeyPoll.as

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-package net.richardlord.utils
+package net.richardlord.input
 {
 	import flash.events.KeyboardEvent;
 	import flash.events.Event;

examples/robotlegs/asteroids/net/richardlord/asteroids/EntityCreator.as

@@ -28,11 +28,6 @@ package net.richardlord.asteroids
 
 		public function destroyEntity( entity : Entity ) : void
 		{
-			if ( entity.has( Display ) )
-			{
-				var display : Display = entity.get( Display );
-				display.displayObject.parent.removeChild( display.displayObject );
-			}
 			game.removeEntity( entity );
 		}
 

examples/robotlegs/asteroids/net/richardlord/asteroids/StartAsteroids.as

@@ -13,10 +13,10 @@ package net.richardlord.asteroids
 	import net.richardlord.asteroids.systems.MovementSystem;
 	import net.richardlord.asteroids.systems.RenderSystem;
 	import net.richardlord.asteroids.systems.SystemPriorities;
-	import net.richardlord.utils.KeyPoll;
-
+	import net.richardlord.input.KeyPoll;
 	import org.swiftsuspenders.Injector;
 
+
 	public class StartAsteroids
 	{
 		[Inject]

examples/robotlegs/asteroids/net/richardlord/asteroids/systems/GunControlSystem.as

@@ -7,7 +7,7 @@ package net.richardlord.asteroids.systems
 	import net.richardlord.asteroids.components.GunControls;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.GunControlNode;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
 	public class GunControlSystem extends System
 	{

examples/robotlegs/asteroids/net/richardlord/asteroids/systems/MotionControlSystem.as

@@ -6,7 +6,7 @@ package net.richardlord.asteroids.systems
 	import net.richardlord.asteroids.components.MotionControls;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.MotionControlNode;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
 	public class MotionControlSystem extends System
 	{

examples/robotlegs/asteroids/net/richardlord/asteroids/systems/RenderSystem.as

@@ -1,13 +1,14 @@
 package net.richardlord.asteroids.systems
 {
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
 	import net.richardlord.ash.core.NodeList;
 	import net.richardlord.ash.core.System;
 	import net.richardlord.asteroids.components.Display;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.RenderNode;
 
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+
 
 	public class RenderSystem extends System
 	{
@@ -17,6 +18,23 @@ package net.richardlord.asteroids.systems
 		[Inject(nodeType="net.richardlord.asteroids.nodes.RenderNode")]
 		public var nodes : NodeList;
 
+		[PostConstruct]
+		public function setUpListeners() : void
+		{
+			nodes.nodeAdded.add( addToDisplay );
+			nodes.nodeRemoved.add( removeFromDisplay );
+		}
+
+		private function addToDisplay( node : RenderNode ) : void
+		{
+			container.addChild( node.display.displayObject );
+		}
+
+		private function removeFromDisplay( node : RenderNode ) : void
+		{
+			container.removeChild( node.display.displayObject );
+		}
+
 		override public function update( time : Number ) : void
 		{
 			var node : RenderNode;

examples/robotlegs/asteroids/net/richardlord/utils/KeyPoll.as → examples/robotlegs/asteroids/net/richardlord/input/KeyPoll.as

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-package net.richardlord.utils
+package net.richardlord.input
 {
 	import flash.events.KeyboardEvent;
 	import flash.events.Event;

examples/swiftsuspenders/asteroids/net/richardlord/asteroids/Asteroids.as

@@ -1,5 +1,6 @@
 package net.richardlord.asteroids
 {
+	import flash.display.DisplayObjectContainer;
 	import net.richardlord.ash.core.Game;
 	import net.richardlord.ash.integration.swiftsuspenders.SwiftSuspendersGame;
 	import net.richardlord.ash.tick.FrameTickProvider;
@@ -12,11 +13,10 @@ package net.richardlord.asteroids
 	import net.richardlord.asteroids.systems.MovementSystem;
 	import net.richardlord.asteroids.systems.RenderSystem;
 	import net.richardlord.asteroids.systems.SystemPriorities;
-	import net.richardlord.utils.KeyPoll;
-
+	import net.richardlord.input.KeyPoll;
 	import org.swiftsuspenders.Injector;
 
-	import flash.display.DisplayObjectContainer;
+
 
 	public class Asteroids
 	{

examples/swiftsuspenders/asteroids/net/richardlord/asteroids/EntityCreator.as

@@ -28,11 +28,6 @@ package net.richardlord.asteroids
 
 		public function destroyEntity( entity : Entity ) : void
 		{
-			if ( entity.has( Display ) )
-			{
-				var display : Display = entity.get( Display );
-				display.displayObject.parent.removeChild( display.displayObject );
-			}
 			game.removeEntity( entity );
 		}
 

examples/swiftsuspenders/asteroids/net/richardlord/asteroids/systems/GunControlSystem.as

@@ -7,7 +7,7 @@ package net.richardlord.asteroids.systems
 	import net.richardlord.asteroids.components.GunControls;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.GunControlNode;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
 	public class GunControlSystem extends System
 	{

examples/swiftsuspenders/asteroids/net/richardlord/asteroids/systems/MotionControlSystem.as

@@ -6,7 +6,7 @@ package net.richardlord.asteroids.systems
 	import net.richardlord.asteroids.components.MotionControls;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.MotionControlNode;
-	import net.richardlord.utils.KeyPoll;
+	import net.richardlord.input.KeyPoll;
 
 	public class MotionControlSystem extends System
 	{

examples/swiftsuspenders/asteroids/net/richardlord/asteroids/systems/RenderSystem.as

@@ -1,13 +1,14 @@
 package net.richardlord.asteroids.systems
 {
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
 	import net.richardlord.ash.core.NodeList;
 	import net.richardlord.ash.core.System;
 	import net.richardlord.asteroids.components.Display;
 	import net.richardlord.asteroids.components.Position;
 	import net.richardlord.asteroids.nodes.RenderNode;
 
+	import flash.display.DisplayObject;
+	import flash.display.DisplayObjectContainer;
+
 
 	public class RenderSystem extends System
 	{
@@ -17,6 +18,23 @@ package net.richardlord.asteroids.systems
 		[Inject(nodeType="net.richardlord.asteroids.nodes.RenderNode")]
 		public var nodes : NodeList;
 
+		[PostConstruct]
+		public function setUpListeners() : void
+		{
+			nodes.nodeAdded.add( addToDisplay );
+			nodes.nodeRemoved.add( removeFromDisplay );
+		}
+
+		private function addToDisplay( node : RenderNode ) : void
+		{
+			container.addChild( node.display.displayObject );
+		}
+
+		private function removeFromDisplay( node : RenderNode ) : void
+		{
+			container.removeChild( node.display.displayObject );
+		}
+
 		override public function update( time : Number ) : void
 		{
 			var node : RenderNode;

examples/swiftsuspenders/asteroids/net/richardlord/utils/KeyPoll.as → examples/swiftsuspenders/asteroids/net/richardlord/input/KeyPoll.as

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-package net.richardlord.utils
+package net.richardlord.input
 {
 	import flash.events.KeyboardEvent;
 	import flash.events.Event;

src/net/richardlord/ash/core/NodeList.as

@@ -1,11 +1,21 @@
 package net.richardlord.ash.core
 {
+	import net.richardlord.ash.signals.Signal1;
 
 	public class NodeList
 	{
 		public var head : *;
 		public var tail : *;
 
+		public var nodeAdded : Signal1;
+		public var nodeRemoved : Signal1;
+
+		public function NodeList()
+		{
+			nodeAdded = new Signal1( Node );
+			nodeRemoved = new Signal1( Node );
+		}
+
 		public function add( node : Node ) : void
 		{
 			if( ! head )
@@ -18,6 +28,7 @@ package net.richardlord.ash.core
 				node.previous = tail;
 				tail = node;
 			}
+			nodeAdded.dispatch( node );
 		}
 
 		public function remove( node : Node ) : void
@@ -40,6 +51,7 @@ package net.richardlord.ash.core
 			{
 				node.next.previous = node.previous;
 			}
+			nodeRemoved.dispatch( node );
 		}
 
 		public function get empty() : Boolean

test/src/net/richardlord/ash/core/FamilyTests.as

@@ -194,6 +194,51 @@ package net.richardlord.ash.core
 			}
 			assertThat( entities, emptyArray() );
 		}
+
+		[Test]
+		public function addingNodeTriggersAddedSignal() : void
+		{
+			var nodes : NodeList = new NodeList();
+			var node : MockNode = new MockNode();
+			nodes.nodeAdded.add( async.add() );
+			nodes.add( node );
+		}
+
+		[Test]
+		public function removingNodeTriggersRemovedSignal() : void
+		{
+			var nodes : NodeList = new NodeList();
+			var node : MockNode = new MockNode();
+			nodes.add( node );
+			nodes.nodeRemoved.add( async.add() );
+			nodes.remove( node );
+		}
+
+		private var tempNode : Node;
+
+		[Test]
+		public function componentAddedSignalContainsCorrectParameters() : void
+		{
+			var nodes : NodeList = new NodeList();
+			tempNode = new MockNode();
+			nodes.nodeAdded.add( async.add( testSignalContent, 10 ) );
+			nodes.add( tempNode );
+		}
+
+		[Test]
+		public function componentRemovedSignalContainsCorrectParameters() : void
+		{
+			var nodes : NodeList = new NodeList();
+			tempNode = new MockNode();
+			nodes.add( tempNode );
+			nodes.nodeRemoved.add( async.add( testSignalContent, 10 ) );
+			nodes.remove( tempNode );
+		}
+
+		private function testSignalContent( signalNode : Node ) : void
+		{
+			assertThat( signalNode, sameInstance( tempNode ) );
+		}
 	}
 }
 import net.richardlord.ash.core.Node;