Renamed/moved.

MindScriptAct · Nov 6, 2013 · ca04ed8 · ca04ed8
1 parent 23ebd3b
commit ca04ed8
Show file tree

Hide file tree

Showing 87 changed files with 613 additions and 957 deletions.
diff --git a/libSrc/mvcexpress/extensions/scopedWorker/modules/ModuleScopedWorker.as b/libSrc/mvcexpress/extensions/scopedWorker/modules/ModuleScopedWorker.as
diff --git a/...workers/core/messenger/MessengerWorker.as → ...Workers/core/messenger/MessengerWorker.as b/...workers/core/messenger/MessengerWorker.as → ...Workers/core/messenger/MessengerWorker.as
@@ -1,13 +1,12 @@
-package org.mvcexpress.extensions.workers.core.messenger {
+package mvcexpress.extensions.scopedWorkers.core.messenger {
 import flash.net.registerClassAlias;
 import flash.utils.describeType;
 import flash.utils.getDefinitionByName;
 import flash.utils.getQualifiedClassName;
 
 import mvcexpress.core.messenger.Messenger;
 import mvcexpress.core.namespace.pureLegsCore;
-
-import org.mvcexpress.extensions.workers.modules.ModuleWorkerBase;
+import mvcexpress.extensions.scopedWorkers.modules.ModuleScopedWorker;
 
 public class MessengerWorker extends Messenger {
 
@@ -28,9 +27,9 @@ public class MessengerWorker extends Messenger {
 		if (isReady) {
 
 			if (params) {
-				if (ModuleWorkerBase.$autoRegisterClasses) {
+				if (ModuleScopedWorker.$autoRegisterClasses) {
 					var paramClass:Class = params.constructor;
-					var qualifiedName:String = ModuleWorkerBase.$classAliasRegistry.classes[paramClass];
+					var qualifiedName:String = ModuleScopedWorker.$classAliasRegistry.classes[paramClass];
 					if (!qualifiedName) {
 						parseObject(params.constructor);
 					}
@@ -39,7 +38,7 @@ public class MessengerWorker extends Messenger {
 
 			use namespace pureLegsCore;
 
-			ModuleWorkerBase.demo_sendMessage(type, params);
+			ModuleScopedWorker.demo_sendMessage(type, params);
 
 		} else {
 			pendingTypes.push(type);
@@ -66,9 +65,9 @@ public class MessengerWorker extends Messenger {
 		//trace("start registration ... ", qualifiedName);
 		registerClassAlias(qualifiedName, paramClass);
 
-		ModuleWorkerBase.$classAliasRegistry.classes[paramClass] = qualifiedName;
+		ModuleScopedWorker.$classAliasRegistry.classes[paramClass] = qualifiedName;
 
-		ModuleWorkerBase.startClassRegistration(qualifiedName);
+		ModuleScopedWorker.startClassRegistration(qualifiedName);
 
 		// handle meber types.
 
@@ -85,7 +84,7 @@ public class MessengerWorker extends Messenger {
 
 				// TODO : optimize for better performance. (local static dictionary?)
 
-				var qualifiedName:String = ModuleWorkerBase.$classAliasRegistry.classes[memberClass];
+				var qualifiedName:String = ModuleScopedWorker.$classAliasRegistry.classes[memberClass];
 				if (!qualifiedName) {
 					parseObject(memberClass);
 				}

diff --git a/...nsions/workers/data/ClassAliasRegistry.as → .../scopedWorkers/data/ClassAliasRegistry.as b/...nsions/workers/data/ClassAliasRegistry.as → .../scopedWorkers/data/ClassAliasRegistry.as
@@ -1,4 +1,4 @@
-package org.mvcexpress.extensions.workers.data {
+package mvcexpress.extensions.scopedWorkers.data {
 import flash.utils.Dictionary;
 
 import mvcexpress.core.namespace.pureLegsCore;

diff --git a/...sions/workers/modules/ModuleWorkerBase.as → ...opedWorkers/modules/ModuleScopedWorker.as b/...sions/workers/modules/ModuleWorkerBase.as → ...opedWorkers/modules/ModuleScopedWorker.as
@@ -1,7 +1,4 @@
-package org.mvcexpress.extensions.workers.modules {
-import com.mindScriptAct.workerTest.WorkerIds;
-
-import flash.display.Sprite;
+package mvcexpress.extensions.scopedWorkers.modules {
 import flash.events.Event;
 import flash.net.getClassByAlias;
 import flash.net.registerClassAlias;
@@ -12,17 +9,19 @@ import flash.utils.getQualifiedClassName;
 import flash.utils.setInterval;
 import flash.utils.setTimeout;
 
+import mvcexpress.core.ExtensionManager;
 import mvcexpress.core.namespace.pureLegsCore;
 import mvcexpress.extensions.scoped.core.ScopeManager;
 import mvcexpress.extensions.scoped.modules.ModuleScoped;
+import mvcexpress.extensions.scopedWorkers.core.messenger.MessengerWorker;
+import mvcexpress.extensions.scopedWorkers.data.ClassAliasRegistry;
 
-import org.mvcexpress.extensions.workers.core.messenger.MessengerWorker;
-import org.mvcexpress.extensions.workers.data.ClassAliasRegistry;
+import workerTest.constants.WorkerIds;
 
 //import flash.system.MessageChannel;
 //import flash.system.Worker;
 //import flash.system.WorkerDomain;
-public class ModuleWorkerBase extends ModuleScoped {
+public class ModuleScopedWorker extends ModuleScoped {
 
 
 	public static var $autoRegisterClasses:Boolean = true;
@@ -73,15 +72,19 @@ public class ModuleWorkerBase extends ModuleScoped {
 	public static var WorkerDomainClass:Class;
 
 
-	public function ModuleWorkerBase(moduleName:String):void {
+	public function ModuleScopedWorker(moduleName:String, mediatorMapClass:Class = null, proxyMapClass:Class = null, commandMapClass:Class = null, messengerClass:Class = null) {
 
-		trace("-----[" + moduleName + "]" + "ModuleWorker: try to create module." + "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+		trace("-----[" + moduleName + "]" + "ModuleWorker: try to create module." + "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 
 		use namespace pureLegsCore;
 
+		CONFIG::debug {
+			enableExtension(EXTENSION_WORKER_ID);
+		}
+
 		if (handleWorker(moduleName)) {
-			trace("-----[" + moduleName + "]" + "ModuleWorker: Create module!" + "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
-			super(moduleName);
+			trace("-----[" + moduleName + "]" + "ModuleWorker: Create module!" + "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
+			super(moduleName, mediatorMapClass, proxyMapClass, commandMapClass, messengerClass);
 		}
 
 	}
@@ -106,15 +109,14 @@ public class ModuleWorkerBase extends ModuleScoped {
 			}
 		}
 
-
 		use namespace pureLegsCore;
 
 		this.debug_moduleName = moduleName;
 
 		if (_isWorkersSupported) {
 
 			trace("------[" + moduleName + "]" + "ModuleWorkerBase: CONSTRUCT, 'primordial:", WorkerClass.current.isPrimordial
-					+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+					+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 
 			//
 			if (WorkerClass.current.isPrimordial) { // check if primordial.
@@ -131,22 +133,22 @@ public class ModuleWorkerBase extends ModuleScoped {
 					WorkerClass.current.setSharedProperty(MODULE_NAME_KEY, moduleName);
 				}
 			} else {
-				trace("------[" + moduleName + "]" + "ModuleWorkerBase: can init child module?:", ModuleWorkerBase.canInitChildModule
-						+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+				trace("------[" + moduleName + "]" + "ModuleWorkerBase: can init child module?:", ModuleScopedWorker.canInitChildModule
+						+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 				// check if this is temp copy of the main swf
-				if (!ModuleWorkerBase.canInitChildModule) {
+				if (!ModuleScopedWorker.canInitChildModule) {
 					// NOT PRIMORDIAL, COPY OF THE MAIN.
 					var childModuleClassDefinition:String = WorkerClass.current.getSharedProperty(MODULE_CLASS_NAME_KEY);
 					trace("------[" + moduleName + "]" + "ModuleWorkerBase: moduleClass:", childModuleClassDefinition
-							+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+							+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 					if (childModuleClassDefinition) {
 						WorkerClass.current.setSharedProperty(MODULE_CLASS_NAME_KEY, null);
 
 						var childModuleClass:Class = getDefinitionByName(childModuleClassDefinition) as Class;
 
-						ModuleWorkerBase.canInitChildModule = true;
+						ModuleScopedWorker.canInitChildModule = true;
 						var childModule:Object = new childModuleClass();
-						ModuleWorkerBase.canInitChildModule = true;
+						ModuleScopedWorker.canInitChildModule = true;
 					}
 					return false;
 				} else {
@@ -171,16 +173,15 @@ public class ModuleWorkerBase extends ModuleScoped {
 				}
 			}
 		} else {
-			if (ModuleWorkerBase.canInitChildModule) {
+			if (ModuleScopedWorker.canInitChildModule) {
 
 				// todo : get this naime better.
-				var workerModuleName:String = WorkerIds.MAIN_WORKER_TEST_MODULE;
+				var workerModuleName:String = WorkerIds.MAIN_WORKER;
 
 				ScopeManager.registerScope(debug_moduleName, workerModuleName, true, true, false);
 				ScopeManager.registerScope(debug_moduleName, debug_moduleName, true, true, false);
 				ScopeManager.registerScope(workerModuleName, workerModuleName, true, true, false);
 			}
-
 		}
 		return true;
 	}
@@ -193,7 +194,7 @@ public class ModuleWorkerBase extends ModuleScoped {
 		if (_isWorkersSupported) {
 			//
 			trace("------[" + debug_moduleName + "]" + "ModuleWorkerBase: startWorkerModule: " + workerModuleClass, "isPrimordial:" + WorkerClass.current.isPrimordial
-					+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+					+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 
 			//trace("WorkerClass.isSupported:", WorkerClass.isSupported);
 
@@ -220,7 +221,6 @@ public class ModuleWorkerBase extends ModuleScoped {
 				ScopeManager.registerScope(debug_moduleName, debug_moduleName, true, true, false);
 				ScopeManager.registerScope(workerModuleName, workerModuleName, true, true, false);
 
-
 				//
 				connectRemoteWorker(remoteWorker);
 				//
@@ -236,10 +236,10 @@ public class ModuleWorkerBase extends ModuleScoped {
 			ScopeManager.registerScope(debug_moduleName, debug_moduleName, true, true, false);
 			ScopeManager.registerScope(workerModuleName, workerModuleName, true, true, false);
 
-			ModuleWorkerBase.canInitChildModule = true;
+			ModuleScopedWorker.canInitChildModule = true;
 			var childModule:Object = new workerModuleClass();
 			workerRegistry[workerModuleName] = childModule;
-			ModuleWorkerBase.canInitChildModule = true;
+			ModuleScopedWorker.canInitChildModule = true;
 		}
 	}
 
@@ -277,7 +277,7 @@ public class ModuleWorkerBase extends ModuleScoped {
 			}
 		} else {
 			if (workerRegistry[workerModuleName]) {
-				(workerRegistry[workerModuleName] as ModuleWorkerBase).disposeModule();
+				(workerRegistry[workerModuleName] as ModuleScopedWorker).disposeModule();
 
 				delete workerRegistry[workerModuleName]
 			}
@@ -288,7 +288,7 @@ public class ModuleWorkerBase extends ModuleScoped {
 	private function debug_workerStateHandler(event:Event):void {
 		var childWorker:Object = event.target;
 		trace("------[" + debug_moduleName + "]" + "ModuleWorkerBase: workerStateHandler- " + childWorker.state
-				+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+				+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 	}
 
 	public function debug_getModuleName():String {
@@ -300,14 +300,13 @@ public class ModuleWorkerBase extends ModuleScoped {
 //			throw  Error("TODO");
 			return "";
 		}
-
 	}
 
 	private function connectRemoteWorker(remoteWorker:Object):void {
 		// get all running workers
 		var workers:* = WorkerDomainClass.current.listWorkers();
 		trace("------[" + debug_moduleName + "]" + "connectChildWorker " + remoteWorker, "with", workers
-				+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+				+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 		//
 		for (var i:int = 0; i < workers.length; i++) {
 			var worker:Object = workers[i];
@@ -348,7 +347,7 @@ public class ModuleWorkerBase extends ModuleScoped {
 		// get all workers
 		var workers:* = WorkerDomainClass.current.listWorkers();
 		trace("------[" + debug_moduleName + "]" + "setUpWorkerCommunication " + workers
-				+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+				+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 		//
 		var thisWorker:Object = WorkerClass.current;
 		for (var i:int = 0; i < workers.length; i++) {
@@ -395,7 +394,6 @@ public class ModuleWorkerBase extends ModuleScoped {
 				}
 			}
 		}
-
 	}
 
 	private function handleChannelMessage(event:Event):void {
@@ -417,7 +415,7 @@ public class ModuleWorkerBase extends ModuleScoped {
 				//trace("Init new remote module : ", remoteModuleName);
 
 				trace("------[" + debug_moduleName + "]" + "handle child module init! ", remoteModuleName
-						+ "[" + ModuleWorkerBase.debug_coreId + "]" + "<" + debug_objectID + "> ");
+						+ "[" + ModuleScopedWorker.debug_coreId + "]" + "<" + debug_objectID + "> ");
 
 				var thisWorker:Object = WorkerClass.current;
 
@@ -511,15 +509,13 @@ public class ModuleWorkerBase extends ModuleScoped {
 
 	public function debug_CommunicationMain():void {
 		//trace("MAIN TEST");
-
 		use namespace pureLegsCore;
 
 		demo_sendMessage("Main > worker...");
 	}
 
 	public function debug_CommunicationWorker():void {
 		//trace("WORKER TEST");
-
 		use namespace pureLegsCore;
 
 		demo_sendMessage("Worker > main...");
@@ -528,9 +524,7 @@ public class ModuleWorkerBase extends ModuleScoped {
 
 	private function demo_custom_scope():void {
 		//var moduleBase:ModuleBase
-
 		//use namespace pureLegsCore;
-
 		//ScopeManager.registerScope("", "_moduleName", true, true, true);
 		//moduleBase.registerScope()
 	}
@@ -545,5 +539,17 @@ public class ModuleWorkerBase extends ModuleScoped {
 	}
 
 
+	//----------------------------------
+	//    Extension checking: INTERNAL, DEBUG ONLY.
+	//----------------------------------
+
+	/** @private */
+	CONFIG::debug
+	static pureLegsCore const EXTENSION_WORKER_ID:int = ExtensionManager.getExtensionIdByName(pureLegsCore::EXTENSION_WORKER_NAME);
+
+	/** @private */
+	CONFIG::debug
+	static pureLegsCore const EXTENSION_WORKER_NAME:String = "workers";
+
 }
 }
diff --git a/manifest.xml b/manifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <componentPackage>
-	<component id="pureLegsCore" class="org.mvcexpress.core.namespace.pureLegsCore"/>
+	<component id="pureLegsCore" class="mvcexpress.core.namespace.pureLegsCore"/>
 </componentPackage>
diff --git a/mvcEpress-extension-workers.iml b/mvcEpress-extension-workers.iml
@@ -2,7 +2,7 @@
 <module type="Flex" version="4">
   <component name="FlexBuildConfigurationManager" active="mvcEpress-extension-workers">
     <configurations>
-      <configuration name="mvcEpress-extension-workers" pure-as="true" main-class="workerTest.mainWorker.WorkerTestMain" output-file="mvcEpress-extension-workers.swf" output-folder="$MODULE_DIR$/bin">
+      <configuration name="mvcEpress-extension-workers" pure-as="true" main-class="workerTest.WorkerTestMain" output-file="mvcEpress-extension-workers.swf" output-folder="$MODULE_DIR$/bin">
         <dependencies target-player="11.9">
           <entries>
             <entry library-id="a056714c-5dae-4103-a957-14ff5d03e02e">

diff --git a/sampleProjects/com/mindScriptAct/modules/ModuleNames.as b/sampleProjects/com/mindScriptAct/modules/ModuleNames.as