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/10 12:36:21 UTC
[royale-asjs] branch feature/strandwork updated: Fixed compilation
of bead changes
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
The following commit(s) were added to refs/heads/feature/strandwork by this push:
new ff3e21e Fixed compilation of bead changes
ff3e21e is described below
commit ff3e21e3f6dc2cfcc708ffcc6cc8030020fcfc98
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Dec 10 14:36:11 2017 +0200
Fixed compilation of bead changes
---
.../royale/org/apache/royale/core/Application.as | 6 ++--
.../org/apache/royale/core/HTMLElementWrapper.as | 14 ++++----
.../royale/org/apache/royale/core/UIButtonBase.as | 6 ++--
.../royale/org/apache/royale/html/MXMLBeadView.as | 6 ++--
.../org/apache/royale/html/beads/TextAreaView.as | 6 ++--
.../html/supportClasses/TextFieldItemRenderer.as | 6 ++--
.../projects/Core/src/main/royale/CoreClasses.as | 1 +
.../org/apache/royale/core/ElementWrapper.as | 13 +++-----
.../main/royale/org/apache/royale/core/Strand.as | 7 ++--
.../org/apache/royale/core/registerBeadOnStrand.as | 38 ++++++++++++++++++++++
.../org/apache/royale/utils/MockContentView.as | 2 +-
.../org/apache/royale/utils/MockLayoutChild.as | 2 +-
.../org/apache/royale/utils/MockLayoutParent.as | 2 +-
.../org/apache/royale/net/HTTPServiceBase.as | 12 +++----
14 files changed, 69 insertions(+), 52 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as
index 6bb28ab..b029035 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Application.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
+ import org.apache.royale.core.registerBeadOnStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
@@ -371,10 +372,7 @@ package org.apache.royale.core
COMPILE::SWF
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
index 1d34f0e..d0652db 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
@@ -19,6 +19,7 @@
package org.apache.royale.core
{
import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand;
COMPILE::SWF
{
@@ -67,12 +68,12 @@ package org.apache.royale.core
{
}
+ /**
+ * "abstract" method so we can override in JS
+ * @param bead The new bead.
+ */
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
}
}
@@ -215,10 +216,7 @@ package org.apache.royale.core
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as
index 7bb5f10..7138879 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIButtonBase.as
@@ -22,6 +22,7 @@ package org.apache.royale.core
import flash.display.SimpleButton;
import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand;
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IMeasurementBead;
@@ -740,10 +741,7 @@ package org.apache.royale.core
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as
index b570567..10ff777 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as
@@ -20,6 +20,7 @@ package org.apache.royale.html
{
import org.apache.royale.states.State;
import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand;
import org.apache.royale.core.IBead;
import org.apache.royale.core.ILayoutHost;
import org.apache.royale.core.IParent;
@@ -263,10 +264,7 @@ package org.apache.royale.html
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as
index 6024857..cdf04fb 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as
@@ -24,6 +24,7 @@ package org.apache.royale.html.beads
import flash.text.TextFieldType;
import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand;
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IScrollBarModel;
@@ -213,10 +214,7 @@ package org.apache.royale.html.beads
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
index 5e2f8d5..3a8e23b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
@@ -22,6 +22,7 @@ package org.apache.royale.html.supportClasses
import flash.text.TextFieldType;
import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand;
import org.apache.royale.core.CSSTextField;
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadController;
@@ -494,10 +495,7 @@ package org.apache.royale.html.supportClasses
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index d7c7085..14e2b51 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -27,6 +27,7 @@ package {
internal class CoreClasses
{
import org.apache.royale.core.addBeadsToStrand; addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand; registerBeadOnStrand;
import org.apache.royale.core.BeadViewBase; BeadViewBase;
import org.apache.royale.core.ImageViewBase; ImageViewBase;
import org.apache.royale.core.BrowserWindow; BrowserWindow;
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 141d799..ae9cd73 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
@@ -37,6 +37,7 @@ package org.apache.royale.core
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
+ import org.apache.royale.core.registerBeadOnStrand;
COMPILE::SWF
public class ElementWrapper extends EventDispatcher implements IStrand
@@ -82,10 +83,7 @@ package org.apache.royale.core
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
@@ -265,7 +263,7 @@ package org.apache.royale.core
_element.royale_wrapper = this;
}
- private var beads:Array;
+ public var beads:Array;
protected var _beads:Vector.<IBead>;
@@ -283,10 +281,7 @@ package org.apache.royale.core
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as
index 5c12ca2..210ecae 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/Strand.as
@@ -20,7 +20,7 @@ package org.apache.royale.core
{
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
-
+ import org.apache.royale.core.registerBeadOnStrand;
/**
* The Strand class is the base class for non-display object
* that implement a strand.
@@ -129,10 +129,7 @@ package org.apache.royale.core
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/registerBeadOnStrand.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/registerBeadOnStrand.as
new file mode 100644
index 0000000..2d4f4f6
--- /dev/null
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/registerBeadOnStrand.as
@@ -0,0 +1,38 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.core
+{
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IStrand;
+
+ /**
+ * Helper function for IStrand.registerBead()
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9
+ */
+ public function registerBeadOnStrand(bead:IBead, strand:IStrand):void
+ {
+ if(strand["beads"])
+ strand["beads"].push(bead);
+ else
+ strand["beads"] = [bead];
+ }
+}
\ No newline at end of file
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockContentView.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockContentView.as
index c8dc7e3..4b98580 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockContentView.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockContentView.as
@@ -149,7 +149,7 @@ package org.apache.royale.utils
}
public function registerBead(bead:IBead):void{}
- public function addBeads():void{}
+ public function addBeads(dispatch:Boolean=true):void{}
public function getBeadByType(classOrInterface:Class):IBead
{
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutChild.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutChild.as
index ebe7b66..a14eb49 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutChild.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutChild.as
@@ -228,7 +228,7 @@ package org.apache.royale.utils
{
}
public function registerBead(bead:IBead):void{}
- public function addBeads():void{}
+ public function addBeads(dispatch:Boolean=true):void{}
public function getBeadByType(classOrInterface:Class):IBead
{
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutParent.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutParent.as
index d6feb85..98c8a86 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutParent.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/utils/MockLayoutParent.as
@@ -170,7 +170,7 @@ package org.apache.royale.utils
// TODO Auto Generated method stub
}
public function registerBead(bead:IBead):void{}
- public function addBeads():void{}
+ public function addBeads(dispatch:Boolean=true):void{}
public function getBeadByType(classOrInterface:Class):IBead
{
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 eb4b590..b884537 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,11 +18,12 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.net
{
+ import org.apache.royale.core.addBeadsToStrand;
+ import org.apache.royale.core.registerBeadOnStrand;
import org.apache.royale.core.IStrand;
COMPILE::SWF
{
import org.apache.royale.events.EventDispatcher;
- import org.apache.royale.core.addBeadsToStrand;
import org.apache.royale.core.IBead;
}
COMPILE::JS
@@ -74,10 +75,7 @@ package org.apache.royale.net
*/
public function registerBead(bead:IBead):void
{
- if(beads)
- beads.push(bead);
- else
- beads = [bead];
+ registerBeadOnStrand(bead, this);
}
/**
@@ -104,9 +102,9 @@ package org.apache.royale.net
* @playerversion AIR 2.6
* @productversion Royale 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this, beads, dispatch);
}
/**
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].