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 2015/04/15 23:43:53 UTC
[48/55] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - get
examples to compile on the AS side with refactored swcs
get examples to compile on the AS side with refactored swcs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/13e8b442
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/13e8b442
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/13e8b442
Branch: refs/heads/develop
Commit: 13e8b44270adc518e81b8526a37f879216511aa5
Parents: c84daed
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 14 12:52:15 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 14 12:52:15 2015 -0700
----------------------------------------------------------------------
.../src/StockDataJSONItemConverter.as | 2 +-
.../DataBindingTest_as/src/DataBindingTest.as | 4 +-
.../src/StockDataJSONItemConverter.as | 2 +-
examples/DesktopMap/src/MyInitialView.mxml | 3 +-
.../src/StockDataJSONItemConverter.as | 2 +-
.../src/StockDataJSONItemConverter.as | 2 +-
.../src/StockDataJSONItemConverter.as | 2 +-
examples/MapSearch/src/MyInitialView.mxml | 3 +-
.../src/StockDataJSONItemConverter.as | 2 +-
.../MobileTrader/src/models/ProductsModel.as | 4 +-
.../src/StockDataJSONItemConverter.as | 2 +-
.../src/StockDataJSONItemConverter.as | 2 +-
examples/build_example.xml | 42 ++------------------
13 files changed, 19 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/DataBindingTest/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/DataBindingTest/src/StockDataJSONItemConverter.as b/examples/DataBindingTest/src/StockDataJSONItemConverter.as
index b373d3b..a39606b 100644
--- a/examples/DataBindingTest/src/StockDataJSONItemConverter.as
+++ b/examples/DataBindingTest/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/DataBindingTest_as/src/DataBindingTest.as
----------------------------------------------------------------------
diff --git a/examples/DataBindingTest_as/src/DataBindingTest.as b/examples/DataBindingTest_as/src/DataBindingTest.as
index fb28426..36bc0ab 100644
--- a/examples/DataBindingTest_as/src/DataBindingTest.as
+++ b/examples/DataBindingTest_as/src/DataBindingTest.as
@@ -53,8 +53,8 @@ import org.apache.flex.html.supportClasses.DropDownListList;
import org.apache.flex.html.supportClasses.NonVirtualDataGroup;
import org.apache.flex.html.supportClasses.StringItemRenderer;
import org.apache.flex.net.HTTPService;
-import org.apache.flex.net.JSONInputParser;
-import org.apache.flex.net.dataConverters.LazyCollection;
+import org.apache.flex.collections.parsers.JSONInputParser;
+import org.apache.flex.collections.LazyCollection;
import org.apache.flex.utils.ViewSourceContextMenuOption;
import models.MyModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/DataBindingTest_as/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/DataBindingTest_as/src/StockDataJSONItemConverter.as b/examples/DataBindingTest_as/src/StockDataJSONItemConverter.as
index b373d3b..a39606b 100644
--- a/examples/DataBindingTest_as/src/StockDataJSONItemConverter.as
+++ b/examples/DataBindingTest_as/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/DesktopMap/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/DesktopMap/src/MyInitialView.mxml b/examples/DesktopMap/src/MyInitialView.mxml
index 22971db..fa5bc95 100644
--- a/examples/DesktopMap/src/MyInitialView.mxml
+++ b/examples/DesktopMap/src/MyInitialView.mxml
@@ -19,6 +19,7 @@ limitations under the License.
-->
<basic:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:basic="library://ns.apache.org/flexjs/basic"
+ xmlns:google="library://ns.apache.org/flexjs/google"
xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:local="*"
initComplete="initControls()">
@@ -113,7 +114,7 @@ limitations under the License.
<basic:TextButton text="Go" click="orientMap()" />
</basic:Container>
- <basic:Map id="map" width="450" height="300" token="AIzaSyDkQgg2iojLCYeuW6hK7DkuAHD-SwJJhdE" />
+ <google:Map id="map" width="450" height="300" token="AIzaSyDkQgg2iojLCYeuW6hK7DkuAHD-SwJJhdE" />
<basic:Container>
<basic:beads>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/FlexJSTest_HTML5/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_HTML5/src/StockDataJSONItemConverter.as b/examples/FlexJSTest_HTML5/src/StockDataJSONItemConverter.as
index a030fe0..8f219d5 100644
--- a/examples/FlexJSTest_HTML5/src/StockDataJSONItemConverter.as
+++ b/examples/FlexJSTest_HTML5/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/FlexJSTest_basic/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_basic/src/StockDataJSONItemConverter.as b/examples/FlexJSTest_basic/src/StockDataJSONItemConverter.as
index 2483ce0..35f1b78 100644
--- a/examples/FlexJSTest_basic/src/StockDataJSONItemConverter.as
+++ b/examples/FlexJSTest_basic/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/FlexJSTest_jquery/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_jquery/src/StockDataJSONItemConverter.as b/examples/FlexJSTest_jquery/src/StockDataJSONItemConverter.as
index 2483ce0..35f1b78 100644
--- a/examples/FlexJSTest_jquery/src/StockDataJSONItemConverter.as
+++ b/examples/FlexJSTest_jquery/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/MapSearch/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/MapSearch/src/MyInitialView.mxml b/examples/MapSearch/src/MyInitialView.mxml
index eb1e9f6..8d2f35d 100644
--- a/examples/MapSearch/src/MyInitialView.mxml
+++ b/examples/MapSearch/src/MyInitialView.mxml
@@ -19,6 +19,7 @@ limitations under the License.
-->
<basic:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:basic="library://ns.apache.org/flexjs/basic"
+ xmlns:google="library://ns.apache.org/flexjs/google"
xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:local="*"
initComplete="initControls()">
@@ -183,7 +184,7 @@ limitations under the License.
dataProvider="{MyModel(applicationModel).cities}" />
</basic:Container>
- <basic:Map id="map" width="450" height="300" className="MainMap"
+ <google:Map id="map" width="450" height="300" className="MainMap"
token="AIzaSyDkQgg2iojLCYeuW6hK7DkuAHD-SwJJhdE"
ready="onMapReady()"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/MobileTrader/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/StockDataJSONItemConverter.as b/examples/MobileTrader/src/StockDataJSONItemConverter.as
index 6640bd5..5c21c26 100755
--- a/examples/MobileTrader/src/StockDataJSONItemConverter.as
+++ b/examples/MobileTrader/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/MobileTrader/src/models/ProductsModel.as
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/models/ProductsModel.as b/examples/MobileTrader/src/models/ProductsModel.as
index 553f091..7fb7a22 100755
--- a/examples/MobileTrader/src/models/ProductsModel.as
+++ b/examples/MobileTrader/src/models/ProductsModel.as
@@ -23,8 +23,8 @@ package models
import org.apache.flex.events.Event;
import org.apache.flex.events.EventDispatcher;
import org.apache.flex.net.HTTPService;
- import org.apache.flex.net.JSONInputParser;
- import org.apache.flex.net.dataConverters.LazyCollection;
+ import org.apache.flex.collections.parsers.JSONInputParser;
+ import org.apache.flex.collections.LazyCollection;
public class ProductsModel extends EventDispatcher implements IBeadModel
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/StatesTest/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/StatesTest/src/StockDataJSONItemConverter.as b/examples/StatesTest/src/StockDataJSONItemConverter.as
index b373d3b..a39606b 100644
--- a/examples/StatesTest/src/StockDataJSONItemConverter.as
+++ b/examples/StatesTest/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/StockQuote/src/StockDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/StockQuote/src/StockDataJSONItemConverter.as b/examples/StockQuote/src/StockDataJSONItemConverter.as
index b373d3b..a39606b 100644
--- a/examples/StockQuote/src/StockDataJSONItemConverter.as
+++ b/examples/StockQuote/src/StockDataJSONItemConverter.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package
{
- import org.apache.flex.net.JSONItemConverter;
+ import org.apache.flex.collections.converters.JSONItemConverter;
public class StockDataJSONItemConverter extends JSONItemConverter
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/13e8b442/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index ceb9e07..2e2cc7d 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -31,18 +31,6 @@
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
- <!--
- Link in the classes (and their dependencies) for the MXML tags
- listed in this project's manifest.xml.
- Also link the additional classes (and their dependencies)
- listed in FlexJSUIClasses.as,
- because these aren't referenced by the manifest classes.
- Keep the standard metadata when compiling.
- Include the appropriate CSS files and assets in the SWC.
- Don't include any resources in the SWC.
- Write a bundle list of referenced resource bundles
- into the file bundles.properties in this directory.
- -->
<mxmlc fork="true"
file="${basedir}/src/${example}.mxml"
output="${basedir}/bin-debug/${example}.swf">
@@ -82,18 +70,6 @@
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
- <!--
- Link in the classes (and their dependencies) for the MXML tags
- listed in this project's manifest.xml.
- Also link the additional classes (and their dependencies)
- listed in FlexJSUIClasses.as,
- because these aren't referenced by the manifest classes.
- Keep the standard metadata when compiling.
- Include the appropriate CSS files and assets in the SWC.
- Don't include any resources in the SWC.
- Write a bundle list of referenced resource bundles
- into the file bundles.properties in this directory.
- -->
<mxmlc fork="true"
file="${basedir}/src/${example}.mxml"
output="${basedir}/bin-debug/${example}.swf">
@@ -130,18 +106,6 @@
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
- <!--
- Link in the classes (and their dependencies) for the MXML tags
- listed in this project's manifest.xml.
- Also link the additional classes (and their dependencies)
- listed in FlexJSUIClasses.as,
- because these aren't referenced by the manifest classes.
- Keep the standard metadata when compiling.
- Include the appropriate CSS files and assets in the SWC.
- Don't include any resources in the SWC.
- Write a bundle list of referenced resource bundles
- into the file bundles.properties in this directory.
- -->
<mxmlc fork="true"
file="${basedir}/src/${example}.as"
output="${basedir}/bin-debug/${example}.swf">
@@ -170,7 +134,7 @@
</target>
- <target name="compilejs" description="Cross-compiles ${example}">
+ <target name="compilejs" description="Cross-compiles ${example}" unless="no.js">
<echo message="Compiling ${example}.js"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
@@ -208,7 +172,7 @@
</fail>
</target>
- <target name="compilejsair" description="Cross-compiles ${example}">
+ <target name="compilejsair" description="Cross-compiles ${example}" unless="no.js">
<echo message="Compiling ${example}.js"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
@@ -247,7 +211,7 @@
</fail>
</target>
- <target name="compileasjs" description="Cross-compiles ${example}">
+ <target name="compileasjs" description="Cross-compiles ${example}" unless="no.js">
<echo message="Compiling ${example}.js"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>