Cleaned code from most FDT errors and warnings.

MindScriptAct · MindScriptAct · commit 0bd1be945013 · 2012-10-24T10:54:09.000+02:00
diff --git a/src/org/mvcexpress/MvcExpress.as b/src/org/mvcexpress/MvcExpress.as
@@ -17,7 +17,7 @@ public class MvcExpress {
 	/** Current framework minor version */
 	public static const MINOR_VERSION:uint = 0;
 	/** Current framework revision version */
-	public static const REVISION:uint = 2;
+	public static const REVISION:uint = 3;
 	
 	/** Current framework version */
 	public static function get VERSION():String {
diff --git a/src/org/mvcexpress/core/CommandMap.as b/src/org/mvcexpress/core/CommandMap.as
@@ -11,7 +11,6 @@ import org.mvcexpress.core.traceObjects.TraceCommandMap_execute;
 import org.mvcexpress.core.traceObjects.TraceCommandMap_handleCommandExecute;
 import org.mvcexpress.core.traceObjects.TraceCommandMap_map;
 import org.mvcexpress.core.traceObjects.TraceCommandMap_unmap;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.mvc.Command;
 import org.mvcexpress.MvcExpress;
 import org.mvcexpress.utils.checkClassSuperclass;
@@ -213,7 +212,7 @@ public class CommandMap {
 			var parameterCount:int = 0;
 			
 			// TODO : optimize..
-			var methodList:XMLList = classDescription.factory.method //.(name() == "execute");
+			var methodList:XMLList = classDescription.factory.method;
 			for (var i:int = 0; i < methodList.length(); i++) {
 				if (methodList[i].@name == "execute") {
 					hasExecute = true;
diff --git a/src/org/mvcexpress/core/MediatorMap.as b/src/org/mvcexpress/core/MediatorMap.as
@@ -11,7 +11,6 @@ import org.mvcexpress.core.traceObjects.TraceMediatorMap_map;
 import org.mvcexpress.core.traceObjects.TraceMediatorMap_mediate;
 import org.mvcexpress.core.traceObjects.TraceMediatorMap_unmap;
 import org.mvcexpress.core.traceObjects.TraceMediatorMap_unmediate;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.mvc.Mediator;
 import org.mvcexpress.MvcExpress;
 import org.mvcexpress.utils.checkClassSuperclass;
@@ -92,7 +91,7 @@ public class MediatorMap implements IMediatorMap {
 		
 		use namespace pureLegsCore;
 		
-		var viewClass:Class = viewObject.constructor;
+		var viewClass:Class = viewObject.constructor as Class;
 		// if '.constructor' fail to get class - do it using class name. (.constructor is faster but might fail with some object.)
 		if (!viewClass) {
 			viewClass = Class(getDefinitionByName(getQualifiedClassName(viewObject)));
@@ -173,7 +172,7 @@ public class MediatorMap implements IMediatorMap {
 		// debug this action
 		CONFIG::debug {
 			
-			var viewClass:Class = viewObject.constructor;
+			var viewClass:Class = viewObject.constructor as Class;
 			// if '.constructor' fail to get class - do it using class name. (.constructor is faster but might fail with some object.)
 			if (!viewClass) {
 				viewClass = Class(getDefinitionByName(getQualifiedClassName(viewObject)));
diff --git a/src/org/mvcexpress/core/ModuleManager.as b/src/org/mvcexpress/core/ModuleManager.as
@@ -6,7 +6,6 @@ import org.mvcexpress.core.namespace.pureLegsCore;
 import org.mvcexpress.core.traceObjects.MvcTraceActions;
 import org.mvcexpress.core.traceObjects.TraceModuleManager_createModule;
 import org.mvcexpress.core.traceObjects.TraceModuleManager_disposeModule;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.MvcExpress;
 
 /**
@@ -45,7 +44,7 @@ public class ModuleManager {
 			MvcExpress.debug(new TraceModuleManager_createModule(MvcTraceActions.MODULEMANAGER_CREATEMODULE, moduleName, autoInit));
 		}
 		if (moduleRegistry[moduleName] == null) {
-			_moduleId++
+			_moduleId++;
 			//
 			if (!moduleName) {
 				moduleName = "module" + _moduleId;
@@ -131,31 +130,31 @@ public class ModuleManager {
 	
 	static public function listMappedMessages(moduleName:String):String {
 		if (moduleRegistry[moduleName]) {
-			return moduleRegistry[moduleName].listMappedMessages();
+			return (moduleRegistry[moduleName] as ModuleBase).listMappedMessages();
 		} else {
 			return "Module with name :" + moduleName + " is not found.";
 		}
 	}
 	
 	static public function listMappedMediators(moduleName:String):String {
 		if (moduleRegistry[moduleName]) {
-			return moduleRegistry[moduleName].listMappedMediators();
+			return (moduleRegistry[moduleName] as ModuleBase).listMappedMediators();
 		} else {
 			return "Module with name :" + moduleName + " is not found.";
 		}
 	}
 	
 	static public function listMappedProxies(moduleName:String):String {
 		if (moduleRegistry[moduleName]) {
-			return moduleRegistry[moduleName].listMappedProxies();
+			return (moduleRegistry[moduleName] as ModuleBase).listMappedProxies();
 		} else {
 			return "Module with name :" + moduleName + " is not found.";
 		}
 	}
 	
 	static public function listMappedCommands(moduleName:String):String {
 		if (moduleRegistry[moduleName]) {
-			return moduleRegistry[moduleName].listMappedCommands();
+			return (moduleRegistry[moduleName] as ModuleBase).listMappedCommands();
 		} else {
 			return "Module with name :" + moduleName + " is not found.";
 		}
@@ -164,7 +163,7 @@ public class ModuleManager {
 	static pureLegsCore function listModuleMessageCommands(moduleName:String, key:String):String {
 		use namespace pureLegsCore;
 		if (moduleRegistry[moduleName]) {
-			return moduleRegistry[moduleName].commandMap.listMessageCommands(key);
+			return ((moduleRegistry[moduleName] as ModuleBase).commandMap.listMessageCommands(key) as String);
 		} else {
 			return "Module with name :" + moduleName + " is not found.";
 		}
diff --git a/src/org/mvcexpress/core/ProxyMap.as b/src/org/mvcexpress/core/ProxyMap.as
@@ -8,7 +8,6 @@ import org.mvcexpress.core.interfaces.IProxyMap;
 import org.mvcexpress.core.messenger.Messenger;
 import org.mvcexpress.core.namespace.pureLegsCore;
 import org.mvcexpress.core.traceObjects.MvcTraceActions;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.core.traceObjects.TraceProxyMap_injectPending;
 import org.mvcexpress.core.traceObjects.TraceProxyMap_injectStuff;
 import org.mvcexpress.core.traceObjects.TraceProxyMap_map;
@@ -35,9 +34,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 hostedProxy data stored by hosted Proxy objects stored */
-	static private var hostedProxyRegistry:Dictionary = new Dictionary(); /* of HostedProxy by Proxy */
-	
 	/** dictionary of (Vector of InjectRuleVO), stored by class names. */
 	static private var classInjectRules:Dictionary = new Dictionary(); /* of Vector.<InjectRuleVO> by Class */
 	
@@ -56,7 +52,7 @@ public class ProxyMap implements IProxyMap {
 	public function map(proxyObject:Proxy, injectClass:Class = null, name:String = ""):void {
 		
 		// get proxy class
-		var proxyClass:Class = Object(proxyObject).constructor;
+		var proxyClass:Class = Object(proxyObject).constructor as Class;
 		
 		// if injectClass is not provided - proxyClass will be used instead.
 		if (!injectClass) {
@@ -277,7 +273,7 @@ public class ProxyMap implements IProxyMap {
 			}
 		}
 		// 
-		delete pendingInjectionsRegistry[injectClassAndName]
+		delete pendingInjectionsRegistry[injectClassAndName];
 	}
 	
 	/**
@@ -327,7 +323,7 @@ public class ProxyMap implements IProxyMap {
 	 */
 	public function isMapped(proxyObject:Proxy, injectClass:Class = null, name:String = ""):Boolean {
 		var retVal:Boolean = false;
-		var proxyClass:Class = Object(proxyObject).constructor;
+		var proxyClass:Class = Object(proxyObject).constructor as Class;
 		if (!injectClass) {
 			injectClass = proxyClass;
 		}
diff --git a/src/org/mvcexpress/core/messenger/Messenger.as b/src/org/mvcexpress/core/messenger/Messenger.as
@@ -11,7 +11,6 @@ import org.mvcexpress.core.traceObjects.TraceMessenger_send;
 import org.mvcexpress.core.traceObjects.TraceMessenger_send_handler;
 import org.mvcexpress.core.traceObjects.TraceMessenger_sendToAll;
 import org.mvcexpress.core.traceObjects.TraceMessenger_sendToAll_clean;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.MvcExpress;
 
 /**
@@ -121,7 +120,7 @@ public class Messenger {
 		var handlerVo:HandlerVO;
 		var delCount:int = 0;
 		if (messageList) {
-			var tempListLength:int = messageList.length
+			var tempListLength:int = messageList.length;
 			for (var i:int = 0; i < tempListLength; i++) {
 				handlerVo = messageList[i];
 				// check if message is not marked to be removed. (disabled)
@@ -141,9 +140,9 @@ public class Messenger {
 						CONFIG::debug {
 							// FOR DEBUG viewing only(mouse over over variables while in debugger mode.)
 							/* Failed message type: */
-							type
+							type;
 							/* Failed handler class: */
-							handlerVo.handlerClassName
+							handlerVo.handlerClassName;
 							//
 							use namespace pureLegsCore;
 							MvcExpress.debug(new TraceMessenger_send_handler(MvcTraceActions.MESSENGER_SEND_HANDLER, moduleName, type, params, handlerVo.handler, handlerVo.handlerClassName));
@@ -172,13 +171,13 @@ public class Messenger {
 				throw Error("sendToAll feature is disabled by MvcExpress.disableSendToAllFeature set to true.");
 			}
 			
-			MvcExpress.debug(new TraceMessenger_sendToAll(MvcTraceActions.MESSENGER_SENDTOALL, moduleName, type, params))
+			MvcExpress.debug(new TraceMessenger_sendToAll(MvcTraceActions.MESSENGER_SENDTOALL, moduleName, type, params));
 		}
 		ModuleManager.sendMessageToAll(type, params);
 		//
 		// clean up loging the action
 		CONFIG::debug {
-			MvcExpress.debug(new TraceMessenger_sendToAll_clean(MvcTraceActions.MESSENGER_SENDTOALL_CLEAN, moduleName, type, params))
+			MvcExpress.debug(new TraceMessenger_sendToAll_clean(MvcTraceActions.MESSENGER_SENDTOALL_CLEAN, moduleName, type, params));
 		}
 	}
 	
diff --git a/src/org/mvcexpress/core/traceObjects/TraceCommand_sendMessage.as b/src/org/mvcexpress/core/traceObjects/TraceCommand_sendMessage.as
@@ -1,6 +1,5 @@
 // Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 package org.mvcexpress.core.traceObjects {
-import flash.display.DisplayObject;
 import org.mvcexpress.mvc.Command;
 
 /**
diff --git a/src/org/mvcexpress/core/traceObjects/TraceMediator_sendMessage.as b/src/org/mvcexpress/core/traceObjects/TraceMediator_sendMessage.as
@@ -1,6 +1,5 @@
 // Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 package org.mvcexpress.core.traceObjects {
-import flash.display.DisplayObject;
 import org.mvcexpress.mvc.Mediator;
 
 /**
diff --git a/src/org/mvcexpress/core/traceObjects/TraceMessenger_send_handler.as b/src/org/mvcexpress/core/traceObjects/TraceMessenger_send_handler.as
@@ -17,7 +17,7 @@ public class TraceMessenger_send_handler extends TraceObj {
 	public var handlerClassName:String;
 	
 	public var messageFromModule:ModuleBase;
-	public var messageFromMediator:Mediator
+	public var messageFromMediator:Mediator;
 	public var messageFromProxy:Proxy;
 	public var messageFromCommand:Command;
 	
diff --git a/src/org/mvcexpress/core/traceObjects/TraceModuleBase_sendMessage.as b/src/org/mvcexpress/core/traceObjects/TraceModuleBase_sendMessage.as
@@ -1,6 +1,5 @@
 // Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 package org.mvcexpress.core.traceObjects {
-import flash.display.DisplayObject;
 import org.mvcexpress.core.ModuleBase;
 
 /**
diff --git a/src/org/mvcexpress/core/traceObjects/TraceProxyMap_unmap.as b/src/org/mvcexpress/core/traceObjects/TraceProxyMap_unmap.as
@@ -1,7 +1,6 @@
 // Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 package org.mvcexpress.core.traceObjects {
 import flash.display.DisplayObject;
-import org.mvcexpress.mvc.Proxy;
 
 /**
  * COMMENT
diff --git a/src/org/mvcexpress/core/traceObjects/TraceProxy_sendMessage.as b/src/org/mvcexpress/core/traceObjects/TraceProxy_sendMessage.as
@@ -1,6 +1,5 @@
 // Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 package org.mvcexpress.core.traceObjects {
-import flash.display.DisplayObject;
 import org.mvcexpress.mvc.Proxy;
 
 /**
diff --git a/src/org/mvcexpress/mvc/Command.as b/src/org/mvcexpress/mvc/Command.as
@@ -7,7 +7,6 @@ import org.mvcexpress.core.namespace.pureLegsCore;
 import org.mvcexpress.core.ProxyMap;
 import org.mvcexpress.core.traceObjects.MvcTraceActions;
 import org.mvcexpress.core.traceObjects.TraceCommand_sendMessage;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.MvcExpress;
 
 /**
@@ -48,7 +47,7 @@ dynamic public class Command {
 		CONFIG::debug {
 			use namespace pureLegsCore;
 			if (!canConstruct) {
-				throw Error("Command:" + this + " can be constructed only by framework. If you want to execute it - map it to message with commandMap.map() and send a message, or execute it directly with commandMap.execute()")
+				throw Error("Command:" + this + " can be constructed only by framework. If you want to execute it - map it to message with commandMap.map() and send a message, or execute it directly with commandMap.execute()");
 			}
 		}
 	}
diff --git a/src/org/mvcexpress/mvc/Mediator.as b/src/org/mvcexpress/mvc/Mediator.as
@@ -11,7 +11,6 @@ import org.mvcexpress.core.namespace.pureLegsCore;
 import org.mvcexpress.core.traceObjects.MvcTraceActions;
 import org.mvcexpress.core.traceObjects.TraceMediator_addHandler;
 import org.mvcexpress.core.traceObjects.TraceMediator_sendMessage;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.MvcExpress;
 
 /**
@@ -60,9 +59,9 @@ public class Mediator {
 	/** CONSTRUCTOR */
 	public function Mediator() {
 		CONFIG::debug {
-			use namespace pureLegsCore
+			use namespace pureLegsCore;
 			if (!canConstruct) {
-				throw Error("Mediator:" + this + " can be constructed only by framework. If you want to use it - map it to view object class with 'mediatorMap.map()', and then mediate instance of the view object with 'mediatorMap.mediate()'.")
+				throw Error("Mediator:" + this + " can be constructed only by framework. If you want to use it - map it to view object class with 'mediatorMap.map()', and then mediate instance of the view object with 'mediatorMap.mediate()'.");
 			}
 		}
 	}
@@ -265,15 +264,15 @@ public class Mediator {
 			if (eventListenerCaptureRegistry[listener]) {
 				if (eventListenerCaptureRegistry[listener][type]) {
 					if (eventListenerCaptureRegistry[listener][type] == viewObject) {
-						delete eventListenerCaptureRegistry[listener][type]
+						delete eventListenerCaptureRegistry[listener][type];
 					}
 				}
 			}
 		} else {
 			if (eventListenerRegistry[listener]) {
 				if (eventListenerRegistry[listener][type]) {
 					if (eventListenerRegistry[listener][type] == viewObject) {
-						delete eventListenerRegistry[listener][type]
+						delete eventListenerRegistry[listener][type];
 					}
 				}
 			}
diff --git a/src/org/mvcexpress/mvc/Proxy.as b/src/org/mvcexpress/mvc/Proxy.as
@@ -4,7 +4,6 @@ import org.mvcexpress.core.interfaces.IProxyMap;
 import org.mvcexpress.core.messenger.Messenger;
 import org.mvcexpress.core.namespace.pureLegsCore;
 import org.mvcexpress.core.traceObjects.MvcTraceActions;
-import org.mvcexpress.core.traceObjects.TraceObj;
 import org.mvcexpress.core.traceObjects.TraceProxy_sendMessage;
 import org.mvcexpress.MvcExpress;
 
diff --git a/test/suites/mediators/MediatorTests.as b/test/suites/mediators/MediatorTests.as
@@ -49,7 +49,11 @@ public class MediatorTests {
 	[Test(expects="Error")]
 	
 	public function mediator_constructor_fails():void {
-		new MediatorSpriteMediator();
+		CONFIG::debug {
+			new MediatorSpriteMediator();
+			return;
+		} 
+		throw Error("Fake error.");
 	}
 	
 	[Test]
