Mapping same proxy under different id improved.

Author: MindScriptAct

sampleProjects/com/mindScriptAct/codeSnippets/SpriteModuleTest.as

@@ -1,4 +1,5 @@
 package com.mindScriptAct.codeSnippets {
+import com.mindScriptAct.codeSnippets.controller.ManyInjectsCommand;
 import com.mindScriptAct.codeSnippets.controller.params.ComplexParams;
 import com.mindScriptAct.codeSnippets.controller.SampleCommand;
 import com.mindScriptAct.codeSnippets.messages.DataMsg;
@@ -12,6 +13,7 @@ import com.mindScriptAct.codeSnippets.view.keyboard.KeyboardMediator;
 import com.mindScriptAct.codeSnippets.view.MainAppMediator;
 import flash.display.StageAlign;
 import flash.display.StageScaleMode;
+import flash.utils.Proxy;
 import flash.utils.setTimeout;
 import org.mvcexpress.modules.ModuleSprite;
 import org.mvcexpress.MvcExpress;
@@ -54,10 +56,14 @@ public class SpriteModuleTest extends ModuleSprite {
 		proxyMap.map(new SampleEmptyProxy("Named proxy"), SampleEmptyProxy, "namedSampleProxy");
 		proxyMap.map(new SampleEmptyProxy("Named and interfaced proxy"), ISampleEmptyProxy, "namedSampleInterfacedProxy");
 
-		proxyMap.map(new SampleProxy());
-		proxyMap.map(new SampleProxy(), ISampleProxy);
-		proxyMap.map(new SampleProxy(), SampleProxy, "testType");
-		proxyMap.map(new SampleProxy(), ISampleProxy, "interfaceProxy");
+		var sameSampleProxy:SampleProxy = new SampleProxy()
+		
+		proxyMap.unmap(SampleEmptyProxy);
+		
+		proxyMap.map(sameSampleProxy);
+		proxyMap.map(sameSampleProxy, ISampleProxy);
+		proxyMap.map(sameSampleProxy, SampleProxy, "testType");
+		proxyMap.map(sameSampleProxy, ISampleProxy, "interfaceProxy");
 
 		////////////////////////////
 		// View
@@ -83,6 +89,11 @@ public class SpriteModuleTest extends ModuleSprite {
 		commandMap.execute(SampleCommand, "single execute parameter");
 		commandMap.execute(SampleCommand, new ComplexParams("complex execute parameters"));
 
+		
+		
+		// command with many injects
+		commandMap.execute(ManyInjectsCommand);
+		
 		////////////////////////////
 		// comunication
 		////////////////////////////

sampleProjects/com/mindScriptAct/codeSnippets/controller/ManyInjectsCommand.as

@@ -0,0 +1,29 @@
+package com.mindScriptAct.codeSnippets.controller {
+import com.mindScriptAct.codeSnippets.model.ISampleProxy;
+import com.mindScriptAct.codeSnippets.model.SampleProxy;
+import org.mvcexpress.mvc.Command;
+	
+/**
+ * TODO:CLASS COMMENT
+ * @author Raimundas Banevicius ([email protected])
+ */
+public class ManyInjectsCommand extends Command{
+	
+	[Inject]
+	public var sample:SampleProxy;
+	
+	[Inject]
+	public var sampleInterface:ISampleProxy;	
+	
+	[Inject(name='testType')]
+	public var sampleNamed:SampleProxy;
+	
+	[Inject(name='interfaceProxy')]
+	public var sampleInterfaceNamed:ISampleProxy;		
+	
+	public function execute(blank:Object):void {
+		trace( "ManyInjectsCommand.execute > blank : " + blank );
+	}
+	
+}
+}

sampleProjects/com/mindScriptAct/codeSnippets/model/SampleProxy.as

@@ -11,13 +11,16 @@ public class SampleProxy extends Proxy implements ISampleProxy {
 	////////////////////////////
 	// geting proxies...
 	////////////////////////////
-	[Inject]
-	public var sampleEmptyProxy:SampleEmptyProxy;
+	//[Inject]
+	//public var sampleEmptyProxy:SampleEmptyProxy;
 
 	[Inject]
 	public var sampleEmptyProxyInterfaced:ISampleEmptyProxy;
 
-	[Inject(namespace = 'namedSampleEmptyProxy')]
+	[Inject(name = 'namedSampleProxy')]
+	public var sampleEmptyProxyNamed:SampleEmptyProxy;	
+	
+	[Inject(name = 'namedSampleInterfacedProxy')]
 	public var sampleEmptyProxyInterfacedAndNamed:ISampleEmptyProxy;
 
 	public var testData:String = "someTestData";
@@ -26,6 +29,11 @@ public class SampleProxy extends Proxy implements ISampleProxy {
 
 	}
 
+	override protected function onRegister():void {
+		trace( "SampleProxy.onRegister" );
+		
+	}
+	
 	public function sendTestMessage():void {
 		sendMessage(Msg.TEST_DATA_MESSAGE, "sent message about proxy change...");
 	}

src/org/mvcexpress/core/ProxyMap.as

@@ -29,9 +29,6 @@ public class ProxyMap implements IProxyMap {
 	/** dictionary of (Vector of PendingInject), it holds array of pending data with proxies and mediators that has pending injections,  stored by needed injection key(className + inject name).  */
 	private var pendingInjectionsRegistry:Dictionary = new Dictionary(); /* of Vector.<PendingInject> by String */
 
-	/** all hosted proxy objects stored by key */
-	static private var hostObjectRegistry:Dictionary = new Dictionary(); /* of HostedProxy by String */
-	
 	/** all hostedProxy data stored by hosted Proxy objects stored */
 	static private var hostedProxyRegistry:Dictionary = new Dictionary(); /* of HostedProxy by Proxy */
 
@@ -66,24 +63,14 @@ public class ProxyMap implements IProxyMap {
 			injectClass = proxyClass;
 		}
 
-		var className:String = getQualifiedClassName(injectClass);
-		if (!injectObjectRegistry[className + name]) {
-			use namespace pureLegsCore;
+		use namespace pureLegsCore;
+		if (proxyObject.messenger == null) {
 			proxyObject.messenger = messenger;
 			proxyObject.setProxyMap(this);
+			
 			// inject dependencies
 			var isAllInjected:Boolean = injectStuff(proxyObject, proxyClass);
-			// store proxy injection to other classes.
-			injectObjectRegistry[className + name] = proxyObject;
-			// check if there is no waiting hosted proxies with this key.
-			if (hostObjectRegistry[className + name]) {
-				// check if hosted object is pending..
-				if (hostObjectRegistry[className + name].proxy) {
-					if (hostObjectRegistry[className + name].proxy != proxyObject) {
-						throw Error("Hosted proxy object is already mapped for:[injectClass:" + className + " name:" + name + "] only one hosted proxy can be mapped at any given time.");
-					}
-				}
-			}
+			
 			// check if there is no pending injection with this key.
 			if (pendingInjectionsRegistry[className + name]) {
 				injectPendingStuff(className + name, proxyObject);
@@ -92,9 +79,17 @@ public class ProxyMap implements IProxyMap {
 			if (isAllInjected) {
 				proxyObject.register();
 			}
+			
+		}
+		
+		var className:String = getQualifiedClassName(injectClass);
+		if (!injectObjectRegistry[className + name]) {
+			// store proxy injection for other classes.
+			injectObjectRegistry[className + name] = proxyObject;
 		} else {
 			throw Error("Proxy object class is already mapped.[injectClass:" + className + " name:" + name + "]");
 		}
+	
 	}
 
 	/**

src/org/mvcexpress/mvc/Proxy.as

@@ -59,8 +59,6 @@ public class Proxy {
 		if (!_isReady) {
 			_isReady = true;
 			onRegister();
-		} else {
-			throw Error("Proxy:" + this + " is already registered. You can register one proxy only once.");
 		}
 	}