Merge branch 'worker'

* worker: fixed ProcessEvent names #40 throw uncaught process error #41 rename Worker to Process #40
blooddy · Mar 30, 2016 · 427b44a · 427b44a
2 parents 5334a69 + 63f5b5b
commit 427b44a
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 111 deletions.
diff --git a/.actionScriptProperties b/.actionScriptProperties
@@ -49,7 +49,7 @@
   </applications>
   <modules/>
   <workers>
-    <worker embed="true" path="src/by/blooddy/crypto/worker/BackgroundWorker.as"/>
+    <worker embed="true" path="src/by/blooddy/crypto/worker/BackgrounProcess.as"/>
   </workers>
   <buildCSSFiles/>
   <flashCatalyst validateFlashCatalystCompatibility="false"/>

diff --git a/build.config.worker.xml → build.config.process.xml b/build.config.worker.xml → build.config.process.xml
diff --git a/build.xml b/build.xml
@@ -8,44 +8,44 @@
 
 	<taskdef resource="flexTasks.tasks" classpath="${flex.sdk}/ant/lib/flexTasks.jar" />
 
-	<target name="tmp.worker">
+	<target name="tmp.process">
 
-		<property name="worker.path" value="${basedir}/src/by/blooddy/crypto/worker" />
-		<property name="worker.name" value="BackgroundWorker" />
+		<property name="process.path" value="${basedir}/src/by/blooddy/crypto/process" />
+		<property name="process.name" value="BackgroundProcess" />
 
 		<copy
-			file="${worker.path}/${worker.name}.swf"
-			tofile="${worker.path}/${worker.name}.tmp.swf"
+			file="${process.path}/${process.name}.swf"
+			tofile="${process.path}/${process.name}.tmp.swf"
 		/>
 
 	</target>
 
-	<target name="untmp.worker">
+	<target name="untmp.process">
 
-		<property name="worker.path" value="${basedir}/src/by/blooddy/crypto/worker" />
-		<property name="worker.name" value="BackgroundWorker" />
+		<property name="process.path" value="${basedir}/src/by/blooddy/crypto/process" />
+		<property name="process.name" value="BackgroundProcess" />
 
 		<move
-			file="${worker.path}/${worker.name}.tmp.swf"
-			toFile="${worker.path}/${worker.name}.swf"
+			file="${process.path}/${process.name}.tmp.swf"
+			toFile="${process.path}/${process.name}.swf"
 		/>
 
 	</target>
 
-	<target name="compile.worker" description="Compile Worker">
+	<target name="compile.process" description="Compile Process">
 
-		<property name="worker.path" value="${basedir}/src/by/blooddy/crypto/worker" />
-		<property name="worker.name" value="BackgroundWorker" />
+		<property name="process.path" value="${basedir}/src/by/blooddy/crypto/process" />
+		<property name="process.name" value="BackgroundProcess" />
 
 		<mxmlc failonerror="true"
-			file="${worker.path}/${worker.name}.as"
-			output="${worker.path}/${worker.name}.swf"
+			file="${process.path}/${process.name}.as"
+			output="${process.path}/${process.name}.swf"
 			swf-version="17"
 		>
 
 			<load-config filename="${flex.sdk}/frameworks/air-config.xml" />
 			<load-config filename="${basedir}/build.config.xml" />
-			<load-config filename="${basedir}/build.config.worker.xml" />
+			<load-config filename="${basedir}/build.config.process.xml" />
 
 			<source-path path-element="${basedir}/src" />
 
@@ -60,15 +60,15 @@
 			<includes symbol="by.blooddy.crypto.image.PNGEncoder" />
 			<includes symbol="by.blooddy.crypto.image.JPEGEncoder" />
 
-			<externs symbol="by.blooddy.crypto.worker.Worker$Concurrent" />
-			<externs symbol="by.blooddy.crypto.worker.WorkerEvent" />
-			<externs symbol="by.blooddy.crypto.worker.BackgroundWorkerSWF" />
+			<externs symbol="by.blooddy.crypto.process.Process$Concurrent" />
+			<externs symbol="by.blooddy.crypto.process.ProcessEvent" />
+			<externs symbol="by.blooddy.crypto.process.BackgroundProcessSWF" />
 
 		</mxmlc>
 
 	</target>
 
-	<target name="compile.library" depends="compile.worker" description="Compile Library">
+	<target name="compile.library" depends="compile.process" description="Compile Library">
 
 		<compc failonerror="true"
 			output="${basedir}/bin/blooddy_crypto.swc"
@@ -87,9 +87,9 @@
 
 
 	<target name="compile">
-		<antcall target="tmp.worker" />
+		<antcall target="tmp.process" />
 		<antcall target="compile.library" />
-		<antcall target="untmp.worker" />
+		<antcall target="untmp.process" />
 	</target>
 
 </project>
diff --git a/src/Workers.as b/src/Workers.as
@@ -0,0 +1,16 @@
+/*******************************************************************************************************************************************
+ * This is an automatically generated class. Please do not modify it since your changes may be lost in the following circumstances:
+ *     - Members will be added to this class whenever an embedded worker is added.
+ *     - Members in this class will be renamed when a worker is renamed or moved to a different package.
+ *     - Members in this class will be removed when a worker is deleted.
+ *******************************************************************************************************************************************/
+
+package 
+{
+
+	import flash.utils.ByteArray;
+
+	public class Workers
+	{
+	}
+}
diff --git a/src/by/blooddy/crypto/Adler32.as b/src/by/blooddy/crypto/Adler32.as
@@ -11,15 +11,15 @@ package by.blooddy.crypto {
 
 	import avm2.intrinsics.memory.li8;
 
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	/**
 	 * @author					BlooDHounD
 	 * @version					2.0
 	 * @playerversion			Flash 10.1
 	 * @langversion				3.0
 	 */
-	public final class Adler32 extends Worker {
+	public final class Adler32 extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/src/by/blooddy/crypto/CRC32.as b/src/by/blooddy/crypto/CRC32.as
@@ -13,7 +13,7 @@ package by.blooddy.crypto {
 	import avm2.intrinsics.memory.li8;
 	import avm2.intrinsics.memory.si32;
 
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	/**
 	 * Generates a <a href="http://www.mathpages.com/home/kmath458.htm">CRC hash
@@ -25,7 +25,7 @@ package by.blooddy.crypto {
 	 * @langversion				3.0
 	 * @created					28.01.2011 20:07:33
 	 */
-	public final class CRC32 extends Worker {
+	public final class CRC32 extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/src/by/blooddy/crypto/MD5.as b/src/by/blooddy/crypto/MD5.as
@@ -14,7 +14,7 @@ package by.blooddy.crypto {
 	import avm2.intrinsics.memory.si32;
 	import avm2.intrinsics.memory.si8;
 
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	/**
 	 * Encodes and decodes binary data using
@@ -26,7 +26,7 @@ package by.blooddy.crypto {
 	 * @langversion				3.0
 	 * @created					07.03.2011 14:48:31
 	 */
-	public final class MD5 extends Worker {
+	public final class MD5 extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/src/by/blooddy/crypto/SHA1.as b/src/by/blooddy/crypto/SHA1.as
@@ -14,7 +14,7 @@ package by.blooddy.crypto {
 	import avm2.intrinsics.memory.si32;
 	import avm2.intrinsics.memory.si8;
 
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	/**
 	 * Encodes and decodes binary data using 
@@ -26,7 +26,7 @@ package by.blooddy.crypto {
 	 * @langversion				3.0
 	 * @created					03.10.2010 21:07:00
 	 */
-	public final class SHA1 extends Worker {
+	public final class SHA1 extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/src/by/blooddy/crypto/SHA2.as b/src/by/blooddy/crypto/SHA2.as
@@ -14,7 +14,7 @@ package by.blooddy.crypto {
 	import avm2.intrinsics.memory.si32;
 	import avm2.intrinsics.memory.si8;
 
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	[ExcludeClass]
 	/**
@@ -25,7 +25,7 @@ package by.blooddy.crypto {
 	 * @langversion				3.0
 	 * @created					21.03.2016 16:47:48
 	 */
-	internal class SHA2 extends Worker {
+	internal class SHA2 extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/src/by/blooddy/crypto/worker/WorkerEvent.as → src/by/blooddy/crypto/events/ProcessEvent.as b/src/by/blooddy/crypto/worker/WorkerEvent.as → src/by/blooddy/crypto/events/ProcessEvent.as
@@ -4,9 +4,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package by.blooddy.crypto.worker {
+package by.blooddy.crypto.events {
 
-	import flash.events.Event;
+	import flash.events.ErrorEvent;
+	import flash.events.Event;
 
 	/**
 	 * @private
@@ -16,17 +17,17 @@ package by.blooddy.crypto.worker {
 	 * @langversion				3.0
 	 * @created					25.03.2016 1:17:56
 	 */
-	public class WorkerEvent extends Event {
+	public class ProcessEvent extends Event {
 
 		//--------------------------------------------------------------------------
 		//
 		//  Class variables
 		//
 		//--------------------------------------------------------------------------
 
-		public static const SUCCESS:String =	'success';
+		public static const COMPLETE:String =	Event.COMPLETE;
 
-		public static const FAULT:String =		'fault';
+		public static const ERROR:String =		ErrorEvent.ERROR;
 
 		//--------------------------------------------------------------------------
 		//
@@ -35,12 +36,12 @@ package by.blooddy.crypto.worker {
 		//--------------------------------------------------------------------------
 
 		/**
-		 * @param	result
 		 * @param	type
 		 * @param	bubbles
 		 * @param	cancelable
+		 * @param	data
 		 */
-		public function WorkerEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false, data:*=null) {
+		public function ProcessEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false, data:*=null) {
 			super( type, bubbles, cancelable );
 			this.data = data;
 		}
@@ -63,7 +64,7 @@ package by.blooddy.crypto.worker {
 		 * @private
 		 */
 		public override function clone():Event {
-			return new WorkerEvent( super.type, super.bubbles, super.cancelable, this.data );
+			return new ProcessEvent( super.type, super.bubbles, super.cancelable, this.data );
 		}
 
 	}

diff --git a/src/by/blooddy/crypto/image/JPEGEncoder.as b/src/by/blooddy/crypto/image/JPEGEncoder.as
@@ -12,7 +12,7 @@ package by.blooddy.crypto.image {
 	import flash.utils.ByteArray;
 	import flash.utils.Endian;
 
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	/**
 	 * Encodes image data using
@@ -23,7 +23,7 @@ package by.blooddy.crypto.image {
 	 * @playerversion			Flash 10.1
 	 * @langversion				3.0
 	 */
-	public final class JPEGEncoder extends Worker {
+	public final class JPEGEncoder extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/src/by/blooddy/crypto/image/PNGEncoder.as b/src/by/blooddy/crypto/image/PNGEncoder.as
@@ -13,7 +13,7 @@ package by.blooddy.crypto.image {
 	import flash.utils.getQualifiedClassName;
 
 	import by.blooddy.crypto.CRC32;
-	import by.blooddy.crypto.worker.Worker;
+	import by.blooddy.crypto.process.Process;
 
 	/**
 	 * Encodes image data using 
@@ -34,7 +34,7 @@ package by.blooddy.crypto.image {
 	 * @langversion				3.0
 	 * @created					05.07.2010 17:44:26
 	 */
-	public class PNGEncoder extends Worker {
+	public class PNGEncoder extends Process {
 
 		//--------------------------------------------------------------------------
 		//

diff --git a/...blooddy/crypto/worker/BackgroundWorker.as → ...ooddy/crypto/process/BackgroundProcess.as b/...blooddy/crypto/worker/BackgroundWorker.as → ...ooddy/crypto/process/BackgroundProcess.as
@@ -4,7 +4,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package by.blooddy.crypto.worker {
+package by.blooddy.crypto.process {
 
 	import flash.display.Sprite;
 	import flash.events.Event;
@@ -21,7 +21,7 @@ package by.blooddy.crypto.worker {
 	 * @langversion				3.0
 	 * @created					Mar 28, 2016 11:24:15 AM
 	 */
-	public final class BackgroundWorker extends Sprite {
+	public final class BackgroundProcess extends Sprite {
 
 		//--------------------------------------------------------------------------
 		//
@@ -31,7 +31,7 @@ package by.blooddy.crypto.worker {
 
 		private static const _CHANNEL:MessageChannel = ( function():MessageChannel {
 
-			var worker:flash.system.Worker = flash.system.Worker.current;
+			var worker:Worker = Worker.current;
 
 			var input:MessageChannel = worker.getSharedProperty( 'input' );
 			var output:MessageChannel = worker.getSharedProperty( 'output' );
@@ -70,19 +70,6 @@ package by.blooddy.crypto.worker {
 
 		}() );
 
-		//--------------------------------------------------------------------------
-		//
-		//  Constructor
-		//
-		//--------------------------------------------------------------------------
-
-		/**
-		 * Constructor
-		 */
-		public function BackgroundWorker() {
-			super();
-		}
-
 	}
 
 }
diff --git a/...looddy/crypto/worker/BackgroundWorker.swf → ...oddy/crypto/process/BackgroundProcess.swf b/...looddy/crypto/worker/BackgroundWorker.swf → ...oddy/crypto/process/BackgroundProcess.swf
diff --git a/src/by/blooddy/crypto/worker/Worker$.as → src/by/blooddy/crypto/process/Process$.as b/src/by/blooddy/crypto/worker/Worker$.as → src/by/blooddy/crypto/process/Process$.as
@@ -4,7 +4,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package by.blooddy.crypto.worker {
+package by.blooddy.crypto.process {
 
 	[ExcludeClass]
 	/**
@@ -15,7 +15,7 @@ package by.blooddy.crypto.worker {
 	 * @langversion				3.0
 	 * @created					25.03.2016 17:11:05
 	 */
-	internal interface Worker$ {
+	internal interface Process$ {
 
 		function process(className:String, methodName:String, arguments:Array, success:Function, fault:Function):void;