You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/05 07:47:21 UTC
[37/50] [abbrv] git commit: [flex-asjs]
[refs/heads/feature-autobuild/closure-classpath-sources] - clean up build
after merge. I wonder if fork is causing things to mess up on merges. I
thought I'd made these changes before
clean up build after merge. I wonder if fork is causing things to mess up on merges. I thought I'd made these changes before
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1b6c3af2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1b6c3af2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1b6c3af2
Branch: refs/heads/feature-autobuild/closure-classpath-sources
Commit: 1b6c3af235708d1b73e9816bf8f4aa2e79326694
Parents: a5cf277
Author: Alex Harui <ah...@apache.org>
Authored: Tue Nov 1 08:33:05 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Nov 1 08:33:05 2016 -0700
----------------------------------------------------------------------
.../flex/org/apache/flex/core/ContainerBase.as | 20 ++++++++++----------
.../flex/core/ContainerBaseStrandChildren.as | 10 +++++-----
.../main/flex/org/apache/flex/core/ListBase.as | 10 +++++-----
.../apache/flex/core/ListBaseStrandChildren.as | 12 +++++-------
.../main/flex/org/apache/flex/core/UIBase.as | 19 +++++++++++--------
.../org/apache/flex/svg/GraphicContainer.as | 18 +++++++-----------
6 files changed, 43 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
index 5b6cc26..0dd0b53 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
@@ -106,7 +106,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override public function getElementAt(index:int):Object
+ override public function getElementAt(index:int):IChild
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -119,7 +119,7 @@ package org.apache.flex.core
/**
* @private
*/
- override public function getElementIndex(c:Object):int
+ override public function getElementIndex(c:IChild):int
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -132,7 +132,7 @@ package org.apache.flex.core
/**
* @private
*/
- override public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -148,7 +148,7 @@ package org.apache.flex.core
/**
* @private
*/
- override public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -164,7 +164,7 @@ package org.apache.flex.core
/**
* @private
*/
- override public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -229,7 +229,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $addElement(c:Object, dispatchEvent:Boolean = true):void
+ public function $addElement(c:IChild, dispatchEvent:Boolean = true):void
{
super.addElement(c, dispatchEvent);
}
@@ -239,7 +239,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ public function $addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
super.addElementAt(c, index, dispatchEvent);
}
@@ -249,7 +249,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $removeElement(c:Object, dispatchEvent:Boolean = true):void
+ public function $removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
super.removeElement(c, dispatchEvent);
}
@@ -259,7 +259,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $getElementIndex(c:Object):int
+ public function $getElementIndex(c:IChild):int
{
return super.getElementIndex(c);
}
@@ -269,7 +269,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $getElementAt(index:int):Object
+ public function $getElementAt(index:int):IChild
{
return super.getElementAt(index);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
index 93e5c53..e961c1f 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
@@ -59,7 +59,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
owner.$addElement(c, dispatchEvent);
}
@@ -67,7 +67,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
owner.$addElementAt(c, index, dispatchEvent);
}
@@ -75,7 +75,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
owner.$removeElement(c, dispatchEvent);
}
@@ -83,7 +83,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function getElementIndex(c:Object):int
+ public function getElementIndex(c:IChild):int
{
return owner.$getElementIndex(c);
}
@@ -91,7 +91,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function getElementAt(index:int):Object
+ public function getElementAt(index:int):IChild
{
return owner.$getElementAt(index);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
index dbdcace..f9c0aaa 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
@@ -77,7 +77,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $addElement(c:Object, dispatchEvent:Boolean = true):void
+ public function $addElement(c:IChild, dispatchEvent:Boolean = true):void
{
super.addElement(c, dispatchEvent);
}
@@ -87,7 +87,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ public function $addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
super.addElementAt(c, index, dispatchEvent);
}
@@ -97,7 +97,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $removeElement(c:Object, dispatchEvent:Boolean = true):void
+ public function $removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
super.removeElement(c, dispatchEvent);
}
@@ -107,7 +107,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $getElementIndex(c:Object):int
+ public function $getElementIndex(c:IChild):int
{
return super.getElementIndex(c);
}
@@ -117,7 +117,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $getElementAt(index:int):Object
+ public function $getElementAt(index:int):IChild
{
return super.getElementAt(index);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as
index e8f2fa5..d2c413b 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as
@@ -18,8 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
-
-
/**
* The ListBaseStrandChildren exists so that Lists are compatible with
* the ListView/ContainerView beads.
@@ -60,7 +58,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
owner.$addElement(c, dispatchEvent);
}
@@ -68,7 +66,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
owner.$addElementAt(c, index, dispatchEvent);
}
@@ -76,7 +74,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
owner.$removeElement(c, dispatchEvent);
}
@@ -84,7 +82,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function getElementIndex(c:Object):int
+ public function getElementIndex(c:IChild):int
{
return owner.$getElementIndex(c);
}
@@ -92,7 +90,7 @@ package org.apache.flex.core
/**
* @private
*/
- public function getElementAt(index:int):Object
+ public function getElementAt(index:int):IChild
{
return owner.$getElementAt(index);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
index dc2b774..5cab77d 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
@@ -1098,8 +1098,9 @@ package org.apache.flex.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.IUIBase
*/
- public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
COMPILE::SWF
{
@@ -1117,7 +1118,7 @@ package org.apache.flex.core
COMPILE::JS
{
element.appendChild(c.positioner);
- c.addedToParent();
+ (c as IUIBase).addedToParent();
}
}
@@ -1128,8 +1129,9 @@ package org.apache.flex.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.IUIBase
*/
- public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
COMPILE::SWF
{
@@ -1153,7 +1155,7 @@ package org.apache.flex.core
{
element.insertBefore(c.positioner,
children[index]);
- c.addedToParent();
+ (c as IUIBase).addedToParent();
}
}
}
@@ -1166,7 +1168,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function getElementAt(index:int):Object
+ public function getElementAt(index:int):IChild
{
COMPILE::SWF
{
@@ -1187,7 +1189,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function getElementIndex(c:Object):int
+ public function getElementIndex(c:IChild):int
{
COMPILE::SWF
{
@@ -1216,8 +1218,9 @@ package org.apache.flex.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion HTMLElement
*/
- public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
COMPILE::SWF
{
@@ -1228,7 +1231,7 @@ package org.apache.flex.core
}
COMPILE::JS
{
- element.removeChild(c.element);
+ element.removeChild(c.element as HTMLElement);
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
index b25ebf2..8e8498f 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as
@@ -21,6 +21,7 @@ package org.apache.flex.svg
{
import org.apache.flex.core.IContainer;
import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.IChild;
}
[DefaultProperty("mxmlContent")]
@@ -33,11 +34,6 @@ package org.apache.flex.svg
super();
}
- public function get transformElement():IFlexJSElement
- {
- return element;
- }
-
}
COMPILE::JS
@@ -72,7 +68,7 @@ package org.apache.flex.svg
}
- public function get transformElement():org.apache.flex.core.WrappedHTMLElement
+ override public function get transformElement():org.apache.flex.core.WrappedHTMLElement
{
return graphicGroup.element;
}
@@ -85,7 +81,7 @@ package org.apache.flex.svg
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override public function getElementAt(index:int):Object
+ override public function getElementAt(index:int):IChild
{
return graphicGroup.getElementAt(index);
}
@@ -98,7 +94,7 @@ package org.apache.flex.svg
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override public function addElement(c:Object, dispatchEvent:Boolean = true):void
+ override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
graphicGroup.addElement(c, dispatchEvent);
if (dispatchEvent)
@@ -113,7 +109,7 @@ package org.apache.flex.svg
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
+ override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
graphicGroup.addElementAt(c, index, dispatchEvent);
if (dispatchEvent)
@@ -128,7 +124,7 @@ package org.apache.flex.svg
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override public function removeElement(c:Object, dispatchEvent:Boolean = true):void
+ override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
graphicGroup.removeElement(c, dispatchEvent);
if (dispatchEvent)
@@ -156,7 +152,7 @@ package org.apache.flex.svg
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- override public function getElementIndex(c:Object):int
+ override public function getElementIndex(c:IChild):int
{
return graphicGroup.getElementIndex(c);
}