You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/01/11 19:06:42 UTC
[3/3] git commit: [flex-asjs] [refs/heads/develop] - clean up
warnings now that compiler doesn't automatically deal with circulars
clean up warnings now that compiler doesn't automatically deal with circulars
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/13880a69
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/13880a69
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/13880a69
Branch: refs/heads/develop
Commit: 13880a69d3f02bb62ec9d8cf3a80348bdc8feaac
Parents: 1c9786d
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 11 08:07:06 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 11 10:06:14 2016 -0800
----------------------------------------------------------------------
examples/build_example.xml | 12 ++++++++++++
examples/flexjs/DataBindingExample/build.xml | 1 +
examples/flexjs/DataBindingExample_Flat/build.xml | 1 +
examples/flexjs/DataBindingExample_as/build.xml | 1 +
examples/flexjs/DesktopMap/build.xml | 1 +
examples/flexjs/FlexJSStore/build.xml | 1 +
.../src/productsView/CatalogTitleButtons.mxml | 4 +++-
examples/flexjs/FlexJSStore_jquery/build.xml | 1 +
examples/flexjs/MapSearch/build.xml | 2 +-
examples/flexjs/MobileTrader/build.xml | 1 +
examples/flexjs/TodoListSampleApp/build.xml | 3 ++-
.../Core/as/src/org/apache/flex/core/ContainerBase.as | 6 ++++++
.../org/apache/flex/core/ContainerBaseStrandChildren.as | 1 +
.../Core/as/src/org/apache/flex/core/ListBase.as | 6 ++++++
.../src/org/apache/flex/core/ListBaseStrandChildren.as | 1 +
.../html/beads/controllers/SpinnerMouseController.as | 1 +
manualtests/build_example.xml | 3 +++
17 files changed, 43 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 9a78647..47d2ae8 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -208,6 +208,8 @@
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
<property name="extlib_arg" value="-define=CONFIG::extlib,false" />
+ <property name="opt1_arg" value="-define=CONFIG::opt1,false" />
+ <property name="opt2_arg" value="-define=CONFIG::opt2,false" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
@@ -223,6 +225,8 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="${extlib_arg}" />
+ <arg value="${opt1_arg}" />
+ <arg value="${opt2_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
@@ -247,6 +251,8 @@
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
<property name="extlib_arg" value="-define=CONFIG::extlib,false" />
+ <property name="opt1_arg" value="-define=CONFIG::opt1,false" />
+ <property name="opt2_arg" value="-define=CONFIG::opt2,false" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
@@ -263,6 +269,8 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="${extlib_arg}" />
+ <arg value="${opt1_arg}" />
+ <arg value="${opt2_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
@@ -287,6 +295,8 @@
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
<property name="extlib_arg" value="-define=CONFIG::extlib,false" />
+ <property name="opt1_arg" value="-define=CONFIG::opt1,false" />
+ <property name="opt2_arg" value="-define=CONFIG::opt2,false" />
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
@@ -304,6 +314,8 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="${extlib_arg}" />
+ <arg value="${opt1_arg}" />
+ <arg value="${opt2_arg}" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/DataBindingExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/build.xml b/examples/flexjs/DataBindingExample/build.xml
index 9a08e7c..ef7961e 100644
--- a/examples/flexjs/DataBindingExample/build.xml
+++ b/examples/flexjs/DataBindingExample/build.xml
@@ -27,6 +27,7 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" />
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/DataBindingExample_Flat/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/build.xml b/examples/flexjs/DataBindingExample_Flat/build.xml
index 5ecc0dd..e571756 100644
--- a/examples/flexjs/DataBindingExample_Flat/build.xml
+++ b/examples/flexjs/DataBindingExample_Flat/build.xml
@@ -23,6 +23,7 @@
<property name="FLEXJS_HOME" location="../../.."/>
<property name="example" value="DataBindingExample" />
<property name="theme_arg" value="-theme=${FLEXJS_HOME}/frameworks/libs/Flat.swc" />
+ <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" />
<property file="${FLEXJS_HOME}/env.properties"/>
<property environment="env"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/DataBindingExample_as/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/build.xml b/examples/flexjs/DataBindingExample_as/build.xml
index 3aed7f8..e55cbe5 100644
--- a/examples/flexjs/DataBindingExample_as/build.xml
+++ b/examples/flexjs/DataBindingExample_as/build.xml
@@ -27,6 +27,7 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" />
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index 3b6daa0..2c71d9b 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -52,6 +52,7 @@
<include file="${basedir}/../../build_example.xml" />
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
+ <property name="opt1_arg" value="-remove-circulars" />
<target name="main" depends="clean,build_example.compilejsair" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/FlexJSStore/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/build.xml b/examples/flexjs/FlexJSStore/build.xml
index 82d62d3..c73a9cf 100644
--- a/examples/flexjs/FlexJSStore/build.xml
+++ b/examples/flexjs/FlexJSStore/build.xml
@@ -27,6 +27,7 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="opt1_arg" value="-js-output-optimization=skipFunctionCoercions" />
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/FlexJSStore/src/productsView/CatalogTitleButtons.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/productsView/CatalogTitleButtons.mxml b/examples/flexjs/FlexJSStore/src/productsView/CatalogTitleButtons.mxml
index 77456be..6bb7d49 100755
--- a/examples/flexjs/FlexJSStore/src/productsView/CatalogTitleButtons.mxml
+++ b/examples/flexjs/FlexJSStore/src/productsView/CatalogTitleButtons.mxml
@@ -37,7 +37,9 @@ limitations under the License.
private function rollOverLabel(event:Event):void
{
- Label(event.target).className = "catalogTitleButtonHighlighted";
+ try {
+ Label(event.target).className = "catalogTitleButtonHighlighted";
+ } catch (e:Error) {}
}
private function rollOutLabel(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/FlexJSStore_jquery/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/build.xml b/examples/flexjs/FlexJSStore_jquery/build.xml
index d78adbd..53f5caf 100644
--- a/examples/flexjs/FlexJSStore_jquery/build.xml
+++ b/examples/flexjs/FlexJSStore_jquery/build.xml
@@ -31,6 +31,7 @@
<include file="${basedir}/../../build_example.xml" />
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc"/>
+ <property name="opt1_arg" value="-js-output-optimization=skipFunctionCoercions" />
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
<mkdir dir="${basedir}/bin-debug/data" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index c661f54..c35e408 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -52,7 +52,7 @@
<include file="${basedir}/../../build_example.xml" />
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
-
+ <property name="opt1_arg" value="-remove-circulars" />
<target name="main" depends="clean,build_example.compilejsair" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index 8384d48..e1b9c97 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -26,6 +26,7 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <property name="opt1_arg" value="-remove-circulars" />
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/examples/flexjs/TodoListSampleApp/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TodoListSampleApp/build.xml b/examples/flexjs/TodoListSampleApp/build.xml
index 3fc578b..4e33b30 100644
--- a/examples/flexjs/TodoListSampleApp/build.xml
+++ b/examples/flexjs/TodoListSampleApp/build.xml
@@ -25,7 +25,8 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
-
+ <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" />
+
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
index cef9a4b..2f7186f 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBase.as
@@ -216,6 +216,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $numElements():int
@@ -225,6 +226,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $addElement(c:Object, dispatchEvent:Boolean = true):void
@@ -234,6 +236,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
@@ -243,6 +246,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $removeElement(c:Object, dispatchEvent:Boolean = true):void
@@ -252,6 +256,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $getElementIndex(c:Object):int
@@ -261,6 +266,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $getElementAt(index:int):Object
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
index dd78ba2..d171288 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ContainerBaseStrandChildren.as
@@ -33,6 +33,7 @@ package org.apache.flex.core
/**
* Constructor.
*
+ * @flexjsignorecoercion org.apache.flex.core.ContainerBase
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
index 0d515b9..6380f2f 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBase.as
@@ -63,6 +63,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $numElements():int
@@ -73,6 +74,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $addElement(c:Object, dispatchEvent:Boolean = true):void
@@ -82,6 +84,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void
@@ -91,6 +94,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $removeElement(c:Object, dispatchEvent:Boolean = true):void
@@ -100,6 +104,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $getElementIndex(c:Object):int
@@ -109,6 +114,7 @@ package org.apache.flex.core
/**
* @private
+ * @suppress {undefinedNames}
* Support strandChildren.
*/
public function $getElementAt(index:int):Object
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
index 899c171..3f77774 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ListBaseStrandChildren.as
@@ -34,6 +34,7 @@ package org.apache.flex.core
/**
* Constructor.
*
+ * @flexjsignorecoercion org.apache.flex.core.ListBase
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
index 48088c4..53309df 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.as
@@ -65,6 +65,7 @@ package org.apache.flex.html.beads.controllers
/**
* @copy org.apache.flex.core.IBead#strand
*
+ * @flexjsignorecoercion org.apache.flex.html.Spinner
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13880a69/manualtests/build_example.xml
----------------------------------------------------------------------
diff --git a/manualtests/build_example.xml b/manualtests/build_example.xml
index f2d8791..30a8639 100644
--- a/manualtests/build_example.xml
+++ b/manualtests/build_example.xml
@@ -169,6 +169,7 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="${extlib_arg}" />
+ <arg value="-remove-circulars" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
@@ -209,6 +210,7 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="${extlib_arg}" />
+ <arg value="-remove-circulars" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
@@ -250,6 +252,7 @@
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
<arg value="${extlib_arg}" />
+ <arg value="-remove-circulars" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />