You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2017/12/07 15:18:32 UTC
[royale-asjs] 10/12: IStrand in Network
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/strandwork
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 33617017377bf2ead9f65adfe6ef07ca25d57228
Author: Harbs <ha...@in-tools.com>
AuthorDate: Thu Dec 7 17:15:59 2017 +0200
IStrand in Network
---
.../org/apache/royale/core/ElementWrapper.as | 2 +-
.../royale/org/apache/royale/net/BinaryUploader.as | 93 --------------
.../royale/org/apache/royale/net/HTTPService.as | 103 +---------------
.../org/apache/royale/net/HTTPServiceBase.as | 135 ++++++++++++++++++++-
4 files changed, 137 insertions(+), 196 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
index 2e268cd..f1c158b 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ElementWrapper.as
@@ -62,7 +62,7 @@ package org.apache.royale.core
_element.royale_wrapper = this;
}
- private var beads:Array;
+ public var beads:Array;
protected var _beads:Vector.<IBead>;
diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/BinaryUploader.as b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/BinaryUploader.as
index 392a152..a5e216c 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/BinaryUploader.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/BinaryUploader.as
@@ -399,99 +399,6 @@ package org.apache.royale.net
dispatchEvent(new Event("idChanged"));
}
}
-
- private var _strand:IStrand;
-
- /**
- * @copy org.apache.royale.core.UIBase#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
-
- for each (var bead:IBead in beads)
- addBead(bead);
-
- dispatchEvent(new org.apache.royale.events.Event("beadsAdded"));
- }
-
- /**
- * @copy org.apache.royale.core.UIBase#beads
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- public var beads:Array;
-
- COMPILE::SWF
- private var _beads:Vector.<IBead>;
-
- /**
- * @copy org.apache.royale.core.UIBase#addBead()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- COMPILE::SWF
- public function addBead(bead:IBead):void
- {
- if (!_beads)
- _beads = new Vector.<IBead>;
- _beads.push(bead);
- bead.strand = this;
- }
-
- /**
- * @copy org.apache.royale.core.UIBase#getBeadByType()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- COMPILE::SWF
- public function getBeadByType(classOrInterface:Class):IBead
- {
- for each (var bead:IBead in _beads)
- {
- if (bead is classOrInterface)
- return bead;
- }
- return null;
- }
-
- /**
- * @copy org.apache.royale.core.UIBase#removeBead()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- COMPILE::SWF
- public function removeBead(value:IBead):IBead
- {
- var n:int = _beads.length;
- for (var i:int = 0; i < n; i++)
- {
- var bead:IBead = _beads[i];
- if (bead == value)
- {
- _beads.splice(i, 1);
- return bead;
- }
- }
- return null;
- }
COMPILE::SWF
private var urlLoader:flash.net.URLLoader;
diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPService.as b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPService.as
index 096d52d..7da0196 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPService.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPService.as
@@ -24,6 +24,7 @@ package org.apache.royale.net
import flash.events.IOErrorEvent;
import flash.net.URLLoader;
import flash.net.URLRequestHeader;
+ import org.apache.royale.core.addBeadsToStrand;
}
COMPILE::JS
{
@@ -410,101 +411,6 @@ package org.apache.royale.net
dispatchEvent(new Event("idChanged"));
}
}
-
- private var _strand:IStrand;
-
- /**
- * @copy org.apache.royale.core.UIBase#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
- if (_beads == null)
- {
- for each (var bead:IBead in beads)
- addBead(bead);
- }
-
- dispatchEvent(new org.apache.royale.events.Event("beadsAdded"));
- }
-
- /**
- * @copy org.apache.royale.core.UIBase#id
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- public var beads:Array;
-
- COMPILE::SWF
- private var _beads:Vector.<IBead>;
-
- /**
- * @copy org.apache.royale.core.UIBase#addBead()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- COMPILE::SWF
- public function addBead(bead:IBead):void
- {
- if (!_beads)
- _beads = new Vector.<IBead>;
- _beads.push(bead);
- bead.strand = this;
- }
-
- /**
- * @copy org.apache.royale.core.UIBase#getBeadByType()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- COMPILE::SWF
- public function getBeadByType(classOrInterface:Class):IBead
- {
- for each (var bead:IBead in _beads)
- {
- if (bead is classOrInterface)
- return bead;
- }
- return null;
- }
-
- /**
- * @copy org.apache.royale.core.UIBase#removeBead()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- COMPILE::SWF
- public function removeBead(value:IBead):IBead
- {
- var n:int = _beads.length;
- for (var i:int = 0; i < n; i++)
- {
- var bead:IBead = _beads[i];
- if (bead == value)
- {
- _beads.splice(i, 1);
- return bead;
- }
- }
- return null;
- }
/**
* Allows Javascript cross-site Access-Control requests to be made
@@ -532,11 +438,8 @@ package org.apache.royale.net
*/
public function send():void
{
- if (_beads == null)
- {
- for each (var bead:IBead in beads)
- addBead(bead);
- }
+ if(beads && beads.length)
+ addBeads();
dispatchEvent(new Event("preSend"));
diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPServiceBase.as b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPServiceBase.as
index c0b5a00..eb4b590 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPServiceBase.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/HTTPServiceBase.as
@@ -18,9 +18,12 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.net
{
+ import org.apache.royale.core.IStrand;
COMPILE::SWF
{
- import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.IBead;
}
COMPILE::JS
{
@@ -36,12 +39,140 @@ package org.apache.royale.net
* @productversion Royale 0.0
*/
COMPILE::SWF
- public class HTTPServiceBase extends EventDispatcher
+ public class HTTPServiceBase extends EventDispatcher implements IStrand, IBead
{
+ private var _strand:IStrand;
+
+ /**
+ * @copy org.apache.royale.core.UIBase#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ if(beads && beads.length)
+ {
+ addBeads();
+ }
+ }
+
+ public var beads:Array;
+
+ private var _beads:Vector.<IBead>;
+
+ /**
+ * @copy org.apache.royale.core.IStrand#registerBead()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9
+ */
+ public function registerBead(bead:IBead):void
+ {
+ if(beads)
+ beads.push(bead);
+ else
+ beads = [bead];
+ }
+
+ /**
+ * @copy org.apache.royale.core.UIBase#addBead()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function addBead(bead:IBead):void
+ {
+ if (!_beads)
+ _beads = new Vector.<IBead>;
+ _beads.push(bead);
+ bead.strand = this;
+ }
+
+ /**
+ * @copy org.apache.royale.core.IStrand#addBeads()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9
+ */
+ public function addBeads():void
+ {
+ addBeadsToStrand(this,beads);
+ }
+
+ /**
+ * @copy org.apache.royale.core.UIBase#getBeadByType()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ COMPILE::SWF
+ public function getBeadByType(classOrInterface:Class):IBead
+ {
+ for each (var bead:IBead in _beads)
+ {
+ if (bead is classOrInterface)
+ return bead;
+ }
+ return null;
+ }
+
+ /**
+ * @copy org.apache.royale.core.UIBase#removeBead()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ COMPILE::SWF
+ public function removeBead(value:IBead):IBead
+ {
+ var n:int = _beads.length;
+ for (var i:int = 0; i < n; i++)
+ {
+ var bead:IBead = _beads[i];
+ if (bead == value)
+ {
+ _beads.splice(i, 1);
+ return bead;
+ }
+ }
+ return null;
+ }
}
COMPILE::JS
public class HTTPServiceBase extends ElementWrapper
{
+ private var _strand:IStrand;
+
+ /**
+ * @copy org.apache.royale.core.UIBase#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ if(beads && beads.length)
+ {
+ addBeads();
+ }
+ }
}
}
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.