You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/07 01:22:50 UTC
[01/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - asdoc
build.xml - added title and window title - changed footer
Updated Branches:
refs/heads/release4.11.0 631604ec1 -> 030f5e84c
asdoc build.xml
- added title and window title
- changed footer
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/77410b83
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/77410b83
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/77410b83
Branch: refs/heads/release4.11.0
Commit: 77410b83df21f3068dc02f677418b0fbc56d979b
Parents: 4c4d2dc
Author: mamsellem <ma...@systar.com>
Authored: Fri Oct 4 11:05:03 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Fri Oct 4 11:05:03 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/77410b83/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index ed9ea86..d1834b5 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -71,6 +71,13 @@
<!-- Call asdoc to generate dita xml files -->
<asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true">
+ main-title="${release} Reference "
+ footer="${manifest.Implementation-Vendor}"
+ window-title="ApacheFlex Reference"
+ >
+ <!-- examples-path="${bbrFxDoc.project.docExamples}"
+ templates-path="${bbrFxDoc.project.templates}"-->
+
<!-- top level class to include in asdoc -->
<doc-classes class="AIRFrameworkClasses"/>
<doc-classes class="AIRSparkClasses"/>
[07/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - - FIXED
https://issues.apache.org/jira/browse/FLEX-33801 - UPDATED
https://issues.apache.org/jira/browse/FLEX-33801 - added verbose condition to
log message
Posted by jm...@apache.org.
- FIXED https://issues.apache.org/jira/browse/FLEX-33801
- UPDATED https://issues.apache.org/jira/browse/FLEX-33801
- added verbose condition to log message
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7db2ddcc
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7db2ddcc
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7db2ddcc
Branch: refs/heads/release4.11.0
Commit: 7db2ddccf025706938efe2caa949fe663857b8d3
Parents: b03d482
Author: mamsellem <ma...@systar.com>
Authored: Sun Oct 6 02:01:18 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sun Oct 6 02:01:18 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 30 +++++++++++++++++---
.../asdoc/TopLevelClassesGenerator.java | 5 +++-
2 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7db2ddcc/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index 0557b24..6aa41df 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -22,6 +22,9 @@
<property name="lenient" value="true"/>
<property name="flexlib" location="${FLEX_HOME}/frameworks"/>
+ <property name="doc_output" location="${FLEX_HOME}/asdoc-output" />
+ <property name="include_examples" location="${doc_output}/include_examples" />
+
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
<property file="${FLEX_HOME}/build.properties"/>
@@ -41,12 +44,29 @@
property="TLF_HOME"
value="${env.TLF_HOME}"/>
- <target name="main" depends="clean,doc" description="Clean build of all ASDocs"/>
+ <target name="main" depends="clean,copyExamples,doc" description="Clean build of all ASDocs"/>
<target name="clean" description="Cleans all ASDocs">
- <delete dir="${FLEX_HOME}/asdoc-output"/>
+ <delete dir="${doc_output}"/>
</target>
+ <target name="copyExamples" description="Copy all projects asdocs subdir to singe location">
+ <copy todir="${include_examples}">
+ <fileset dir="${flexlib}/projects/advancedgrids/asdoc/en_US"/>
+ <fileset dir="${flexlib}/projects/airframework/asdoc/en_US"/>
+ <!-- <fileset dir="${flexlib}/projects/apache/asdoc/en_US"/>-->
+ <fileset dir="${flexlib}/projects/charts/asdoc/en_US"/>
+ <!-- <fileset dir="${flexlib}/projects/core/asdoc/en_US"/>-->
+ <!-- <fileset dir="${flexlib}/projects/experimental/asdoc/en_US"/>-->
+ <!-- <fileset dir="${flexlib}/projects/experimental_mobile/asdoc/en_US"/>-->
+ <fileset dir="${flexlib}/projects/framework/asdoc/en_US"/>
+ <fileset dir="${flexlib}/projects/mobilecomponents/asdoc/en_US"/>
+ <!-- <fileset dir="${flexlib}/projects/mx/asdoc/en_US"/>-->
+ <fileset dir="${flexlib}/projects/rpc/asdoc/en_US"/>
+ <fileset dir="${flexlib}/projects/spark/asdoc/en_US"/>
+ </copy>
+ </target>
+
<target name="doc">
<condition property="asdoc.jvm.args" value="-Xmx512m">
@@ -70,10 +90,12 @@
<taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
<!-- Call asdoc to generate dita xml files -->
- <asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true"
+ <asdoc output="${doc_output}" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true"
window-title="ApacheFlex API Reference"
main-title="${release} API Reference "
- footer="${manifest.Implementation-Vendor}" >
+ footer="${manifest.Implementation-Vendor}"
+ examples-path="${include_examples}"
+ >
<!-- top level class to include in asdoc -->
<doc-classes class="AIRFrameworkClasses"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7db2ddcc/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
index 6d3157a..48cdfd8 100644
--- a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
+++ b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
@@ -5005,7 +5005,10 @@ public class TopLevelClassesGenerator
if (experimentalElement != null) {
String fullName = experimentalElement.getAttribute("owner");
- System.out.println(" processing [Experimental] for " + fullName);
+ if (verbose)
+ {
+ System.out.println(" processing [Experimental] for " + fullName);
+ }
AsClass myClass = classTable.get(fullName);
[05/12] git commit: [flex-sdk] [refs/heads/release4.11.0] -
FLEX-33800 Add disclaimer in html ASDocs for experimental classes added test
build
Posted by jm...@apache.org.
FLEX-33800 Add disclaimer in html ASDocs for experimental classes
added test build
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b03d482d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b03d482d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b03d482d
Branch: refs/heads/release4.11.0
Commit: b03d482dbacc6adf3282ca132651868403419dbc
Parents: 89c0d71
Author: mamsellem <ma...@systar.com>
Authored: Sat Oct 5 21:39:54 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sat Oct 5 21:39:54 2013 +0200
----------------------------------------------------------------------
asdoc/test/build_test_experimental.xml | 60 +++++++++++++++++++++++++++
asdoc/test/doc_src/SampleExperimental.as | 30 ++++++++++++++
2 files changed, 90 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b03d482d/asdoc/test/build_test_experimental.xml
----------------------------------------------------------------------
diff --git a/asdoc/test/build_test_experimental.xml b/asdoc/test/build_test_experimental.xml
new file mode 100644
index 0000000..8e0f0fa
--- /dev/null
+++ b/asdoc/test/build_test_experimental.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<project name="ASDocs Test Experimental" default="main" basedir=".">
+ <property name="FLEX_HOME" value="${basedir}/../.."/>
+ <property name="flexlib" location="${FLEX_HOME}/frameworks"/>
+
+ <property file="${FLEX_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEX_HOME}/build.properties"/>
+
+ <available file="${FLEX_HOME}/../flex-tlf/textLayout"
+ type="dir"
+ property="TLF_HOME"
+ value="${FLEX_HOME}/../flex-tlf"/>
+
+ <available file="${FLEX_HOME}/../tlf/textLayout"
+ type="dir"
+ property="TLF_HOME"
+ value="${FLEX_HOME}/../tlf"/>
+
+
+ <target name="main" depends="clean,doc" description="Clean build of all ASDocs"/>
+
+ <target name="clean" description="Cleans all ASDocs">
+ <delete dir="${FLEX_HOME}/asdoc-output"/>
+ </target>
+
+ <target name="doc" description="generate ASDOC for SampleExperimental class">
+ <path id="flexTasks.path">
+ <fileset dir="${FLEX_HOME}">
+ <include name="lib/flexTasks.jar"/>
+ </fileset>
+ </path>
+ <taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
+ <asdoc output="${FLEX_HOME}/asdoc-output" lenient="${lenient}" failonerror="true" warnings="false"
+ keep-xml="true"
+ skip-xsl="false"
+ strict="false" locale="en_US" fork="true">
+ <doc-classes class="SampleExperimental"/>
+ <compiler.source-path path-element="${basedir}/doc_src"/>
+ </asdoc>
+ </target>
+</project>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b03d482d/asdoc/test/doc_src/SampleExperimental.as
----------------------------------------------------------------------
diff --git a/asdoc/test/doc_src/SampleExperimental.as b/asdoc/test/doc_src/SampleExperimental.as
new file mode 100644
index 0000000..6bff593
--- /dev/null
+++ b/asdoc/test/doc_src/SampleExperimental.as
@@ -0,0 +1,30 @@
+package
+{
+
+[DiscouragedForProfile("mobileDevice")]
+[Deprecated(since="4.10")]
+[Experimental]
+
+/**
+ * This is a sample experimental class
+ *
+ * @langversion 3.0
+ * @playerversion AIR 3.8
+ * @productversion Flex 4.11
+ *
+ */
+public class SampleExperimental
+{
+
+ /**
+ * sample foo var
+ */
+ public var foo:String;
+ /**
+ * sample bar
+ */
+ public var bar:String;
+
+
+}
+}
[12/12] git commit: [flex-sdk] [refs/heads/release4.11.0] -
FLEX-33119 updated to download latest version of osmf.swc
Posted by jm...@apache.org.
FLEX-33119 updated to download latest version of osmf.swc
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/030f5e84
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/030f5e84
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/030f5e84
Branch: refs/heads/release4.11.0
Commit: 030f5e84cec5b6fc836bfc1cd3b625b82fbf0a14
Parents: 949dd4e
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Oct 7 10:10:49 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Oct 7 10:10:49 2013 +1100
----------------------------------------------------------------------
frameworks/downloads.xml | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/030f5e84/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 76362fe..c652929 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -119,28 +119,16 @@
</target>
<target name="osmf-download" depends="osmf-check" unless="osmf.swc.present">
- <antcall target="ask-osmf"/>
-
- <available file="${download.dir}/OSMF_1.0.zip" type="file" property="osmf.zip.exists"/>
- <antcall target="download-osmf-zip" />
-
- <unzip src="${download.dir}/OSMF_1.0.zip" dest="${download.dir}">
- <patternset>
- <include name="osmf_source_v1-0.zip"/>
- </patternset>
- </unzip>
- <unzip src="${download.dir}/osmf_source_v1-0.zip" dest="${basedir}/libs">
- <patternset>
- <include name="OSMF.swc"/>
- </patternset>
- <mapper type="glob" from="OSMF.swc" to="osmf.swc" />
- </unzip>
+ <antcall target="ask-osmf"/>
+ <available file="${download.dir}/osmf.swc" type="file" property="osmf.swc.exists"/>
+ <antcall target="download-osmf-swc" />
+ <copy file="${download.dir}/osmf.swc" todir="${basedir}/libs" />
</target>
- <target name="download-osmf-zip" unless="osmf.zip.exists">
+ <target name="download-osmf-swc" unless="osmf.swc.exists">
<mkdir dir="${download.dir}"/>
- <get src="http://sourceforge.net/projects/osmf.adobe/files/OSMF%201.0%20%28final%20source%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zip/download"
- dest="${download.dir}/OSMF_1.0.zip"
+ <get src="http://sourceforge.net/projects/osmf.adobe/files/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc/download"
+ dest="${download.dir}/osmf.swc"
verbose="false"/>
</target>
[03/12] git commit: [flex-sdk] [refs/heads/release4.11.0] -
FLEX-33800 Add disclaimer in html ASDocs for experimental classes
Posted by jm...@apache.org.
FLEX-33800 Add disclaimer in html ASDocs for experimental classes
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/89c0d71c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/89c0d71c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/89c0d71c
Branch: refs/heads/release4.11.0
Commit: 89c0d71c6b3174276dec40c68da2bee06b926a35
Parents: 77410b8
Author: mamsellem <ma...@systar.com>
Authored: Sat Oct 5 21:18:51 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sat Oct 5 21:18:51 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 11 +--
asdoc/templates/ASDoc_terms.xml | 9 +++
asdoc/templates/class-files.xslt | 9 +++
asdoc/templates/class-parts.xslt | 14 ++++
asdoc/templates/images/experimental_small.png | Bin 0 -> 1485 bytes
asdoc/templates/style.css | 4 +
.../src/spark/components/MobileGrid.as | 2 +
.../java/flex2/compiler/asdoc/ClassTable.java | 3 +-
.../asdoc/TopLevelClassesGenerator.java | 78 ++++++++++++-------
.../flex2/compiler/asdoc/TopLevelGenerator.java | 8 +-
.../flex2/compiler/mxml/lang/StandardDefs.java | 2 +-
11 files changed, 100 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index d1834b5..0557b24 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -70,13 +70,10 @@
<taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
<!-- Call asdoc to generate dita xml files -->
- <asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true">
- main-title="${release} Reference "
- footer="${manifest.Implementation-Vendor}"
- window-title="ApacheFlex Reference"
- >
- <!-- examples-path="${bbrFxDoc.project.docExamples}"
- templates-path="${bbrFxDoc.project.templates}"-->
+ <asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true"
+ window-title="ApacheFlex API Reference"
+ main-title="${release} API Reference "
+ footer="${manifest.Implementation-Vendor}" >
<!-- top level class to include in asdoc -->
<doc-classes class="AIRFrameworkClasses"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/asdoc/templates/ASDoc_terms.xml
----------------------------------------------------------------------
diff --git a/asdoc/templates/ASDoc_terms.xml b/asdoc/templates/ASDoc_terms.xml
index 9057df8..8d2f83e 100644
--- a/asdoc/templates/ASDoc_terms.xml
+++ b/asdoc/templates/ASDoc_terms.xml
@@ -4209,6 +4209,15 @@
</draft-comment>
</entry>
</row>
+ <!-- text entry for experimental disclaimer-->
+ <row rowsep="1" class="- topic/row ">
+ <entry colname="1" colsep="1" class="- topic/entry ">
+ <p translate="no" class="- topic/p ">experimental.disclaimer</p>
+ </entry>
+ <entry colname="2" colsep="1" class="- topic/entry ">
+ <p class="- topic/p ">This class is experimental, which means it has not been tested or documented as thoroughly as other core Apache Flex classes.</p>
+ </entry>
+ </row>
</tbody>
</tgroup>
</adobetable>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/asdoc/templates/class-files.xslt
----------------------------------------------------------------------
diff --git a/asdoc/templates/class-files.xslt b/asdoc/templates/class-files.xslt
index 9710273..5f673bf 100644
--- a/asdoc/templates/class-files.xslt
+++ b/asdoc/templates/class-files.xslt
@@ -112,6 +112,14 @@
<xsl:with-param name="packageName" select="$packageName"/>
</xsl:call-template>
</xsl:variable>
+ <xsl:variable name="experimental" >
+ <xsl:if test="prolog/asMetadata/experimental">
+ <xsl:value-of select="'true'"/>
+ </xsl:if>
+ <xsl:if test="not(prolog/asMetadata/experimental)">
+ <xsl:value-of select="'false'"/>
+ </xsl:if>
+ </xsl:variable>
<xsl:result-document href="{$classFile}" method="html">
<!--xsl:message select="$classFile"/-->
<xsl:copy-of select="$docType"/>
@@ -153,6 +161,7 @@
<xsl:call-template name="classHeader">
<xsl:with-param name="classDeprecated" select="$classDeprecated"/>
<xsl:with-param name="classNode" select="$classNode"/>
+ <xsl:with-param name="experimental" select="$experimental"/>
</xsl:call-template>
</xsl:for-each>
<xsl:for-each select="$field_map//apiClassifier[@id=$ID]">
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/asdoc/templates/class-parts.xslt
----------------------------------------------------------------------
diff --git a/asdoc/templates/class-parts.xslt b/asdoc/templates/class-parts.xslt
index bdc5c74..455193a 100644
--- a/asdoc/templates/class-parts.xslt
+++ b/asdoc/templates/class-parts.xslt
@@ -635,6 +635,7 @@
<xsl:template name="classHeader">
<xsl:param name="classNode"/>
<xsl:param name="classDeprecated"/>
+ <xsl:param name="experimental"/>
<xsl:variable name="packageName" select="ancestor-or-self::apiPackage/apiName"/>
<xsl:variable name="baseRef">
<xsl:call-template name="getBaseRef">
@@ -1061,6 +1062,19 @@
</xsl:if>
<xsl:apply-templates select="apiClassifierDetail/apiClassifierDef/apiDeprecated"/>
<xsl:call-template name="version"/>
+
+ <!-- display experimental disclaimer-->
+ <p/>
+ <xsl:if test="$experimental = 'true'">
+ <table width="100%" class="innertable">
+ <tr>
+ <td class="experimental"><img src="{$baseRef}images/experimental_small.png"/></td>
+ <td class="experimental">
+ <xsl:value-of select="$asdoc_terms/row[entry[1][p/text() = 'experimental.disclaimer']]/entry[2]/p"/>
+ </td>
+ </tr>
+ </table>
+ </xsl:if>
<p/>
<xsl:if test="prolog/asMetadata/Alternative">
<xsl:text disable-output-escaping="yes"><br/></xsl:text>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/asdoc/templates/images/experimental_small.png
----------------------------------------------------------------------
diff --git a/asdoc/templates/images/experimental_small.png b/asdoc/templates/images/experimental_small.png
new file mode 100644
index 0000000..872a137
Binary files /dev/null and b/asdoc/templates/images/experimental_small.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/asdoc/templates/style.css
----------------------------------------------------------------------
diff --git a/asdoc/templates/style.css b/asdoc/templates/style.css
index 4a29620..d0af2fe 100644
--- a/asdoc/templates/style.css
+++ b/asdoc/templates/style.css
@@ -410,6 +410,10 @@ table.withBorder {
padding: 2px 3px 2px 3px;
}
+.experimental {
+ background-color: #e4ffe5;
+}
+
.paramSpacer {
font-size: 5px;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
index ce76f6f..3c7719d 100644
--- a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
+++ b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
@@ -48,6 +48,8 @@ use namespace mx_internal;
*/
[Event(name="sortChange", type="spark.events.MobileGridHeaderEvent")]
+[Experimental]
+
/**
* The MobileGrid displays a collection of items in a grid of rows and columns and column headers and is optimized for speed on mobile devices.
* <p> The MobileGrid component provides the following features:
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/modules/compiler/src/java/flex2/compiler/asdoc/ClassTable.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/asdoc/ClassTable.java b/modules/compiler/src/java/flex2/compiler/asdoc/ClassTable.java
index 7e5c9ee..e229884 100644
--- a/modules/compiler/src/java/flex2/compiler/asdoc/ClassTable.java
+++ b/modules/compiler/src/java/flex2/compiler/asdoc/ClassTable.java
@@ -1189,7 +1189,8 @@ public class ClassTable implements DocCommentTable {
// these metaData types can have their own DocComment associated with them, though they might also have no comment.
if (mdi.getId().equals(StandardDefs.MD_STYLE) || mdi.getId().equals(StandardDefs.MD_EVENT) || mdi.getId().equals(StandardDefs.MD_EFFECT)
|| mdi.getId().equals(StandardDefs.MD_SKINSTATE) || mdi.getId().equals(StandardDefs.MD_ALTERNATIVE)
- || mdi.getId().equals(StandardDefs.MD_DISCOURAGEDFORPROFILE))
+ || mdi.getId().equals(StandardDefs.MD_DISCOURAGEDFORPROFILE)
+ || mdi.getId().equals(StandardDefs.MD_EXPERIMENTAL))
{
if (x+1 < numItems) // if it has a comment, it will be the sequentially next DocCommentNode
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
index 929652a..6d3157a 100644
--- a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
+++ b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelClassesGenerator.java
@@ -19,21 +19,11 @@
package flex2.compiler.asdoc;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import flex2.compiler.io.FileUtil;
+import flex2.compiler.mxml.lang.StandardDefs;
+import flex2.compiler.util.ThreadLocalToolkit;
+import flex2.tools.ASDoc.ValidationMessage;
+import org.w3c.dom.*;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -42,16 +32,10 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import flex2.compiler.io.FileUtil;
-import flex2.compiler.util.ThreadLocalToolkit;
-import flex2.tools.ASDoc.ValidationMessage;
+import java.io.*;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* This class converts the toplevel.xml to dita based xml files. It create one
@@ -824,8 +808,6 @@ public class TopLevelClassesGenerator
/**
* process all custom elements for the class xml node and resolve
- *
- * @see references now that we have AClass records for every class name
* record inner class relationship.
* @param record
* @param isInterface
@@ -5017,6 +4999,48 @@ public class TopLevelClassesGenerator
asMetadata.appendChild(alternative);
}
}
+
+ /* adding experimental XML */
+ Element experimentalElement = asDocUtil.getElementByTagName((Element) parent, StandardDefs.MD_EXPERIMENTAL);
+ if (experimentalElement != null) {
+ String fullName = experimentalElement.getAttribute("owner");
+
+ System.out.println(" processing [Experimental] for " + fullName);
+
+ AsClass myClass = classTable.get(fullName);
+
+ if (myClass != null) {
+ Element node = myClass.getNode();
+
+ Element profilesElement = null;
+ Element asMetadata = null;
+ Element prolog = asDocUtil.getElementByTagName(node, "prolog");
+ if (prolog != null) {
+ asMetadata = asDocUtil.getElementByTagName(prolog, "asMetadata");
+ if (asMetadata != null) {
+ profilesElement = asDocUtil.getElementByTagName(asMetadata, "experimental");
+ if (profilesElement == null) {
+ profilesElement = outputObject.createElement("experimental");
+ asMetadata.appendChild(profilesElement);
+ }
+ } else {
+ profilesElement = outputObject.createElement("discouragedForProfiles");
+ asMetadata = outputObject.createElement("asMetadata");
+ asMetadata.appendChild(profilesElement);
+ prolog.appendChild(asMetadata);
+ }
+ } else {
+ profilesElement = outputObject.createElement("discouragedForProfiles");
+ asMetadata = outputObject.createElement("asMetadata");
+ asMetadata.appendChild(profilesElement);
+ prolog = outputObject.createElement("prolog");
+ prolog.appendChild(asMetadata);
+ myClass.getNode().appendChild(prolog);
+ }
+
+ }
+
+ }
Element discouragedForProfileElement = asDocUtil.getElementByTagName((Element)parent, "DiscouragedForProfile");
if (discouragedForProfileElement != null)
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java
index ff445e4..b6390601 100644
--- a/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java
+++ b/modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java
@@ -19,14 +19,14 @@
package flex2.compiler.asdoc;
+import flex2.compiler.mxml.lang.StandardDefs;
+
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import flex2.compiler.mxml.lang.StandardDefs;
-
/**
* This class is used to generate the toplevel.xml file.
*
@@ -279,7 +279,7 @@ public class TopLevelGenerator implements DocCommentGenerator
//These types of metadata can have comments associated with them
if (metadataType == StandardDefs.MD_EVENT || metadataType == StandardDefs.MD_STYLE || metadataType == StandardDefs.MD_EFFECT
|| metadataType == StandardDefs.MD_SKINSTATE || metadataType == StandardDefs.MD_SKINPART || metadataType == StandardDefs.MD_ALTERNATIVE
- || metadataType == StandardDefs.MD_DISCOURAGEDFORPROFILE)
+ || metadataType == StandardDefs.MD_DISCOURAGEDFORPROFILE || metadataType == StandardDefs.MD_EXPERIMENTAL)
{
String desc = meta.getDescription();
if (desc != null)
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/89c0d71c/modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java b/modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java
index 8e0565a..e944da4 100644
--- a/modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java
+++ b/modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java
@@ -373,7 +373,7 @@ public abstract class StandardDefs
public static final String MD_SKINPART = "SkinPart";
public static final String MD_ALTERNATIVE = "Alternative";
public static final String MD_DISCOURAGEDFORPROFILE = "DiscouragedForProfile";
-
+ public static final String MD_EXPERIMENTAL = "Experimental";
// metadata param names
public static final String MDPARAM_BINDABLE_EVENT = "event";
[08/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - -
UPDATEDhttps://issues.apache.org/jira/browse/FLEX-33801 (missing include
examples) - enabled asdoc examples path in build - added includes examples in
MobileGrid asdoc
Posted by jm...@apache.org.
- UPDATEDhttps://issues.apache.org/jira/browse/FLEX-33801 (missing include examples)
- enabled asdoc examples path in build
- added includes examples in MobileGrid asdoc
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/145c1683
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/145c1683
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/145c1683
Branch: refs/heads/release4.11.0
Commit: 145c1683e720085a040a5058ebb1f3e4bd306c32
Parents: 7db2ddc
Author: mamsellem <ma...@systar.com>
Authored: Sun Oct 6 13:41:22 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sun Oct 6 13:52:19 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 2 +-
.../examples/MobileGrid_ApplicationExample.mxml | 24 +++
.../renderers/MyActionButtonPartRenderer.as | 77 +++++++++
.../examples/views/MobileGridView.mxml | 158 +++++++++++++++++++
.../examples/views/MobileGridView2.mxml | 115 ++++++++++++++
.../src/spark/components/MobileGrid.as | 8 +-
.../src/spark/skins/MobileGridSkin.as | 6 +-
7 files changed, 384 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index 6aa41df..98460bf 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -58,7 +58,7 @@
<fileset dir="${flexlib}/projects/charts/asdoc/en_US"/>
<!-- <fileset dir="${flexlib}/projects/core/asdoc/en_US"/>-->
<!-- <fileset dir="${flexlib}/projects/experimental/asdoc/en_US"/>-->
- <!-- <fileset dir="${flexlib}/projects/experimental_mobile/asdoc/en_US"/>-->
+ <fileset dir="${flexlib}/projects/experimental_mobile/asdoc/en_US"/>
<fileset dir="${flexlib}/projects/framework/asdoc/en_US"/>
<fileset dir="${flexlib}/projects/mobilecomponents/asdoc/en_US"/>
<!-- <fileset dir="${flexlib}/projects/mx/asdoc/en_US"/>-->
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/MobileGrid_ApplicationExample.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/MobileGrid_ApplicationExample.mxml b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/MobileGrid_ApplicationExample.mxml
new file mode 100644
index 0000000..4a2558f
--- /dev/null
+++ b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/MobileGrid_ApplicationExample.mxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ 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.
+
+-->
+<s:TabbedViewNavigatorApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark" applicationDPI="160">
+ <s:ViewNavigator label="Grid Sample 1" firstView="views.MobileGridView" width="100%" height="100%" />
+ <s:ViewNavigator label="Grid Sample 2" firstView="views.MobileGridView2" width="100%" height="100%"/>
+</s:TabbedViewNavigatorApplication>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/renderers/MyActionButtonPartRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/renderers/MyActionButtonPartRenderer.as b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/renderers/MyActionButtonPartRenderer.as
new file mode 100644
index 0000000..7d75488
--- /dev/null
+++ b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/renderers/MyActionButtonPartRenderer.as
@@ -0,0 +1,77 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 examples.renderers
+{
+import flash.events.MouseEvent;
+
+import mx.styles.IStyleClient;
+
+import spark.components.Alert;
+
+import spark.components.Button;
+import spark.components.itemRenderers.IMobileGridCellRenderer;
+
+public class MyActionButtonPartRenderer extends Button implements IMobileGridCellRenderer
+{
+
+ private var _data:Object;
+
+ public function MyActionButtonPartRenderer()
+ {
+ super();
+ label = "Go";
+ height=30;
+ addEventListener( MouseEvent.CLICK, onClick);
+ }
+
+ public function set styleProvider(value:IStyleClient):void
+ {
+ }
+
+ public function get canSetContentWidth():Boolean
+ {
+ return true;
+ }
+
+ public function get canSetContentHeight():Boolean
+ {
+ return false;
+ }
+
+ public function set cssStyleName(value:String):void
+ {
+ }
+
+ public function get data():Object
+ {
+ return _data;
+ }
+
+ public function set data(value:Object):void
+ {
+ _data = value;
+ }
+
+ private function onClick(event:MouseEvent):void
+ {
+ Alert.show("Click on: " + data.Name, "Action");
+ }
+
+}
+}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView.mxml b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView.mxml
new file mode 100644
index 0000000..4f62334
--- /dev/null
+++ b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView.mxml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<s:View xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark"
+ xmlns:exp="http://flex.apache.org/experimental/ns"
+ title="MobileGrid"
+ creationComplete="creationCompleteHandler(event)"
+ >
+
+
+ <fx:Style>
+ .bold {
+ fontWeight: bold;
+ }
+
+ .comments {
+ fontStyle: italic;
+ multiline: true;
+ }
+
+ @media (application-dpi: 120) {
+ .comments {
+ fontSize: 9;
+ }
+ }
+
+ @media (application-dpi: 240) {
+ .comments {
+ fontSize: 18;
+ }
+ }
+
+ @media (application-dpi: 160) {
+ .comments {
+ fontSize: 12;
+ }
+ }
+
+ @media (application-dpi: 320) {
+ .comments {
+ fontSize: 24;
+ }
+ }
+
+ </fx:Style>
+
+
+ <exp:MobileGrid id="dgm" dataProvider="{dataProvider}" width="100%" height="100%" >
+ <exp:columns>
+ <exp:MobileGridColumn dataField="Name" styleName="bold" width="100" />
+ <exp:MobileGridColumn dataField="Surname" styleName="bold" width="100"/>
+ <exp:MobileGridColumn dataField="Age" width="50" textAlign="right" />
+ <exp:MobileGridColumn headerText="S" dataField="status" width="30">
+ <exp:itemRenderer>
+ <fx:Component>
+ <exp:MobileGridBitmapCellRenderer iconFunction="{outerDocument.getMDPIStatusIcon}" />
+ </fx:Component>
+ </exp:itemRenderer>
+ </exp:MobileGridColumn>
+ <exp:MobileGridColumn headerText="Full Name" labelFunction="fullName" width="150" />
+ <exp:MobileGridColumn headerText="Comments" dataField="comments" styleName="comments" width="100%" />
+
+ </exp:columns>
+ </exp:MobileGrid>
+
+ <fx:Declarations>
+
+ </fx:Declarations>
+
+ <fx:Script><![CDATA[
+ import mx.collections.ArrayCollection;
+ import mx.core.FlexGlobals;
+ import mx.events.FlexEvent;
+
+ import spark.utils.MultiDPIBitmapSource;
+
+ [Embed('../../embedded/images/aqua_inset_36_red.png')]
+ private const iconRed36:Class;
+
+ [Embed('../../embedded/images/aqua_inset_36_green.png')]
+ private const iconGreen36:Class;
+
+ [Embed('../../embedded/images/status_aqua24_red.png')]
+ private const iconRed24:Class;
+
+ [Embed('../../embedded/images/status_aqua24_green.png')]
+ private const iconGreen24:Class;
+
+ [Embed('../../embedded/images/status_aqua16_red.png')]
+ private const iconRed18:Class;
+
+ [Embed('../../embedded/images/status_aqua16_green.png')]
+ private const iconGreen18:Class;
+
+ private const dataProvider:ArrayCollection = new ArrayCollection();
+
+ private var iconRed:MultiDPIBitmapSource;
+ private var iconGreen:MultiDPIBitmapSource;
+
+ private function creationCompleteHandler(event:FlexEvent):void
+ {
+
+ iconRed = new MultiDPIBitmapSource();
+ with (iconRed)
+ {
+ source160dpi = iconRed18;
+ source240dpi = iconRed24;
+ source320dpi = iconRed36;
+ }
+
+ iconGreen = new MultiDPIBitmapSource()
+ with (iconGreen)
+ {
+ source160dpi = iconGreen18;
+ source240dpi = iconGreen24;
+ source320dpi = iconGreen36;
+ }
+
+ var src:Array = [];
+ for (var i:int = 0; i <50; i++)
+ {
+ src.push({Name: "John_" + i, Surname: "Doe_" + i, Age: 5 + i, status: 1000 + i, comments: "Sed tamen haec cum ita tutius observentur, quidam vigore artuum inminuto rogati ad nuptias\n ubi aurum dextris manibus cavatis offertur, inpigre vel usque Spoletium pergunt. haec nobilium sunt."});
+ src.push({Name: "Paul_" + i, Surname: "Smith_" + i, Age: 12 + i, status: 2000 + i, comments: "Quanta autem vis amicitiae sit, ex hoc intellegi maxime potest, quod ex infinita societate \ngeneris humani, quam conciliavit ipsa natura, ita contracta res est et adducta in angustum ut omnis caritas." });
+ src.push({Name: "Sarah_" + i, Surname: "Lee_" + i, Age: 42 + i, status: 2000 + i, comments: "Ideo urbs venerabilis post superbas efferatarum gentium cervices oppressas latasque leges \nfundamenta libertatis et retinacula sempiterna velut frugi parens et prudens et dives Caesaribus tamquam."});
+ }
+ dataProvider.source = src;
+ }
+
+ private function fullName(o:Object):String
+ {
+ return o.Name + " " + o.Surname;
+ }
+
+ public function getMDPIStatusIcon(e:Object):MultiDPIBitmapSource
+ {
+ return e.status >= 2000 ? iconRed : iconGreen;
+ }
+
+ ]]></fx:Script>
+</s:View>
+
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView2.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView2.mxml b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView2.mxml
new file mode 100644
index 0000000..c4c8e6c
--- /dev/null
+++ b/frameworks/projects/experimental_mobile/asdoc/en_US/spark/components/examples/views/MobileGridView2.mxml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+<s:View xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark"
+ xmlns:exp="http://flex.apache.org/experimental/ns"
+ title="MobileGrid w/ Custom Renderer"
+ creationComplete="creationCompleteHandler(event)"
+ >
+
+ <exp:MobileGrid id="dgm" dataProvider="{dataProvider}" width="100%" height="100%" >
+ <exp:columns>
+ <exp:MobileGridColumn dataField="Name" styleName="bold" width="20%" />
+ <exp:MobileGridColumn dataField="Surname" styleName="bold" width="20%"/>
+ <exp:MobileGridColumn dataField="comments" width="100%" />
+ <exp:MobileGridColumn headerText="Action" dataField="Name" width="80" sortable="false"
+ itemRenderer="renderers.MyIconItemRenderer"/>
+ </exp:columns>
+ </exp:MobileGrid>
+
+ <fx:Declarations>
+
+ </fx:Declarations>
+
+ <fx:Script><![CDATA[
+ import mx.collections.ArrayCollection;
+ import mx.events.FlexEvent;
+
+ import spark.utils.MultiDPIBitmapSource;
+
+ [Embed('../../embedded/images/aqua_inset_36_red.png')]
+ private const iconRed36:Class;
+
+ [Embed('../../embedded/images/aqua_inset_36_green.png')]
+ private const iconGreen36:Class;
+
+ [Embed('../../embedded/images/status_aqua24_red.png')]
+ private const iconRed24:Class;
+
+ [Embed('../../embedded/images/status_aqua24_green.png')]
+ private const iconGreen24:Class;
+
+ [Embed('../../embedded/images/status_aqua16_red.png')]
+ private const iconRed18:Class;
+
+ [Embed('../../embedded/images/status_aqua16_green.png')]
+ private const iconGreen18:Class;
+
+ private const dataProvider:ArrayCollection = new ArrayCollection();
+
+ private var iconRed:MultiDPIBitmapSource;
+ private var iconGreen:MultiDPIBitmapSource;
+
+ private function creationCompleteHandler(event:FlexEvent):void
+ {
+
+ iconRed = new MultiDPIBitmapSource();
+ with (iconRed)
+ {
+ source160dpi = iconRed18;
+ source240dpi = iconRed24;
+ source320dpi = iconRed36;
+ }
+
+ iconGreen = new MultiDPIBitmapSource()
+ with (iconGreen)
+ {
+ source160dpi = iconGreen18;
+ source240dpi = iconGreen24;
+ source320dpi = iconGreen36;
+ }
+
+ var src:Array = [];
+ for (var i:int = 0; i <50; i++)
+ {
+ src.push({Name: "John_" + i, Surname: "Doe_" + i, Age: 5 + i, status: 1000 + i, comments: "Sed tamen haec cum ita tutius observentur, quidam vigore artuum inminuto rogati ad nuptias\n ubi aurum dextris manibus cavatis offertur, inpigre vel usque Spoletium pergunt. haec nobilium sunt."});
+ src.push({Name: "Paul_" + i, Surname: "Smith_" + i, Age: 12 + i, status: 2000 + i, comments: "Quanta autem vis amicitiae sit, ex hoc intellegi maxime potest, quod ex infinita societate \ngeneris humani, quam conciliavit ipsa natura, ita contracta res est et adducta in angustum ut omnis caritas." });
+ src.push({Name: "Sarah_" + i, Surname: "Lee_" + i, Age: 42 + i, status: 2000 + i, comments: "Ideo urbs venerabilis post superbas efferatarum gentium cervices oppressas latasque leges \nfundamenta libertatis et retinacula sempiterna velut frugi parens et prudens et dives Caesaribus tamquam."});
+ }
+ dataProvider.source = src;
+ }
+
+ private function fullName(o:Object):String
+ {
+ return o.Name + " " + o.Surname;
+ }
+
+ public function get160DPIStatusIcon(e:Object):Class
+ {
+ return e.status >= 2000 ? iconRed18 : iconGreen18;
+ }
+
+ public function getMDPIStatusIcon(e:Object):MultiDPIBitmapSource
+ {
+ return e.status >= 2000 ? iconRed : iconGreen;
+ }
+ ]]></fx:Script>
+</s:View>
+
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
index 3c7719d..d58f885 100644
--- a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
+++ b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
@@ -75,10 +75,14 @@ use namespace mx_internal;
* in a single row are managed by one single MobileGridRowRenderer that delegates the individual cell renderers to light-weight sub-renderers. </p>
* <p> You usually don't access this internal row renderer yourself, and will rather define the individual cell renderers.</p>
* <p> This technique ensures optimal display and memory performance, which is critical for mobile devices, at the price of less flexibility for cell renderers. </p>
- * <p>Click the link below to view examples of MobileGrid usage on the ApacheFlex github repository.</p>
*
* @see spark.components.supportClasses.MobileGridColumn
- * @see https://github.com/apache/flex-examples/tree/develop/showcase/4.11/components/mobilegrid/index.html Examples of MobileGrid usage on ApacheFlex github
+ *
+ * @includeExample examples/MobileGrid_ApplicationExample.mxml -noswf
+ * @includeExample examples/views/MobileGridView.mxml -noswf
+ * @includeExample examples/views/MobileGridView2.mxml -noswf
+ * @includeExample examples/renderers/MyActionButtonPartRenderer.as -noswf
+ *
* @langversion 3.0
* @playerversion AIR 3.8
* @productversion Flex 4.11
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/145c1683/frameworks/projects/experimental_mobile/src/spark/skins/MobileGridSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/src/spark/skins/MobileGridSkin.as b/frameworks/projects/experimental_mobile/src/spark/skins/MobileGridSkin.as
index 35353f8..4956dd5 100644
--- a/frameworks/projects/experimental_mobile/src/spark/skins/MobileGridSkin.as
+++ b/frameworks/projects/experimental_mobile/src/spark/skins/MobileGridSkin.as
@@ -33,7 +33,7 @@ import spark.components.supportClasses.MobileGridHeader;
import spark.layouts.HorizontalAlign;
import spark.layouts.VerticalLayout;
import spark.skins.mobile.supportClasses.MobileSkin;
-import spark.utils.MultiDPIBitmapSourceExt;
+import spark.utils.MultiDPIBitmapSource;
use namespace mx_internal;
@@ -72,10 +72,10 @@ public class MobileGridSkin extends MobileSkin
minWidth = 100;
break;
}
- var headerShadowSrc:MultiDPIBitmapSourceExt = new MultiDPIBitmapSourceExt();
+ var headerShadowSrc:MultiDPIBitmapSource = new MultiDPIBitmapSource();
headerShadowSrc.source320dpi = headerShadowCls320;
headerShadowSrc.source160dpi = headerShadowCls160;
- headerShadowCls = Class(headerShadowSrc.getSource(NaN));
+ headerShadowCls = Class(headerShadowSrc.getMultiSource());
}
override protected function commitCurrentState():void
[06/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'asdoc' into develop
Posted by jm...@apache.org.
Merge branch 'asdoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f7d26071
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f7d26071
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f7d26071
Branch: refs/heads/release4.11.0
Commit: f7d26071dc3ebd92797835e4075120cffce081a4
Parents: f322586 b03d482
Author: mamsellem <ma...@systar.com>
Authored: Sat Oct 5 21:40:41 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sat Oct 5 21:40:41 2013 +0200
----------------------------------------------------------------------
asdoc/test/build_test_experimental.xml | 60 +++++++++++++++++++++++++++
asdoc/test/doc_src/SampleExperimental.as | 30 ++++++++++++++
2 files changed, 90 insertions(+)
----------------------------------------------------------------------
[10/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'release4.11.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into develop
Posted by jm...@apache.org.
Merge branch 'release4.11.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/27e29903
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/27e29903
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/27e29903
Branch: refs/heads/release4.11.0
Commit: 27e299036abfef188ffdc6f23b25a8d4a696b877
Parents: f7d2607 631604e
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Oct 7 00:35:05 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Oct 7 00:35:05 2013 +1100
----------------------------------------------------------------------
build/check_sigs.sh | 77 +++++++++++++++++++++++++++++++
build/deploy_release_candidate.sh | 82 ++++++++++++++++++++++++++++++++++
build/make_release_branch.sh | 49 ++++++++++++++++++++
build/tag_release_candidate.sh | 47 +++++++++++++++++++
4 files changed, 255 insertions(+)
----------------------------------------------------------------------
[04/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'asdoc' into develop
Posted by jm...@apache.org.
Merge branch 'asdoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f322586f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f322586f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f322586f
Branch: refs/heads/release4.11.0
Commit: f322586f3a529043010d6542df1385acee3b8650
Parents: e73149c 89c0d71
Author: mamsellem <ma...@systar.com>
Authored: Sat Oct 5 21:22:32 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sat Oct 5 21:22:32 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 6 +-
asdoc/templates/ASDoc_terms.xml | 9 +++
asdoc/templates/class-files.xslt | 9 +++
asdoc/templates/class-parts.xslt | 14 ++++
asdoc/templates/images/experimental_small.png | Bin 0 -> 1485 bytes
asdoc/templates/style.css | 4 +
.../src/spark/components/MobileGrid.as | 2 +
.../java/flex2/compiler/asdoc/ClassTable.java | 3 +-
.../asdoc/TopLevelClassesGenerator.java | 78 ++++++++++++-------
.../flex2/compiler/asdoc/TopLevelGenerator.java | 8 +-
.../flex2/compiler/mxml/lang/StandardDefs.java | 2 +-
11 files changed, 101 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f322586f/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
----------------------------------------------------------------------
[02/12] git commit: [flex-sdk] [refs/heads/release4.11.0] -
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for
mobile - added missing licence notice
Posted by jm...@apache.org.
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for mobile
- added missing licence notice
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e73149c6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e73149c6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e73149c6
Branch: refs/heads/release4.11.0
Commit: e73149c68488da3670dc443e5dbd5c4cd0ae0ab1
Parents: 050a7ae
Author: mamsellem <ma...@systar.com>
Authored: Sat Oct 5 10:50:32 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sat Oct 5 10:50:32 2013 +0200
----------------------------------------------------------------------
.../src/spark/layouts/MobileGridLayout.as | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e73149c6/frameworks/projects/experimental_mobile/src/spark/layouts/MobileGridLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/src/spark/layouts/MobileGridLayout.as b/frameworks/projects/experimental_mobile/src/spark/layouts/MobileGridLayout.as
index a5901d8..185488c 100644
--- a/frameworks/projects/experimental_mobile/src/spark/layouts/MobileGridLayout.as
+++ b/frameworks/projects/experimental_mobile/src/spark/layouts/MobileGridLayout.as
@@ -1,3 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 spark.layouts
{
import mx.core.mx_internal;
[09/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'asdoc' into develop
Posted by jm...@apache.org.
Merge branch 'asdoc' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/805865fd
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/805865fd
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/805865fd
Branch: refs/heads/release4.11.0
Commit: 805865fd3e3ba20bc341b57c21774feac4476970
Parents: f7d2607 145c168
Author: mamsellem <ma...@systar.com>
Authored: Sun Oct 6 14:01:02 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sun Oct 6 14:01:02 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 30 +++-
.../examples/MobileGrid_ApplicationExample.mxml | 24 +++
.../renderers/MyActionButtonPartRenderer.as | 77 +++++++++
.../examples/views/MobileGridView.mxml | 158 +++++++++++++++++++
.../examples/views/MobileGridView2.mxml | 115 ++++++++++++++
.../src/spark/components/MobileGrid.as | 5 +
.../asdoc/TopLevelClassesGenerator.java | 5 +-
7 files changed, 409 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[11/12] git commit: [flex-sdk] [refs/heads/release4.11.0] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by jm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/949dd4e5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/949dd4e5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/949dd4e5
Branch: refs/heads/release4.11.0
Commit: 949dd4e567d3d9788511cd6a1cd74407895b8002
Parents: 805865f 27e2990
Author: mamsellem <ma...@systar.com>
Authored: Sun Oct 6 15:53:48 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sun Oct 6 15:53:48 2013 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------