You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ma...@apache.org on 2013/10/06 15:57:42 UTC
[01/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
updated release notes
Updated Branches:
refs/heads/mobileexperimental 4c4d2dc80 -> 949dd4e56
updated release notes
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8f7d890d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8f7d890d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8f7d890d
Branch: refs/heads/mobileexperimental
Commit: 8f7d890d971b0c4dc788988865fd9fd77cb9ec02
Parents: 54f51a3
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Sep 27 19:23:00 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Sep 27 19:23:00 2013 +1000
----------------------------------------------------------------------
RELEASE_NOTES | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8f7d890d/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a527362..b412925 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -55,6 +55,7 @@ Bug Fixes
JIRA Issue Number and Summary
-------------------------------------------------------------------------------------------------------------------
+FLEX-33782 AccordionData labelField and labelFunction properties don't work
FLEX-33771 compatibilityVersionString returns the wrong value
FLEX-33748 TabBar shouldn't be colorized in TabNavigatorSkin
FLEX-33741 Propagation of Escape key in mx.controls.DateField should only be stopped if the DropDown is shown
[20/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Merge branch 'asdoc' into develop
Posted by ma...@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/mobileexperimental
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(+)
----------------------------------------------------------------------
[05/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Correcting ASDOC comments.
Posted by ma...@apache.org.
Correcting ASDOC comments.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c3d5e628
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c3d5e628
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c3d5e628
Branch: refs/heads/mobileexperimental
Commit: c3d5e628ab1da9b91cdbcfe2ffd88f467879e53f
Parents: 760c581
Author: Mark Kessler <Ke...@gmail.com>
Authored: Tue Oct 1 20:04:29 2013 -0400
Committer: Mark Kessler <Ke...@gmail.com>
Committed: Tue Oct 1 20:04:29 2013 -0400
----------------------------------------------------------------------
frameworks/projects/spark/src/spark/components/Grid.as | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c3d5e628/frameworks/projects/spark/src/spark/components/Grid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Grid.as b/frameworks/projects/spark/src/spark/components/Grid.as
index 1ce7d91..c31e781 100644
--- a/frameworks/projects/spark/src/spark/components/Grid.as
+++ b/frameworks/projects/spark/src/spark/components/Grid.as
@@ -1267,9 +1267,9 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
/**
* The doubleClick mode of the control. Possible values are:
- * <code>GridSelectionMode.CELL</code>,
- * <code>GridSelectionMode.GRID</code>,
- * <code>GridSelectionMode.ROW</code>,
+ * <code>GridDoubleClickMode.CELL</code>,
+ * <code>GridDoubleClickMode.GRID</code>,
+ * <code>GridDoubleClickMode.ROW</code>,
*
* <p>Changing the doubleClickMode changes the double click
* criteria for firing the doubleClick event</p>
[19/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
FLEX-33800 Add disclaimer in html ASDocs for experimental classes added test
build
Posted by ma...@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/mobileexperimental
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;
+
+
+}
+}
[17/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
FLEX-33800 Add disclaimer in html ASDocs for experimental classes
Posted by ma...@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/mobileexperimental
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";
[10/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
asdoc build.xml - added title and window title - changed footer
Posted by ma...@apache.org.
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/mobileexperimental
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"/>
[23/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Merge branch 'asdoc' into develop
Posted by ma...@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/mobileexperimental
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(-)
----------------------------------------------------------------------
[25/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk
into develop
Posted by ma...@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/mobileexperimental
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
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
added recent resolved JIRA to release notes
Posted by ma...@apache.org.
added recent resolved JIRA to release notes
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/760c581c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/760c581c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/760c581c
Branch: refs/heads/mobileexperimental
Commit: 760c581c56ae16dab8d36e4d84a52bb71c8be18e
Parents: 1160a72
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Oct 1 10:46:54 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Oct 1 10:46:54 2013 +1000
----------------------------------------------------------------------
RELEASE_NOTES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/760c581c/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index b412925..49ac8af 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -55,6 +55,8 @@ Bug Fixes
JIRA Issue Number and Summary
-------------------------------------------------------------------------------------------------------------------
+FLEX-33789 Logical error: self-reference in GridHeaderViewLayout
+FLEX-33783 mxmlc -help returns 1
FLEX-33782 AccordionData labelField and labelFunction properties don't work
FLEX-33771 compatibilityVersionString returns the wrong value
FLEX-33748 TabBar shouldn't be colorized in TabNavigatorSkin
[12/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for
mobile - use SDK new MultiBitmapSource.getMultiSource() in MobileGridSkin
Posted by ma...@apache.org.
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for mobile
- use SDK new MultiBitmapSource.getMultiSource() in MobileGridSkin
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f775f9b4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f775f9b4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f775f9b4
Branch: refs/heads/mobileexperimental
Commit: f775f9b4af1c1df3ad8bb7aebb93b1c538aad5a6
Parents: d2becdf
Author: mamsellem <ma...@systar.com>
Authored: Fri Oct 4 18:30:43 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Fri Oct 4 18:30:43 2013 +0200
----------------------------------------------------------------------
.../src/spark/skins/MobileGridSkin.as | 6 +-
.../src/spark/utils/MultiDPIBitmapSourceExt.as | 69 --------------------
2 files changed, 3 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f775f9b4/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
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f775f9b4/frameworks/projects/experimental_mobile/src/spark/utils/MultiDPIBitmapSourceExt.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental_mobile/src/spark/utils/MultiDPIBitmapSourceExt.as b/frameworks/projects/experimental_mobile/src/spark/utils/MultiDPIBitmapSourceExt.as
deleted file mode 100644
index 0a01f34..0000000
--- a/frameworks/projects/experimental_mobile/src/spark/utils/MultiDPIBitmapSourceExt.as
+++ /dev/null
@@ -1,69 +0,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.
-//
-////////////////////////////////////////////////////////////////////////////////
-package spark.utils
-{
-import mx.core.FlexGlobals;
-import mx.utils.DensityUtil;
-
-//TODO mamsellem move this code to parent class, updates any callers, and remove this class
-
-/** @private
- * Adds default behavior to its parent class MultiDPIBitmapSource.
- *
- */
-public class MultiDPIBitmapSourceExt extends MultiDPIBitmapSource
-{
-
- /**
- * Select one of the sourceXXXdpi properties based on the given DPI. This
- * function handles the fallback to different sourceXXXdpi properties
- * if the given one is null.
- * The strategy is to try to choose the next highest
- * property if it is not null, then return a lower property if not null, then
- * just return null.
- * If desiredDPI is NaN or 0, return the sourceXXXdpi for the runtime DPI .
- *
- * @param The desired DPI.
- *
- * @return One of the sourceXXXdpi properties based on the desired DPI.
- *
- * @langversion 3.0
- * @playerversion AIR 3.8
- * @productversion Flex 4.11
- */
-
- override public function getSource(desiredDPI:Number):Object
- {
- if (isNaN(desiredDPI) || (desiredDPI == 0))
- {
- var app:Object = FlexGlobals.topLevelApplication;
- var dpi:Number;
- if ("runtimeDPI" in app)
- dpi = app["runtimeDPI"];
- else
- dpi = DensityUtil.getRuntimeDPI();
- return getSource(dpi);
- }
- else
- return super.getSource(desiredDPI);
- }
-
-
-}
-}
[02/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
FLEX-33783 Exist with 0 rather than 1 when -help is passed
Posted by ma...@apache.org.
FLEX-33783 Exist with 0 rather than 1 when -help is passed
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ffdec513
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ffdec513
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ffdec513
Branch: refs/heads/mobileexperimental
Commit: ffdec513ba84f796897405e3fa9d7e542eaa2761
Parents: 8f7d890
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Sep 28 17:58:34 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Sep 28 17:58:34 2013 +1000
----------------------------------------------------------------------
modules/compiler/src/java/flex2/tools/Mxmlc.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ffdec513/modules/compiler/src/java/flex2/tools/Mxmlc.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc.java b/modules/compiler/src/java/flex2/tools/Mxmlc.java
index 18202a5..dfec3e9 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc.java
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc.java
@@ -763,14 +763,14 @@ public final class Mxmlc extends Tool
ThreadLocalToolkit.logInfo( getStartMessage( program ) );
System.out.println();
System.out.println( CommandLineConfigurator.usage( program, defaultVar, cfgbuf, keywords, lmgr, l10nConfigPrefix ));
- System.exit( 1 );
+ System.exit( 0 );
}
if (args.length == 0 && ("mxmlc".equals(program) || "compc".equals(program)))
{
ThreadLocalToolkit.logInfo( getStartMessage( program ) );
System.err.println( CommandLineConfigurator.brief( program, defaultVar, lmgr, l10nConfigPrefix ));
- System.exit(1);
+ System.exit( 1 );
}
}
[08/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Fixes FLEX-33428 -- Previous commit had a spelling mistake.
Posted by ma...@apache.org.
Fixes FLEX-33428 -- Previous commit had a spelling mistake.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a7534ce3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a7534ce3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a7534ce3
Branch: refs/heads/mobileexperimental
Commit: a7534ce37b44444834bda2b6f69cca003949770b
Parents: 80565a5
Author: quetwo <ni...@theflexgroup.org>
Authored: Thu Oct 3 17:27:17 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Thu Oct 3 17:27:17 2013 -0400
----------------------------------------------------------------------
frameworks/projects/spark/src/mx/core/FTETextField.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7534ce3/frameworks/projects/spark/src/mx/core/FTETextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/mx/core/FTETextField.as b/frameworks/projects/spark/src/mx/core/FTETextField.as
index 1374134..2843370 100644
--- a/frameworks/projects/spark/src/mx/core/FTETextField.as
+++ b/frameworks/projects/spark/src/mx/core/FTETextField.as
@@ -3655,7 +3655,7 @@ internal class HTMLHelper
if (!styleSheet)
{
htmlText = null;
- textfield.clearFlag(FTETextField.FLAG_HTML_TEXT_SET);
+ textField.clearFlag(FTETextField.FLAG_HTML_TEXT_SET);
}
if (!textFlow)
[06/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Fixes FLEX-33428
Posted by ma...@apache.org.
Fixes FLEX-33428
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f1c39855
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f1c39855
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f1c39855
Branch: refs/heads/mobileexperimental
Commit: f1c398552e30dacbf9b63dec82666b436b86a7e6
Parents: c3d5e62
Author: quetwo <ni...@theflexgroup.org>
Authored: Thu Oct 3 16:50:50 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Thu Oct 3 16:50:50 2013 -0400
----------------------------------------------------------------------
frameworks/projects/spark/src/mx/core/FTETextField.as | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f1c39855/frameworks/projects/spark/src/mx/core/FTETextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/mx/core/FTETextField.as b/frameworks/projects/spark/src/mx/core/FTETextField.as
index 89b0dc0..1374134 100644
--- a/frameworks/projects/spark/src/mx/core/FTETextField.as
+++ b/frameworks/projects/spark/src/mx/core/FTETextField.as
@@ -179,7 +179,7 @@ package mx.core
* which control what work validateNow() needs to do.
*/
private static const FLAG_TEXT_SET:uint = 1 << 6;
- private static const FLAG_HTML_TEXT_SET:uint = 1 << 7;
+ public static const FLAG_HTML_TEXT_SET:uint = 1 << 7;
private static const FLAG_TEXT_LINES_INVALID:uint = 1 << 8;
private static const FLAG_GRAPHICS_INVALID:uint = 1 << 9;
@@ -2437,7 +2437,7 @@ package mx.core
/**
* @private
*/
- private function clearFlag(mask:uint):void
+ public function clearFlag(mask:uint):void
{
flags &= ~mask;
}
@@ -3653,7 +3653,10 @@ internal class HTMLHelper
// and needs to be regenerated on demand,
// because with htmlText what-you-set-is-not-what-you-get.
if (!styleSheet)
+ {
htmlText = null;
+ textfield.clearFlag(FTETextField.FLAG_HTML_TEXT_SET);
+ }
if (!textFlow)
return;
[13/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for
mobile - removed link to flex-examples github from asdoc comment
Posted by ma...@apache.org.
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for mobile
- removed link to flex-examples github from asdoc comment
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/25d74eda
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/25d74eda
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/25d74eda
Branch: refs/heads/mobileexperimental
Commit: 25d74edafa004055245c6149010113f5aa232630
Parents: f775f9b
Author: mamsellem <ma...@systar.com>
Authored: Sat Oct 5 00:58:26 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Sat Oct 5 00:58:26 2013 +0200
----------------------------------------------------------------------
.../experimental_mobile/src/spark/components/MobileGrid.as | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/25d74eda/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..003339b 100644
--- a/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
+++ b/frameworks/projects/experimental_mobile/src/spark/components/MobileGrid.as
@@ -73,10 +73,9 @@ 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
+ *
* @langversion 3.0
* @playerversion AIR 3.8
* @productversion Flex 4.11
[18/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Merge branch 'asdoc' into develop
Posted by ma...@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/mobileexperimental
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
----------------------------------------------------------------------
[03/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
FLEX-33789 Fix issue with header code, spark data grid test pass.
Posted by ma...@apache.org.
FLEX-33789 Fix issue with header code, spark data grid test pass.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1160a72f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1160a72f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1160a72f
Branch: refs/heads/mobileexperimental
Commit: 1160a72fb17d336312c45131c6a7b69f8d8e0fbb
Parents: ffdec51
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Sep 30 22:22:41 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Sep 30 22:22:41 2013 +1000
----------------------------------------------------------------------
.../src/spark/components/gridClasses/GridHeaderViewLayout.as | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1160a72f/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
index bbc320f..2d98b89 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridHeaderViewLayout.as
@@ -604,7 +604,7 @@ public class GridHeaderViewLayout extends LayoutBase
if (!gridColumnHeaderGroup || !grid)
return null;
- const columns:IList = columns;
+ const columns:IList = columnsView;
const columnsLength:int = (columns) ? columns.length : 0;
if (columnIndex >= columnsLength)
@@ -679,7 +679,7 @@ public class GridHeaderViewLayout extends LayoutBase
// create a new renderer
- const columns:IList = columns;
+ const columns:IList = columnsView;
if (!columns || (columns.length <= columnIndex))
return null;
const column:GridColumn = columns.getItemAt(columnIndex) as GridColumn;
@@ -853,7 +853,7 @@ public class GridHeaderViewLayout extends LayoutBase
*/
private function updateRendererHeights(inUpdateDisplayList:Boolean = false):void
{
- const columns:IList = this.columnsView;
+ const columns:IList = columnsView;
rendererHeights.length = (columns) ? columns.length : 0;
var newHeight:Number = 0;
[11/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Merge branch 'mobileexperimental' into develop
Posted by ma...@apache.org.
Merge branch 'mobileexperimental' 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/d2becdf8
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d2becdf8
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d2becdf8
Branch: refs/heads/mobileexperimental
Commit: d2becdf8dfcfb406dc6ebbf03c0fc761b7e4ab91
Parents: c1173bd 4c4d2dc
Author: mamsellem <ma...@systar.com>
Authored: Fri Oct 4 18:17:38 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Fri Oct 4 18:17:38 2013 +0200
----------------------------------------------------------------------
SVN-TEST.txt | 13 +-
asdoc/build.xml | 2 +
build.xml | 5 +-
frameworks/build.xml | 13 +-
.../assets/images/mobile160/dg_header_asc.png | Bin 0 -> 447 bytes
.../assets/images/mobile160/dg_header_desc.png | Bin 0 -> 418 bytes
.../assets/images/mobile160/dg_header_sep.png | Bin 0 -> 201 bytes
.../images/mobile160/dg_header_shadow.png | Bin 0 -> 277 bytes
.../assets/images/mobile320/dg_header_asc.png | Bin 0 -> 527 bytes
.../assets/images/mobile320/dg_header_desc.png | Bin 0 -> 496 bytes
.../assets/images/mobile320/dg_header_sep.png | Bin 0 -> 215 bytes
.../images/mobile320/dg_header_shadow.png | Bin 0 -> 329 bytes
.../projects/experimental_mobile/build.xml | 239 +++++++++++++
.../experimental_mobile/bundle-config.xml | 50 +++
.../bundles/da_DK/experimental.properties | 18 +
.../bundles/de_CH/experimental.properties | 18 +
.../bundles/de_DE/experimental.properties | 18 +
.../bundles/el_GR/experimental.properties | 18 +
.../bundles/en_AU/experimental.properties | 18 +
.../bundles/en_CA/experimental.properties | 18 +
.../bundles/en_GB/experimental.properties | 18 +
.../bundles/en_US/experimental.properties | 18 +
.../bundles/es_ES/experimental.properties | 18 +
.../bundles/fi_FI/experimental.properties | 18 +
.../bundles/fr_CH/experimental.properties | 18 +
.../bundles/fr_FR/experimental.properties | 18 +
.../bundles/it_IT/experimental.properties | 18 +
.../bundles/ja_JP/experimental.properties | 18 +
.../bundles/ko_KR/experimental.properties | 18 +
.../bundles/nb_NO/experimental.properties | 18 +
.../bundles/nl_NL/experimental.properties | 18 +
.../bundles/pt_BR/experimental.properties | 18 +
.../bundles/pt_PT/experimental.properties | 18 +
.../bundles/ru_RU/experimental.properties | 18 +
.../bundles/sv_SE/experimental.properties | 18 +
.../bundles/zh_CN/experimental.properties | 18 +
.../bundles/zh_TW/experimental.properties | 18 +
.../experimental_mobile/compile-config.xml | 83 +++++
.../projects/experimental_mobile/defaults.css | 138 ++++++++
.../projects/experimental_mobile/manifest.xml | 28 ++
.../experimental_mobile/spark-manifest.xml | 49 +++
.../src/ExperimentalMobileClasses.as | 37 ++
.../src/spark/components/MobileGrid.as | 295 ++++++++++++++++
.../itemRenderers/IMobileGridCellRenderer.as | 70 ++++
.../IMobileGridTextCellRenderer.as | 50 +++
.../MobileGridBitmapCellRenderer.as | 151 ++++++++
.../itemRenderers/MobileGridTextCellRenderer.as | 139 ++++++++
.../supportClasses/ListMultiPartColumnLayout.as | 188 ++++++++++
.../supportClasses/MobileGridColumn.as | 351 +++++++++++++++++++
.../supportClasses/MobileGridHeader.as | 163 +++++++++
.../supportClasses/MobileGridRowRenderer.as | 278 +++++++++++++++
.../src/spark/events/MobileGridHeaderEvent.as | 58 +++
.../src/spark/layouts/MobileGridLayout.as | 95 +++++
.../skins/MobileGridHeaderButtonBarSkin.as | 89 +++++
.../spark/skins/MobileGridHeaderButtonSkin.as | 43 +++
.../skins/MobileGridHeaderFirstButtonSkin.as | 35 ++
.../src/spark/skins/MobileGridSkin.as | 177 ++++++++++
.../assets/MobileGridHeaderButton_down.fxg | 46 +++
.../mobile/assets/MobileGridHeaderButton_up.fxg | 44 +++
.../assets/MobileGridHeaderFirstButton_down.fxg | 34 ++
.../assets/MobileGridHeaderFirstButton_up.fxg | 32 ++
.../src/spark/utils/MobileGridUtil.as | 80 +++++
.../src/spark/utils/MultiDPIBitmapSourceExt.as | 69 ++++
63 files changed, 3549 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[09/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
FLEX-33739 removed duplication
Posted by ma...@apache.org.
FLEX-33739 removed duplication
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c1173bda
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c1173bda
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c1173bda
Branch: refs/heads/mobileexperimental
Commit: c1173bda4177f9675b2a91db124bc2b9210e798c
Parents: a7534ce
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 4 09:55:26 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 4 09:55:26 2013 +1000
----------------------------------------------------------------------
.../src/spark/components/IconItemRenderer.as | 9 +------
.../supportClasses/ViewNavigatorBase.as | 11 +-------
.../spark/src/spark/primitives/BitmapImage.as | 17 +-----------
.../src/spark/utils/MultiDPIBitmapSource.as | 28 ++++++++++++++++++++
4 files changed, 31 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c1173bda/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as b/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
index 1f34cfc..3b050e4 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
@@ -1762,14 +1762,7 @@ public class IconItemRenderer extends LabelItemRenderer
// get the icon source to find out if it is external or not
if (source is MultiDPIBitmapSource)
{
- var app:Object = FlexGlobals.topLevelApplication;
- var dpi:Number;
- if ("runtimeDPI" in app)
- dpi = app["runtimeDPI"];
- else
- dpi = DensityUtil.getRuntimeDPI();
-
- var multiSource:Object = MultiDPIBitmapSource(source).getSource(dpi);
+ var multiSource:Object = MultiDPIBitmapSource(source).getMultiSource();
isExternalSource = (multiSource is String || multiSource is URLRequest);
}
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c1173bda/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ViewNavigatorBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ViewNavigatorBase.as b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ViewNavigatorBase.as
index 5a04fc1..140b705 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ViewNavigatorBase.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ViewNavigatorBase.as
@@ -454,16 +454,7 @@ public class ViewNavigatorBase extends SkinnableContainer
var iconData:Object = icon;
if (iconData is MultiDPIBitmapSource)
- {
- var app:Object = FlexGlobals.topLevelApplication;
- var dpi:Number;
- if ("runtimeDPI" in app)
- dpi = app["runtimeDPI"];
- else
- dpi = DensityUtil.getRuntimeDPI();
-
- iconData = MultiDPIBitmapSource(iconData).getSource(dpi);
- }
+ iconData = MultiDPIBitmapSource(iconData).getMultiSource();
if (iconData is Class)
return {label:label, iconClassName:getQualifiedClassName(iconData)};
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c1173bda/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
index 67e80b8..bc27a57 100644
--- a/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
+++ b/frameworks/projects/spark/src/spark/primitives/BitmapImage.as
@@ -1406,7 +1406,7 @@ public class BitmapImage extends GraphicElement
var tmpSprite:DisplayObject;
if (value is MultiDPIBitmapSource)
- value = getActualValue(value as MultiDPIBitmapSource);
+ value = (value as MultiDPIBitmapSource).getMultiSource();
// Clear the previous scaleGrid properties
_scaleGridLeft = NaN;
@@ -1508,21 +1508,6 @@ public class BitmapImage extends GraphicElement
setBitmapData(bitmapData, currentBitmapCreated);
}
-
- /**
- * @private
- * Figure out which source to use
- */
- mx_internal function getActualValue(values:MultiDPIBitmapSource):Object
- {
- var app:Object = FlexGlobals.topLevelApplication;
- var dpi:Number;
- if ("runtimeDPI" in app)
- dpi = app["runtimeDPI"];
- else
- dpi = DensityUtil.getRuntimeDPI();
- return values.getSource(dpi);
- }
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c1173bda/frameworks/projects/spark/src/spark/utils/MultiDPIBitmapSource.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/utils/MultiDPIBitmapSource.as b/frameworks/projects/spark/src/spark/utils/MultiDPIBitmapSource.as
index 4de2a4b..30e2c9c 100644
--- a/frameworks/projects/spark/src/spark/utils/MultiDPIBitmapSource.as
+++ b/frameworks/projects/spark/src/spark/utils/MultiDPIBitmapSource.as
@@ -20,6 +20,9 @@
package spark.utils
{
import mx.core.DPIClassification;
+import mx.core.FlexGlobals;
+
+import mx.utils.DensityUtil;
/**
* This class provides a list of bitmaps for various runtime densities. It is supplied
@@ -100,6 +103,31 @@ public class MultiDPIBitmapSource
* @productversion ApacheFlex 4.11
*/
public var source640dpi:Object;
+
+ /**
+ * Select one of the sourceXXXdpi properties based on the run time DPI.
+ *
+ * @return One of the sourceXXXdpi properties based on the run time DPI.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Flex 4.11
+ */
+ public function getMultiSource():Object {
+ var app:Object = FlexGlobals.topLevelApplication;
+ var dpi:Number;
+ var multiSource:Object;
+
+ if ("runtimeDPI" in app)
+ dpi = app["runtimeDPI"];
+ else
+ dpi = DensityUtil.getRuntimeDPI();
+
+ multiSource = getSource(dpi);
+
+ return multiSource;
+ }
/**
* Select one of the sourceXXXdpi properties based on the given DPI. This
[21/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] - -
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 ma...@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/mobileexperimental
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);
[24/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Merge branch 'release4.11.0' of
https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Posted by ma...@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/mobileexperimental
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(+)
----------------------------------------------------------------------
[22/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] - -
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 ma...@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/mobileexperimental
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
[15/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] - Some
useful script to help with creating release branches and release candidates
Posted by ma...@apache.org.
Some useful script to help with creating release branches and release candidates
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/631604ec
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/631604ec
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/631604ec
Branch: refs/heads/mobileexperimental
Commit: 631604ec185031c9cd844f9090e779a6054ebd3c
Parents: 050a7ae
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 5 16:53:37 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 5 16:53:37 2013 +1000
----------------------------------------------------------------------
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(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/631604ec/build/check_sigs.sh
----------------------------------------------------------------------
diff --git a/build/check_sigs.sh b/build/check_sigs.sh
new file mode 100755
index 0000000..0716308
--- /dev/null
+++ b/build/check_sigs.sh
@@ -0,0 +1,77 @@
+#!/bin/sh -e
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+if [ $# -ne 2 ]
+then
+ echo "Usage: deploy_release_branch flex_version ([0-99].[0-99].[0-999]) release_candidate ([0-100])"
+ exit 1
+fi
+
+FLEX_VERSION="$1"
+CHECK=`echo "$FLEX_VERSION" | grep -q -E '[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}$'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex version needs to be in the form [0-99].[0-99].[0-999]"
+ exit 1
+fi
+
+RELEASE_CANDIDATE="$2"
+CHECK=`echo "$RELEASE_CANDIDATE" | grep -q -E '[0-9]{1,2}'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex release candidate to be in the range 1-99"
+ exit 1;
+fi
+
+# Assumes FLEX_DEV_AREA has been set up and point to SVN checked out dev area
+
+VERSION_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}"
+RC_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}/rc${RELEASE_CANDIDATE}"
+BIN_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}/rc${RELEASE_CANDIDATE}/binaries"
+DOC_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}/rc${RELEASE_CANDIDATE}/docs"
+
+function checkFile() {
+ FILE="$1"
+
+ HASH=`md5 -q "${FILE}"`
+ CHECK=`cat "${FILE}.md5"`
+
+ if [ "$HASH" != "$CHECK" ]
+ then
+ echo "${FILE} MD5 incorrect"
+ exit 1;
+ else
+ echo "${FILE} MD5 OK";
+ fi
+
+ gpg --verify "${FILE}.asc"
+
+}
+
+checkFile "${RC_DIR}/apache-flex-sdk-4.11.0-src.tar.gz"
+checkFile "${RC_DIR}/apache-flex-sdk-4.11.0-src.zip"
+
+checkFile "${BIN_DIR}/apache-flex-sdk-4.11.0-bin.tar.gz"
+checkFile "${BIN_DIR}/apache-flex-sdk-4.11.0-bin.zip"
+
+checkFile "${DOC_DIR}/apache-flex-sdk-4.11.0-asdocs.zip"
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/631604ec/build/deploy_release_candidate.sh
----------------------------------------------------------------------
diff --git a/build/deploy_release_candidate.sh b/build/deploy_release_candidate.sh
new file mode 100755
index 0000000..60a7bfb
--- /dev/null
+++ b/build/deploy_release_candidate.sh
@@ -0,0 +1,82 @@
+#!/bin/sh -e
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+
+if [ $# -ne 2 ]
+then
+ echo "Usage: deploy_release_branch flex_version ([0-99].[0-99].[0-999]) release_candidate ([0-100])"
+fi
+
+FLEX_VERSION="$1"
+CHECK=`echo "$FLEX_VERSION" | grep -q -E '[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}$'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex version needs to be in the form [0-99].[0-99].[0-999]"
+ exit 1;
+fi
+
+RELEASE_CANDIDATE="$2"
+CHECK=`echo "$RELEASE_CANDIDATE" | grep -q -E '[0-9]{1,2}'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex release candidate to be in the range 1-99"
+ exit 1;
+fi
+
+# Assumes FLEX_DEV_AREA has been set up and point to SVN checked out dev area
+
+VERSION_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}"
+RC_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}/rc${RELEASE_CANDIDATE}"
+BIN_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}/rc${RELEASE_CANDIDATE}/binaries"
+DOC_DIR="${FLEX_DEV_AREA}/sdk/${FLEX_VERSION}/rc${RELEASE_CANDIDATE}/docs"
+
+echo "RC directory is ${RC_DIR}"
+
+if [ ! -d "${VERSION_DIR}" ]
+then
+ mkdir "${VERSION_DIR}"
+fi
+
+if [ ! -d "${RC_DIR}" ]
+then
+ mkdir "${RC_DIR}"
+fi
+
+if [ ! -d "${BIN_DIR}" ]
+then
+ mkdir "${BIN_DIR}"
+fi
+
+if [ ! -d "${DOC_DIR}" ]
+then
+ mkdir "${DOC_DIR}"
+fi
+
+cp README "${RC_DIR}"
+cp RELEASE_NOTES "${RC_DIR}"
+cp ./out/*-src.* "${RC_DIR}"
+cp ./out/*-bin.* "${BIN_DIR}"
+cp ./out/*-asdocs.* "${DOC_DIR}"
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/631604ec/build/make_release_branch.sh
----------------------------------------------------------------------
diff --git a/build/make_release_branch.sh b/build/make_release_branch.sh
new file mode 100755
index 0000000..605f829
--- /dev/null
+++ b/build/make_release_branch.sh
@@ -0,0 +1,49 @@
+#!/bin/sh -e
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+
+# This script release branch for the next Apache Flex version
+
+if [ $# -ne 1 ]
+then
+ echo Usage: make_release_branch [0-100].[0-100].[0-1000]
+fi
+
+FLEX_VERSION="$1"
+CHECK=`echo "$FLEX_VERSION" | grep -q -E '[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}$'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex version needs to be in the form [0-100].[0-100].[0-1000]"
+ exit 1;
+fi
+
+echo "Creating branch for Apache Flex Version ${FLEX_VERSION}"
+
+git push -u origin develop:release${FLEX_VERSION}
+
+cd ..
+mkdir "ApacheFlex${FLEX_VERSION}"
+cd "ApacheFlex${FLEX_VERSION}"
+git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git .
+git checkout release${FLEX_VERSION}
+git tag -a apache-flex-sdk-${FLEX_VERSION}RC1 -m \'"Apache Flex ${FLEX_VERSION} RC1"\'
+git push --tags
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/631604ec/build/tag_release_candidate.sh
----------------------------------------------------------------------
diff --git a/build/tag_release_candidate.sh b/build/tag_release_candidate.sh
new file mode 100755
index 0000000..345bc68
--- /dev/null
+++ b/build/tag_release_candidate.sh
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+
+################################################################################
+##
+## 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.
+##
+################################################################################
+
+
+if [ $# -ne 2 ]
+then
+ echo "Usage: deploy_release_branch flex_version ([0-99].[0-99].[0-999]) release_candidate ([0-100])"
+fi
+
+FLEX_VERSION="$1"
+CHECK=`echo "$FLEX_VERSION" | grep -q -E '[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,3}$'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex version needs to be in the form [0-99].[0-99].[0-999]"
+ exit 1;
+fi
+
+RELEASE_CANDIDATE="$2"
+CHECK=`echo "$RELEASE_CANDIDATE" | grep -q -E '[0-9]{1,2}'`
+
+if [ $? -ne 0 ]
+then
+ echo "Apache Flex release candidate to be in the range 1-99"
+ exit 1;
+fi
+
+git tag -a apache-flex-sdk-${FLEX_VERSION}RC${RELEASE_CANDIDATE} -m \'"Apache Flex ${FLEX_VERSION} RC${RELEASE_CANDIDATE}"\'
+git push --tags
\ No newline at end of file
[16/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
INTEGRATION https://issues.apache.org/jira/browse/FLEX-33777 Dagrid for
mobile - added missing licence notice
Posted by ma...@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/mobileexperimental
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;
[07/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
Fixes FLEX-32887
Posted by ma...@apache.org.
Fixes FLEX-32887
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/80565a5e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/80565a5e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/80565a5e
Branch: refs/heads/mobileexperimental
Commit: 80565a5ed24932627b70a77683a83415fe057f8b
Parents: f1c3985
Author: quetwo <ni...@theflexgroup.org>
Authored: Thu Oct 3 17:03:50 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Thu Oct 3 17:03:50 2013 -0400
----------------------------------------------------------------------
.../charts/src/mx/charts/chartClasses/GraphicsUtilities.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/80565a5e/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as b/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
index 9b66b08..94bb8e6 100644
--- a/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
+++ b/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
@@ -330,7 +330,7 @@ public class GraphicsUtilities
// Check for coincident points at the head of the list.
// We'll skip over any of those
- while (start != end)
+ while (start != end && ((start + incr) != end))
{
if (pts[start + incr][hProp] != pts[start][hProp] ||
pts[start + incr][vProp] != pts[start][vProp])
[14/25] git commit: [flex-sdk] [refs/heads/mobileexperimental] -
updated release notes
Posted by ma...@apache.org.
updated release notes
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/050a7ae9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/050a7ae9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/050a7ae9
Branch: refs/heads/mobileexperimental
Commit: 050a7ae9058b8d22e49727d29d462cac09bb7c3d
Parents: 25d74ed
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Oct 5 09:39:10 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Oct 5 09:39:10 2013 +1000
----------------------------------------------------------------------
RELEASE_NOTES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/050a7ae9/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 49ac8af..77f12f4 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -43,6 +43,7 @@ SDK Changes
- s:DataGridEditor will now be visible in ASDocs and be visible in the Tag inspector.
- Minor changes to make SDK compile with Falcon compiler.
- Added access to imageDecodingPolicy in BitmapImage.
+- New experimental mobile spark datagrid
Bug Fixes
----------
@@ -61,6 +62,7 @@ FLEX-33782 AccordionData labelField and labelFunction properties don't work
FLEX-33771 compatibilityVersionString returns the wrong value
FLEX-33748 TabBar shouldn't be colorized in TabNavigatorSkin
FLEX-33741 Propagation of Escape key in mx.controls.DateField should only be stopped if the DropDown is shown
+FLEX-33739 Duplication segment of code calling MultiBitmapSource getSource(dpi)
FLEX-33738 ArrayCollection addAll() adds items in the wrong order
FLEX-33730 RTE in Application.as line 2157 in Air simulator
FLEX-33726 DateField.stringToDate returns null when inputFormat has no separators