git commit: [flex-falcon] [refs/heads/develop] - copy problem formatter to COMPC handler
Repository: flex-falcon
Updated Branches:
refs/heads/develop 09b76c2f6 -> 4a2a54244
copy problem formatter to COMPC handler
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4a2a5424
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4a2a5424
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4a2a5424
Branch: refs/heads/develop
Commit: 4a2a54244eb88c598d578e1f2f176172ce054461
Parents: 09b76c2
Author: Alex Harui
Authored: Sun Oct 9 21:35:11 2016 -0700
Committer: Alex Harui
Committed: Sun Oct 9 21:35:11 2016 -0700
--
.../src/main/java/flex2/tools/oem/Library.java | 48 +++-
1 file changed, 26 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4a2a5424/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
--
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
index d4f1a19..bdcb3be 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
@@ -38,6 +38,7 @@ import java.lang.annotation.Annotation;
import java.net.URI;
import org.apache.flex.compiler.clients.COMPC;
+import org.apache.flex.compiler.clients.problems.ProblemFormatter;
import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.problems.CompilerProblemSeverity;
import org.apache.flex.compiler.problems.ICompilerProblem;
@@ -1142,16 +1143,7 @@ public class Library implements Builder, Cloneable
prob.getColumn());
try
{
-String errText = (String)
aClass.getField("DESCRIPTION").get(aClass);
-while (errText.contains("${"))
-{
-int start = errText.indexOf("${");
-int end = errText.indexOf("}", start);
-String token = errText.substring(start + 2, end);
-String value = (String)
aClass.getField(token).get(prob);
-token = "${" + token + "}";
-errText = errText.replace(token, value);
-}
+String errText =
ProblemFormatter.DEFAULT_FORMATTER.format(prob);
msg.setMessage(errText);
}
catch (IllegalArgumentException e1)
@@ -1164,16 +1156,6 @@ public class Library implements Builder, Cloneable
// TODO Auto-generated catch block
e1.printStackTrace();
}
-catch (IllegalAccessException e1)
-{
-// TODO Auto-generated catch block
-e1.printStackTrace();
-}
-catch (NoSuchFieldException e1)
-{
-// TODO Auto-generated catch block
-e1.printStackTrace();
-}
messages.add(msg);
try
@@ -1197,8 +1179,30 @@ public class Library implements Builder, Cloneable
}
catch (NoSuchFieldException e)
{
-// TODO Auto-generated catch block
-e.printStackTrace();
+try
+{
+logger.log(msg,
aClass.getField("warningCode").getInt(null), prob.getSourcePath());
+}
+catch (IllegalArgumentException e1)
+{
+// TODO Auto-generated catch block
+e.printStackTrace();
+}
+catch (SecurityException e1)
+{
+// TODO Auto-generated catch block
+e.printStackTrace();
+}
+catch (IllegalAccessException e1)
+{
+// TODO Auto-generated catch block
+e.printStackTrace();
+}
+catch (NoSuchFieldException e1)
+{
+// TODO Auto-generated catch block
+e.printStackTrace();
+}
}
}
}
git commit: [flex-falcon] [refs/heads/develop] - try to fix internal var output
Repository: flex-falcon
Updated Branches:
refs/heads/develop 4a2a54244 -> e40f95df6
try to fix internal var output
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e40f95df
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e40f95df
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e40f95df
Branch: refs/heads/develop
Commit: e40f95df64afd3f8cc91de66423683c6f9cb9c0c
Parents: 4a2a542
Author: Alex Harui
Authored: Mon Oct 10 10:20:40 2016 -0700
Committer: Alex Harui
Committed: Mon Oct 10 10:20:40 2016 -0700
--
.../internal/codegen/js/jx/IdentifierEmitter.java| 11 +++
.../codegen/js/flexjs/TestFlexJSExpressions.java | 10 ++
2 files changed, 21 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e40f95df/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index 7573db4..6b5418f 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -36,7 +36,11 @@ import
org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
import org.apache.flex.compiler.internal.definitions.TypeDefinitionBase;
+import org.apache.flex.compiler.internal.scopes.CatchScope;
+import org.apache.flex.compiler.internal.scopes.FunctionScope;
+import org.apache.flex.compiler.internal.scopes.TypeScope;
import org.apache.flex.compiler.internal.tree.as.NonResolvingIdentifierNode;
+import org.apache.flex.compiler.scopes.IASScope;
import org.apache.flex.compiler.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
@@ -77,6 +81,13 @@ public class IdentifierEmitter extends JSSubEmitter
implements
JSFlexJSEmitter fjs = (JSFlexJSEmitter)getEmitter();
boolean isCustomNamespace = false;
boolean isStatic = nodeDef != null && nodeDef.isStatic();
+ if (nodeDef != null && nodeDef.isInternal())
+ {
+ IASScope nodeScope = nodeDef.getContainingScope();
+ if (!(((nodeScope instanceof FunctionScope) || // other scopes
may need to be added here
+ (nodeScope instanceof CatchScope
+ isStatic = true; // internal vars are output like
statick vars
+ }
if (nodeDef instanceof FunctionDefinition &&
fjs.isCustomNamespace((FunctionDefinition)nodeDef))
isCustomNamespace = true;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e40f95df/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index 60fdb20..291a845 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -287,6 +287,16 @@ public class TestFlexJSExpressions extends
TestGoogExpressions
}
@Test
+public void testVisitBinaryOperatorNode_setterAssignmentFromInternalVae()
+{
+IBinaryOperatorNode node = (IBinaryOperatorNode) getNode(
+"public class B {var b:int; public function c() { b = b + 1;
}}",
+IBinaryOperatorNode.class, WRAP_LEVEL_PACKAGE);
+asBlockWalker.visitBinaryOperator(node);
+assertOut("B.b = B.b + 1");
+}
+
+@Test
public void testVisitBinaryOperatorNode_bindableAssignment()
{
IBinaryOperatorNode node = (IBinaryOperatorNode) getNode(
git commit: [flex-falcon] [refs/heads/develop] - better fix for internal vars
Repository: flex-falcon
Updated Branches:
refs/heads/develop e40f95df6 -> 557cd7978
better fix for internal vars
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/557cd797
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/557cd797
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/557cd797
Branch: refs/heads/develop
Commit: 557cd79780944c7b72ba20695cd8c704b8fff435
Parents: e40f95d
Author: Alex Harui
Authored: Mon Oct 10 10:52:49 2016 -0700
Committer: Alex Harui
Committed: Mon Oct 10 10:52:49 2016 -0700
--
.../internal/codegen/js/jx/IdentifierEmitter.java | 7 ---
.../internal/codegen/js/utils/EmitterUtils.java | 5 -
.../codegen/js/flexjs/TestFlexJSExpressions.java| 12 +++-
3 files changed, 15 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/557cd797/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index 6b5418f..0b27b39 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -81,13 +81,6 @@ public class IdentifierEmitter extends JSSubEmitter
implements
JSFlexJSEmitter fjs = (JSFlexJSEmitter)getEmitter();
boolean isCustomNamespace = false;
boolean isStatic = nodeDef != null && nodeDef.isStatic();
- if (nodeDef != null && nodeDef.isInternal())
- {
- IASScope nodeScope = nodeDef.getContainingScope();
- if (!(((nodeScope instanceof FunctionScope) || // other scopes
may need to be added here
- (nodeScope instanceof CatchScope
- isStatic = true; // internal vars are output like
statick vars
- }
if (nodeDef instanceof FunctionDefinition &&
fjs.isCustomNamespace((FunctionDefinition)nodeDef))
isCustomNamespace = true;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/557cd797/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/EmitterUtils.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/EmitterUtils.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/EmitterUtils.java
index 635c6c0..82f8165 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/EmitterUtils.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/utils/EmitterUtils.java
@@ -381,7 +381,7 @@ public class EmitterUtils
// or maybe we need to test if identifier exists on
XML/XMLList
return false;
}
-if (nodeDef != null && !nodeDef.isInternal()
+if (nodeDef != null
&& isClassMember(project, nodeDef, classNode))
{
if (identifierIsMemberAccess)
@@ -406,6 +406,9 @@ public class EmitterUtils
public static boolean isClassMember(ICompilerProject project,
IDefinition nodeDef, IClassNode classNode)
{
+ if (nodeDef.isInternal() && (!(nodeDef.getParent() instanceof
ClassDefinition)))
+ return false;
+
TypeScope cscope = (TypeScope) classNode.getDefinition()
.getContainedScope();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/557cd797/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index 291a845..ff2d7fd 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -287,12 +287,22 @@ public class TestFlexJSExpressions extends
TestGoogExpressions
}
@Test
-public void testVisitBinaryOperatorNode_setterAssignmentFromInternalVae()
+public void testVisitBinaryOperatorNode_setterAssignmentFromInter
svn commit: r1764195 - /flex/site/trunk/content/installer/sdk-installer-config-4.0.xml
Author: aharui Date: Tue Oct 11 06:23:47 2016 New Revision: 1764195 URL: http://svn.apache.org/viewvc?rev=1764195&view=rev Log: "update md5s" Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml URL: http://svn.apache.org/viewvc/flex/site/trunk/content/installer/sdk-installer-config-4.0.xml?rev=1764195&r1=1764194&r2=1764195&view=diff == --- flex/site/trunk/content/installer/sdk-installer-config-4.0.xml (original) +++ flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Tue Oct 11 06:23:47 2016 @@ -623,12 +623,12 @@ limitations under the License. https://fpdownload.macromedia.com/pub/flashplayer/updaters/17/flashplayer_17_sa_debug.exe https://fpdownload.macromedia.com/pub/flashplayer/updaters/17/flashplayer_17_sa_debug.dmg - + http://fpdownload.macromedia.com get/flashplayer/updaters/18/ http://fpdownload.macromedia.com/get/flashplayer/updaters/18/ playerglobal18_0.swc -0765d1732d1815efe1e459dab7031912 +371310a916950a7956507bf9cdf1bb63 29 https://fpdownload.macromedia.com/pub/flashplayer/updaters/18/flashplayer_18_sa_debug.exe https://fpdownload.macromedia.com/pub/flashplayer/updaters/18/flashplayer_18_sa_debug.dmg @@ -674,12 +674,12 @@ limitations under the License. https://fpdownload.macromedia.com/pub/flashplayer/updaters/22/flashplayer_22_sa_debug.exe https://fpdownload.macromedia.com/pub/flashplayer/updaters/22/flashplayer_22_sa_debug.dmg - + http://fpdownload.macromedia.com get/flashplayer/updaters/23/ http://fpdownload.macromedia.com/get/flashplayer/updaters/23/ playerglobal23_0.swc -c1a4cdf397cbd32eeaf7ffb77cb4d09e +2b32e95a3d2cf98021c59c6c814ce4ab 34 https://fpdownload.macromedia.com/pub/flashplayer/updaters/23/flashplayer_23_sa_debug.exe https://fpdownload.macromedia.com/pub/flashplayer/updaters/23/flashplayer_23_sa_debug.dmg
svn commit: r999174 - in /websites/production/flex: cgi-bin/ content/
Author: aharui Date: Tue Oct 11 06:26:19 2016 New Revision: 999174 Log: Publishing svnmucc operation to flex site by aharui Added: websites/production/flex/cgi-bin/ - copied from r999173, websites/staging/flex/trunk/cgi-bin/ websites/production/flex/content/ - copied from r999173, websites/staging/flex/trunk/content/
[1/2] git commit: [flex-falcon] [refs/heads/develop] - update version number for backup build
Repository: flex-falcon
Updated Branches:
refs/heads/develop 86644a94b -> a39371679
update version number for backup build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a3937167
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a3937167
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a3937167
Branch: refs/heads/develop
Commit: a39371679665d7052b34fce34d40528d20849260
Parents: cc3183d
Author: Alex Harui
Authored: Tue Oct 11 08:52:11 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 11 08:52:49 2016 -0700
--
compiler-jx/src/test/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a3937167/compiler-jx/src/test/build.xml
--
diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml
index deba9f2..2452b16 100644
--- a/compiler-jx/src/test/build.xml
+++ b/compiler-jx/src/test/build.xml
@@ -184,7 +184,7 @@
value="true" />
-http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/lastSuccessfulBuild/artifact/out/apache-flex-flexjs-0.7.0-bin.zip";
dest="${compiler}/target/junit-temp/flexjs.zip"/>
+http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/lastSuccessfulBuild/artifact/out/apache-flex-flexjs-0.8.0-bin.zip";
dest="${compiler}/target/junit-temp/flexjs.zip"/>
[2/2] git commit: [flex-falcon] [refs/heads/develop] - hack in support for force-linking via import foo.bar.baz; baz
apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
@@ -23,6 +23,7 @@ import org.apache.flex.compiler.driver.IBackend;
import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogClass;
import org.apache.flex.compiler.internal.driver.js.flexjs.FlexJSBackend;
import org.apache.flex.compiler.internal.projects.FlexJSProject;
+import org.apache.flex.compiler.internal.tree.as.FileNode;
import org.apache.flex.compiler.tree.as.IClassNode;
import org.junit.Test;
@@ -31,13 +32,6 @@ import org.junit.Test;
*/
public class TestFlexJSClass extends TestGoogClass
{
- // TODO: aharui Use cinit() to initialize statics
- // private static var foo:Boolean = someStaticMethodToFollow();
- // private static function someStaticMethodToFollow():Boolean
{};
-
- // TODO: aharui Use cinit() to handle force-linking
- // import somePackage.someClass; someClass;
-
@Override
public void setUp()
{
@@ -233,6 +227,14 @@ public class TestFlexJSClass extends TestGoogClass
assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function()
{\n};\n\n\n/**\n * @export\n * @type {number}\n */\norg.apache.flex.A.a =
10;\n\n\n/**\n * @export\n * @type {string}\n
*/\norg.apache.flex.A.b;\n\n\n/**\n * @private\n * @return {string}\n
*/\norg.apache.flex.A.initStatic = function() {\n return
\"foo\";\n};\n\n\norg.apache.flex.A.b = org.apache.flex.A.initStatic();");
}
+@Test
+public void testImportForceLinkingAsStaticInitializers()
+{
+FileNode node = (FileNode)getNode("package org.apache.flex {\npublic
class A {\nimport flash.display.Sprite; Sprite;\n}}", FileNode.class, 0);
+asBlockWalker.visitFile(node);
+assertOut("/**\n * org.apache.flex.A\n *\n * @fileoverview\n *\n *
@suppress {checkTypes|accessControls}\n
*/\n\ngoog.provide('org.apache.flex.A');\n\n\n\ngoog.require('flash.display.Sprite');\n\n\n/**\n
* @constructor\n */\norg.apache.flex.A = function() {\n};");
+}
+
@Override
@Test
public void testConstants()
[3/3] git commit: [flex-falcon] [refs/heads/develop] - get raw output from asdoc into .txt files. Next step is to create dita files
get raw output from asdoc into .txt files. Next step is to create dita files Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f938cb72 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f938cb72 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f938cb72 Branch: refs/heads/develop Commit: f938cb721f121d1afdf675e4011ce18804ebb640 Parents: c5a1025 Author: Alex Harui Authored: Tue Oct 11 09:30:09 2016 -0700 Committer: Alex Harui Committed: Tue Oct 11 22:33:11 2016 -0700 -- .../apache/flex/compiler/clients/ASDOCJSC.java | 445 ++ .../apache/flex/compiler/clients/MXMLJSC.java |2 +- .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 456 ++ .../mxml/flexjs/MXMLFlexJSASDocEmitter.java | 1478 ++ .../driver/js/goog/ASDocConfiguration.java | 566 +++ .../driver/mxml/ASDocASSourceFileHandler.java | 89 ++ .../driver/mxml/ASDocMXMLSourceFileHandler.java | 89 ++ .../mxml/flexjs/MXMLFlexJSASDocBackend.java | 140 ++ .../internal/projects/FlexJSProject.java|2 + 9 files changed, 3266 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f938cb72/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java -- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java new file mode 100644 index 000..5bab139 --- /dev/null +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java @@ -0,0 +1,445 @@ +/* + * + * 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 org.apache.flex.compiler.clients; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.List; +import java.util.Set; +import java.util.zip.Deflater; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; + +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.apache.flex.compiler.codegen.as.IASWriter; +import org.apache.flex.compiler.driver.IBackend; +import org.apache.flex.compiler.driver.js.IJSApplication; +import org.apache.flex.compiler.exceptions.ConfigurationException; +import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; +import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; +import org.apache.flex.compiler.internal.codegen.js.JSSharedData; +import org.apache.flex.compiler.internal.driver.as.ASBackend; +import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; +import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration; +import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; +import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocBackend; +import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend; +import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend; +import org.apache.flex.compiler.internal.driver.mxml.vf2js.MXMLVF2JSSWCBackend; +import org.apache.flex.compiler.internal.projects.CompilerProject; +import org.apache.flex.compiler.internal.targets.FlexJSSWCTarget; +import org.apache.flex.compiler.internal.targets.JSTarget; +import org.apache.flex.compiler.problems.FileNotFoundProblem; +import org.apache.flex.compiler.problems.ICompilerProblem; +import org.apache.flex.compiler.problems.InternalCompilerProblem; +import org.apache.flex.compiler.problems.LibraryNotFoundProblem; +import org.apache.flex.compiler.problems.UnableToBuildSWFProblem; +import org.apache.flex.compiler.targets.ITarget.TargetType; +import org.apache.flex.compiler.targets.ITargetSett
[2/3] git commit: [flex-falcon] [refs/heads/develop] - get raw output from asdoc into .txt files. Next step is to create dita files
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f938cb72/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java -- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java new file mode 100644 index 000..26b3f2a --- /dev/null +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java @@ -0,0 +1,1478 @@ +/* + * + * 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 org.apache.flex.compiler.internal.codegen.mxml.flexjs; + + +import java.io.File; +import java.io.FilterWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.apache.flex.abc.semantics.MethodInfo; +import org.apache.flex.abc.semantics.Name; +import org.apache.flex.abc.semantics.Namespace; +import org.apache.flex.compiler.codegen.IASGlobalFunctionConstants; +import org.apache.flex.compiler.codegen.as.IASEmitter; +import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLFlexJSEmitter; +import org.apache.flex.compiler.common.ASModifier; +import org.apache.flex.compiler.constants.IASKeywordConstants; +import org.apache.flex.compiler.constants.IASLanguageConstants; +import org.apache.flex.compiler.definitions.IClassDefinition; +import org.apache.flex.compiler.definitions.IDefinition; +import org.apache.flex.compiler.definitions.IFunctionDefinition; +import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; +import org.apache.flex.compiler.internal.codegen.databinding.BindingDatabase; +import org.apache.flex.compiler.internal.codegen.databinding.BindingInfo; +import org.apache.flex.compiler.internal.codegen.databinding.FunctionWatcherInfo; +import org.apache.flex.compiler.internal.codegen.databinding.PropertyWatcherInfo; +import org.apache.flex.compiler.internal.codegen.databinding.StaticPropertyWatcherInfo; +import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase; +import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType; +import org.apache.flex.compiler.internal.codegen.databinding.XMLWatcherInfo; +import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.PropertyNodes; +import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo; +import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSASDocEmitter; +import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitterTokens; +import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; +import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter; +import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils; +import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter; +import org.apache.flex.compiler.internal.projects.FlexJSProject; +import org.apache.flex.compiler.internal.projects.FlexProject; +import org.apache.flex.compiler.internal.scopes.ASProjectScope; +import org.apache.flex.compiler.internal.targets.ITargetAttributes; +import org.apache.flex.compiler.internal.tree.as.FunctionCallNode; +import org.apache.flex.compiler.internal.tree.as.IdentifierNode; +import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode; +import org.apache.flex.compiler.internal.tree.mxml.MXMLDocumentNode; +import org.apache.flex.compiler.internal.tree.mxml.MXMLFileNode; +import org.apache.flex.compiler.mxml.IMXMLLanguageConstants; +import org.apache.flex.compiler.projects.ICompilerProject; +import org.apache.flex.compiler.tree.ASTNodeID; +import org.apache.flex.compiler.tree.as.*; +import org.apache.flex.compiler.tree.metadata.IMetaTagNode; +import org.apache.flex.compiler.tree.metadata.IMetaTagsNode; +import org.apache.flex.compiler.tree.mxml.*; +import org.apache.flex.compiler.unit
[1/3] git commit: [flex-falcon] [refs/heads/develop] - try to get JSON output for ASDoc
Repository: flex-falcon
Updated Branches:
refs/heads/develop c5a10255f -> 8e7955930
try to get JSON output for ASDoc
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8e795593
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8e795593
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8e795593
Branch: refs/heads/develop
Commit: 8e7955930697c9b4c9385ce0b4ce39227db37aa0
Parents: f938cb7
Author: Alex Harui
Authored: Tue Oct 11 22:32:57 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 11 22:33:11 2016 -0700
--
.../compiler/asdoc/flexjs/ASDocComment.java | 94 -
.../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 371 +++
.../mxml/flexjs/MXMLFlexJSASDocBackend.java | 2 +-
.../parsing/as/FlexJSASDocDelegate.java | 27 +-
4 files changed, 389 insertions(+), 105 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8e795593/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
index 5470f47..e5064b1 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
@@ -19,7 +19,9 @@
package org.apache.flex.compiler.asdoc.flexjs;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -64,39 +66,91 @@ public class ASDocComment implements IASDocComment
return sb.toString();
}
+private String description = null;
+private Map> tagMap;
+
@Override
public String getDescription()
{
-return null;
+return description;
}
@Override
public void compile()
{
+String s = token.getText();
+String[] lines = s.split("\n");
+StringBuilder sb = new StringBuilder();
+int n = lines.length;
+if (n == 1)
+{
+ int c = lines[0].indexOf("*/");
+ if (c != -1)
+ lines[0] = lines[0].substring(0, c);
+}
+// clip off asdoc slash-star-star
+sb.append(lines[0].substring(3));
+for (int i = 1; i < n - 1; i++)
+{
+String line = lines[i];
+int star = line.indexOf("*");
+int at = line.indexOf("@");
+if (at == -1)
+{
+ sb.append(" ");
+ if (star > -1)
+ sb.append(line.substring(star + 1));
+}
+else
+{
+ if (tagMap == null)
+ tagMap = new HashMap>();
+
+ int after = line.indexOf(" ", at + 1);
+ if (after == -1)
+ {
+ tagMap.put(line.substring(at + 1), null);
+ }
+ else
+ {
+ String tagName = line.substring(at + 1, after);
+ List tags = tagMap.get(tagName);
+ if (tags == null)
+ {
+ tags = new ArrayList();
+ tagMap.put(tagName, tags);
+ }
+ tags.add(new ASDocTag(tagName, line.substring(after +
1)));
+ }
+}
+}
+description = sb.toString();
}
@Override
public boolean hasTag(String name)
{
-return false;
+ if (tagMap == null)
+ return false;
+ return (tagMap.containsKey(name));
}
@Override
public IASDocTag getTag(String name)
{
-return null;
+return tagMap.get(name).get(0);
}
@Override
public Map> getTags()
{
-return null;
+return tagMap;
}
@Override
public Collection getTagsByName(String string)
{
-return null;
+return tagMap.get(string);
}
@Override
@@ -104,4 +158,34 @@ public class ASDocComment implements IASDocComment
{
}
+class ASDocTag implements IASDocTag
+{
+ public ASDocTag(String name, String desc)
+ {
+ this.name = name;
+ this.desc = desc;
+ }
+
+ private String name;
+ private String desc;
+
+ @Override
+ public String getName() {
+ // TODO Auto-generated method stub
+
[1/2] git commit: [flex-falcon] [refs/heads/develop] - clean up most warnings
Repository: flex-falcon Updated Branches: refs/heads/develop 8e7955930 -> 38ca9c957 clean up most warnings Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bb4cbcf1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bb4cbcf1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bb4cbcf1 Branch: refs/heads/develop Commit: bb4cbcf168aa216b3e10de46d701aaa7a9545d29 Parents: 8e79559 Author: Alex Harui Authored: Wed Oct 12 12:39:48 2016 -0700 Committer: Alex Harui Committed: Wed Oct 12 12:39:48 2016 -0700 -- .../apache/flex/compiler/clients/ASDOCJSC.java | 13 -- .../apache/flex/compiler/clients/COMPJSC.java | 2 - .../internal/codegen/js/JSSessionModel.java | 1 - .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 63 -- .../internal/codegen/js/jx/AccessorEmitter.java | 2 - .../codegen/js/jx/BinaryOperatorEmitter.java| 2 - .../internal/codegen/js/jx/FieldEmitter.java| 14 -- .../codegen/js/jx/IdentifierEmitter.java| 4 - .../codegen/js/jx/MemberAccessEmitter.java | 3 - .../codegen/js/jx/SuperCallEmitter.java | 2 - .../mxml/flexjs/MXMLFlexJSASDocEmitter.java | 210 --- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 6 +- .../driver/js/goog/ASDocConfiguration.java | 2 - .../driver/mxml/ASDocASSourceFileHandler.java | 1 - .../mxml/flexjs/MXMLFlexJSASDocBackend.java | 5 - .../internal/projects/FlexJSProject.java| 1 - .../flex/compiler/internal/scopes/ASScope.java | 2 - .../compiler/internal/tree/as/ImportNode.java | 1 - .../src/test/java/as/ASInheritanceTests.java| 1 - 19 files changed, 2 insertions(+), 333 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java -- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java index 5bab139..db232fa 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java @@ -24,19 +24,11 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; -import java.util.Enumeration; import java.util.List; import java.util.Set; -import java.util.zip.Deflater; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipOutputStream; - import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; import org.apache.flex.compiler.codegen.as.IASWriter; import org.apache.flex.compiler.driver.IBackend; import org.apache.flex.compiler.driver.js.IJSApplication; @@ -49,22 +41,17 @@ import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration; import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend; import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocBackend; -import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSSWCBackend; import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend; import org.apache.flex.compiler.internal.driver.mxml.vf2js.MXMLVF2JSSWCBackend; import org.apache.flex.compiler.internal.projects.CompilerProject; import org.apache.flex.compiler.internal.targets.FlexJSSWCTarget; import org.apache.flex.compiler.internal.targets.JSTarget; -import org.apache.flex.compiler.problems.FileNotFoundProblem; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.InternalCompilerProblem; -import org.apache.flex.compiler.problems.LibraryNotFoundProblem; import org.apache.flex.compiler.problems.UnableToBuildSWFProblem; import org.apache.flex.compiler.targets.ITarget.TargetType; import org.apache.flex.compiler.targets.ITargetSettings; import org.apache.flex.compiler.units.ICompilationUnit; -import org.apache.flex.swc.ISWC; -import org.apache.flex.swc.io.SWCReader; /** * @author Erik de Bruin http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bb4cbcf1/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java -- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java index 697954f..97ba7c2 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler
[2/2] git commit: [flex-falcon] [refs/heads/develop] - FLEX-35141 fix XML literal handling'
FLEX-35141 fix XML literal handling'
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/38ca9c95
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/38ca9c95
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/38ca9c95
Branch: refs/heads/develop
Commit: 38ca9c957e01df7de9eba07b33eb3a62b6da7877
Parents: bb4cbcf
Author: Alex Harui
Authored: Thu Oct 13 09:05:37 2016 -0700
Committer: Alex Harui
Committed: Thu Oct 13 09:05:37 2016 -0700
--
.../compiler/internal/codegen/js/jx/LiteralEmitter.java | 2 +-
.../internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java | 9 +
2 files changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/38ca9c95/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
index 1be3b1e..d3fc55d 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/LiteralEmitter.java
@@ -91,7 +91,7 @@ public class LiteralEmitter extends JSSubEmitter implements
else
sb.append(s);
}
- inAttribute = s.equals("=");
+ inAttribute = s.endsWith("=");
}
s = sb.toString();
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/38ca9c95/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
index 291368d..2527073 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
@@ -355,6 +355,15 @@ public class TestFlexJSGlobalClasses extends
TestGoogGlobalClasses
}
@Test
+public void testXMLLiteralWithTemplateAndParams()
+{
+VariableNode node = (VariableNode)getNode("private function
test(attributevalue:String) { var a:XML = ;}",
+
VariableNode.class, WRAP_LEVEL_CLASS);
+asBlockWalker.visitVariable(node);
+assertOut("var /** @type {XML} */ a = new XML( '')");
+}
+
+@Test
public void testXMLLiteralWithTemplateExpression()
{
VariableNode node = (VariableNode)getNode("private function get
tagname():String { return 'name'; };\n" +
git commit: [flex-falcon] [refs/heads/develop] - handle 'new int'
Repository: flex-falcon
Updated Branches:
refs/heads/develop 38ca9c957 -> 680c335c7
handle 'new int'
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/680c335c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/680c335c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/680c335c
Branch: refs/heads/develop
Commit: 680c335c7f6c9e8a1e2fa068c697c63be2958b89
Parents: 38ca9c9
Author: Alex Harui
Authored: Thu Oct 13 15:22:09 2016 -0700
Committer: Alex Harui
Committed: Thu Oct 13 15:22:09 2016 -0700
--
.../codegen/js/jx/FunctionCallEmitter.java | 30
.../js/flexjs/TestFlexJSGlobalClasses.java | 17 +++
.../js/flexjs/TestFlexJSGlobalFunctions.java| 8 ++
3 files changed, 50 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/680c335c/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
index 0d34a3d..4b31159 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
@@ -67,6 +67,7 @@ public class FunctionCallEmitter extends JSSubEmitter
implements ISubEmitterhttp://git-wip-us.apache.org/repos/asf/flex-falcon/blob/680c335c/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
index 2527073..701fe1e 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
@@ -160,6 +160,23 @@ public class TestFlexJSGlobalClasses extends
TestGoogGlobalClasses
}
@Test
+public void testInt()
+{
+IVariableNode node = getVariable("var a:int = new int(\"123\");");
+asBlockWalker.visitVariable(node);
+assertOut("var /** @type {number} */ a =
org.apache.flex.utils.Language._int(\"123\")");
+}
+
+@Override
+@Test
+public void testUint()
+{
+IVariableNode node = getVariable("var a:uint = new uint(-100);");
+asBlockWalker.visitVariable(node);
+assertOut("var /** @type {number} */ a =
org.apache.flex.utils.Language.uint(-100)");
+}
+
+@Test
public void testIntConstMaxValue()
{
IVariableNode node = getVariable("var a:Number = int.MAX_VALUE");
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/680c335c/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
index 578ecfc..66397d8 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
@@ -126,6 +126,14 @@ public class TestFlexJSGlobalFunctions extends
TestGoogGlobalFunctions
assertOut("var /** @type {number} */ a =
org.apache.flex.utils.Language._int(1.8)");
}
+@Test
+public void testIntWithString()
+{
+IVariableNode node = getVariable("var a:int = int(\"123\");");
+asBlockWalker.visitVariable(node);
+assertOut("var /** @type {number} */ a =
org.apache.flex.utils.Language._int(\"123\")");
+}
+
@Override
@Test
public void testTrace()
git commit: [flex-asjs] [refs/heads/develop] - add default property for TextButton
Repository: flex-asjs
Updated Branches:
refs/heads/develop 83804e4af -> 9f510bc0f
add default property for TextButton
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9f510bc0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9f510bc0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9f510bc0
Branch: refs/heads/develop
Commit: 9f510bc0f07ea5defe5a4ce2521171eb877a1d0c
Parents: 83804e4
Author: Alex Harui
Authored: Sat Oct 15 23:23:07 2016 -0700
Committer: Alex Harui
Committed: Sat Oct 15 23:23:50 2016 -0700
--
.../projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9f510bc0/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
index ec052c7..b2997c2 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
@@ -24,6 +24,8 @@ package org.apache.flex.html
import org.apache.flex.core.WrappedHTMLElement;
}
+[DefaultProperty("text")]
+
/**
* The TextButton class implements a basic button that
* displays text.
[2/3] git commit: [flex-falcon] [refs/heads/develop] - json output
lose();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cd0908b6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java
new file mode 100644
index 000..1b619c1
--- /dev/null
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSASDocProject.java
@@ -0,0 +1,54 @@
+/*
+ *
+ * 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 org.apache.flex.compiler.internal.projects;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.flex.compiler.definitions.IDefinition;
+import org.apache.flex.compiler.internal.workspaces.Workspace;
+
+/**
+ * @author aharui
+ *
+ */
+public class FlexJSASDocProject extends FlexJSProject
+{
+
+/**
+ * Constructor
+ *
+ * @param workspace The {@code Workspace} containing this project.
+ */
+public FlexJSASDocProject(Workspace workspace)
+{
+super(workspace);
+}
+
+public class ASDocRecord
+{
+ public IDefinition definition;
+ public String description;
+}
+
+public Map> index = new HashMap>();
+public Map classes = new HashMap();
+public List tags = new ArrayList();
+}
[1/3] git commit: [flex-falcon] [refs/heads/develop] - handle text/html as default property. If text is specified as default property, but html is provided and an html property exists the html propert
Repository: flex-falcon
Updated Branches:
refs/heads/develop 13b29e17d -> 9c05264f8
handle text/html as default property. If text is specified as default
property, but html is provided and an html property exists the html property
will be set. This solution needs to be tested and generalized against mixed
text and html tags
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9c05264f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9c05264f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9c05264f
Branch: refs/heads/develop
Commit: 9c05264f858675cf080882177426e4e73338e44e
Parents: cd0908b
Author: Alex Harui
Authored: Sat Oct 15 23:26:52 2016 -0700
Committer: Alex Harui
Committed: Sat Oct 15 23:27:57 2016 -0700
--
.../compiler/internal/mxml/MXMLTagData.java | 37
.../compiler/internal/mxml/MXMLTextData.java| 2 +-
.../tree/mxml/MXMLClassReferenceNodeBase.java | 18 ++
.../tree/mxml/MXMLPropertySpecifierNode.java| 15
4 files changed, 71 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c05264f/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
--
diff --git
a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
index 2b5eec3..5ddd780 100644
---
a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
+++
b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
@@ -1132,4 +1132,41 @@ public class MXMLTagData extends MXMLUnitData implements
IMXMLTagData
return sb.toString();
}
+
+public String stringify()
+{
+ StringBuilder sb = new StringBuilder();
+sb.append('<');
+if (isCloseTag())
+sb.append('/');
+sb.append(getName());
+
+// Verify the attributes.
+for (IMXMLTagAttributeData attribute : getAttributeDatas())
+{
+ sb.append(" ");
+sb.append(attribute.getName());
+sb.append("=\"");
+sb.append(attribute.getRawValue());
+sb.append("\"");
+}
+if (isEmptyTag())
+sb.append('/');
+sb.append('>');
+for (IMXMLUnitData unit = getFirstChildUnit(); unit != null; unit =
unit.getNextSiblingUnit())
+{
+if (unit.isText())
+sb.append(((IMXMLTextData)unit).getCompilableText());
+else if (unit instanceof MXMLTagData)
+ sb.append(((MXMLTagData)unit).stringify());
+}
+if (!isEmptyTag())
+{
+sb.append('<');
+sb.append('/');
+sb.append(getName());
+sb.append('>');
+}
+return sb.toString();
+}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c05264f/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
--
diff --git
a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
index 2a35c19..5411912 100644
---
a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
+++
b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
@@ -39,7 +39,7 @@ public class MXMLTextData extends MXMLUnitData implements
IMXMLTextData
/**
* Constructor.
*/
-MXMLTextData(MXMLToken textToken)
+public MXMLTextData(MXMLToken textToken)
{
text = textToken.getText();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c05264f/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
--
diff --git
a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
index 0d3aab9..fc8ed36 100644
---
a/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
+++
b/compiler/src/main/java/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
@@ -489,6 +489,24 @@ abstract class MXMLClassReferenceNodeBase extends
MXMLNodeBase implements IMXMLC
}
else
{
+IVariableDefinition defaultPropertyDefinition =
getDefaultPropertyDefinition(builder);
+
[3/3] git commit: [flex-falcon] [refs/heads/develop] - tidy up the strings by eliminating extra whitespace
tidy up the strings by eliminating extra whitespace
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/87fd5e0c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/87fd5e0c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/87fd5e0c
Branch: refs/heads/develop
Commit: 87fd5e0cd8f93e7c0bae4df93cebb8db45b7c545
Parents: 13b29e1
Author: Alex Harui
Authored: Thu Oct 13 21:53:53 2016 -0700
Committer: Alex Harui
Committed: Sat Oct 15 23:27:57 2016 -0700
--
.../org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87fd5e0c/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
index e5064b1..b8e97d3 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
@@ -89,7 +89,7 @@ public class ASDocComment implements IASDocComment
lines[0] = lines[0].substring(0, c);
}
// clip off asdoc slash-star-star
-sb.append(lines[0].substring(3));
+sb.append(lines[0].substring(3).trim());
for (int i = 1; i < n - 1; i++)
{
String line = lines[i];
@@ -99,7 +99,7 @@ public class ASDocComment implements IASDocComment
{
sb.append(" ");
if (star > -1)
- sb.append(line.substring(star + 1));
+ sb.append(line.substring(star + 1).trim());
}
else
{
@@ -124,7 +124,7 @@ public class ASDocComment implements IASDocComment
}
}
}
-description = sb.toString();
+description = sb.toString().trim().replace("\"", "\\\"");
}
@Override
git commit: [flex-asjs] [refs/heads/feature/mdl] - fix MDL swc to use the correct Button
Repository: flex-asjs
Updated Branches:
refs/heads/feature/mdl 2b96b458d -> fa21a4cfb
fix MDL swc to use the correct Button
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fa21a4cf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa21a4cf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa21a4cf
Branch: refs/heads/feature/mdl
Commit: fa21a4cfb2b4bb5405bfe84ff984baead345e803
Parents: 2b96b45
Author: Alex Harui
Authored: Sun Oct 16 21:25:09 2016 -0700
Committer: Alex Harui
Committed: Sun Oct 16 21:25:09 2016 -0700
--
.../src/main/flex/org/apache/flex/mdl/Button.as | 5 +++--
.../MaterialDesignLite/src/main/resources/mdl-manifest.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa21a4cf/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as
--
diff --git
a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as
b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as
index 11f218c..7f836f6 100644
---
a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as
+++
b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Button.as
@@ -66,8 +66,9 @@ package org.apache.flex.mdl
override protected function createElement():WrappedHTMLElement
{
var button:HTMLButtonElement;
-
-element = button = document.createElement('button') as
HTMLButtonElement;
+
+button = document.createElement('button') as HTMLButtonElement;
+element = button as WrappedHTMLElement;
button.className = 'mdl-button mdl-js-button mdl-button--fab
mdl-button--colored';
positioner = element;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa21a4cf/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
--
diff --git
a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
index 68dffad..897aab5 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml
@@ -21,7 +21,7 @@
-
+
[2/2] git commit: [flex-asjs] [refs/heads/develop] - switch AIR visible flag to true if exists
switch AIR visible flag to true if exists
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fa6e0628
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa6e0628
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa6e0628
Branch: refs/heads/develop
Commit: fa6e06285a68980d299ee0c3d66f41f0d485c714
Parents: 734d4e0
Author: Alex Harui
Authored: Wed Oct 19 14:37:40 2016 -0700
Committer: Alex Harui
Committed: Thu Oct 20 09:12:35 2016 -0700
--
ide/flashbuilder/antscripts.xml | 14 ++
1 file changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa6e0628/ide/flashbuilder/antscripts.xml
--
diff --git a/ide/flashbuilder/antscripts.xml b/ide/flashbuilder/antscripts.xml
index fe51e8f..6a17d52 100644
--- a/ide/flashbuilder/antscripts.xml
+++ b/ide/flashbuilder/antscripts.xml
@@ -40,6 +40,7 @@
+
@@ -51,6 +52,7 @@
+
@@ -58,4 +60,16 @@
projectDir: ${projectDir}
projectName: ${projectName}
+
+
+Checking for ${projectDir}/src/${projectName}-app.xml
+
+
+
+
+
+
+
+
+
\ No newline at end of file
[1/2] git commit: [flex-asjs] [refs/heads/develop] - assume path to npm and cordova on mac. FB can't always find it since it might be started without the bash environment. Might need improving upon fo
Repository: flex-asjs Updated Branches: refs/heads/develop 734d4e046 -> 78d3ff9e5 assume path to npm and cordova on mac. FB can't always find it since it might be started without the bash environment. Might need improving upon for when the path isn't right Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/78d3ff9e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/78d3ff9e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/78d3ff9e Branch: refs/heads/develop Commit: 78d3ff9e5de116dd711c815bcbc18425a3553a92 Parents: fa6e062 Author: Alex Harui Authored: Thu Oct 20 09:11:48 2016 -0700 Committer: Alex Harui Committed: Thu Oct 20 09:12:35 2016 -0700 -- cordova-build.xml | 33 + 1 file changed, 21 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/78d3ff9e/cordova-build.xml -- diff --git a/cordova-build.xml b/cordova-build.xml index 1f78da8..58af158 100644 --- a/cordova-build.xml +++ b/cordova-build.xml @@ -39,7 +39,7 @@ --> - + @@ -75,11 +75,6 @@ - - - - - @@ -87,6 +82,14 @@ + + + + + + + + @@ -97,6 +100,7 @@ + @@ -107,11 +111,13 @@ + + @@ -144,26 +150,29 @@ - + - + + - + - + + - + - + +
git commit: [flex-asjs] [refs/heads/develop] - update run configs for changes in cordova_build.xml
Repository: flex-asjs Updated Branches: refs/heads/develop 02febf26d -> eb3a8b125 update run configs for changes in cordova_build.xml Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/eb3a8b12 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/eb3a8b12 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/eb3a8b12 Branch: refs/heads/develop Commit: eb3a8b1252103205c449d1076712b1ea7325c720 Parents: 02febf2 Author: Alex Harui Authored: Thu Oct 20 23:31:11 2016 -0700 Committer: Alex Harui Committed: Thu Oct 20 23:31:11 2016 -0700 -- .../FlexJS (Cordova Run Android).launch | 39 .../FlexJS (Cordova Run IOS).launch | 39 ide/flashbuilder/FlexJS (Cordova Run).launch| 39 3 files changed, 78 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb3a8b12/ide/flashbuilder/FlexJS (Cordova Run Android).launch -- diff --git a/ide/flashbuilder/FlexJS (Cordova Run Android).launch b/ide/flashbuilder/FlexJS (Cordova Run Android).launch new file mode 100644 index 000..1e05b80 --- /dev/null +++ b/ide/flashbuilder/FlexJS (Cordova Run Android).launch @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb3a8b12/ide/flashbuilder/FlexJS (Cordova Run IOS).launch -- diff --git a/ide/flashbuilder/FlexJS (Cordova Run IOS).launch b/ide/flashbuilder/FlexJS (Cordova Run IOS).launch new file mode 100644 index 000..6512d1b --- /dev/null +++ b/ide/flashbuilder/FlexJS (Cordova Run IOS).launch @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/eb3a8b12/ide/flashbuilder/FlexJS (Cordova Run).launch -- diff --git a/ide/flashbuilder/FlexJS (Cordova Run).launch b/ide/flashbuilder/FlexJS (Cordova Run).launch deleted file mode 100644 index f70eded..000 --- a/ide/flashbuilder/FlexJS (Cordova Run).launch +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -
git commit: [flex-asjs] [refs/heads/develop] - use maven target folder if exists
Repository: flex-asjs Updated Branches: refs/heads/develop eb3a8b125 -> afdc5f446 use maven target folder if exists Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/afdc5f44 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/afdc5f44 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/afdc5f44 Branch: refs/heads/develop Commit: afdc5f4460cb9817801416edd83ccad3d2023db1 Parents: eb3a8b1 Author: Alex Harui Authored: Fri Oct 21 22:19:17 2016 -0700 Committer: Alex Harui Committed: Fri Oct 21 22:19:17 2016 -0700 -- cordova-build.xml | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afdc5f44/cordova-build.xml -- diff --git a/cordova-build.xml b/cordova-build.xml index 5217dbc..786be15 100644 --- a/cordova-build.xml +++ b/cordova-build.xml @@ -24,7 +24,8 @@ ./* run ANT here */ ./src/.mxml /* The main application MXML tag */ -./bin/js-debug /* The result of building APP.mxml via mxmlc +./bin/js-debug /* The result of building APP.mxml via mxmlc, or + ./target/javascript/bin/js-debug /* The result of building APP.mxml via maven ./app//* The Cordova application directory 1. This ANT script will build the template Cordova app/APP if it does not @@ -55,6 +56,10 @@ + + + + @@ -121,7 +126,7 @@ - + @@ -166,7 +171,7 @@ --> - +
[2/2] git commit: [flex-falcon] [refs/heads/develop] - Most of DITA output per class file. Next up: consolidate into package files
Most of DITA output per class file. Next up: consolidate into package files
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9345ae4f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9345ae4f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9345ae4f
Branch: refs/heads/develop
Commit: 9345ae4f954dfb6daf74eb8116bfbb1b605b3f05
Parents: 1c96ccd
Author: Alex Harui
Authored: Tue Oct 18 12:26:30 2016 -0700
Committer: Alex Harui
Committed: Sun Oct 23 23:42:59 2016 -0700
--
.../compiler/asdoc/flexjs/ASDocComment.java | 32 +-
.../apache/flex/compiler/clients/ASDOCJSC.java |5 +
.../apache/flex/compiler/clients/MXMLJSC.java |1 +
.../js/flexjs/JSFlexJSASDocDITAEmitter.java | 1169 ++
.../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 42 +-
.../mxml/flexjs/MXMLFlexJSASDocEmitter.java |3 +-
.../mxml/flexjs/MXMLFlexJSASDocDITABackend.java | 136 ++
7 files changed, 1381 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9345ae4f/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
index b8e97d3..0f0a4dc 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/asdoc/flexjs/ASDocComment.java
@@ -78,6 +78,11 @@ public class ASDocComment implements IASDocComment
@Override
public void compile()
{
+ compile(true);
+}
+
+public void compile(boolean trimlines)
+{
String s = token.getText();
String[] lines = s.split("\n");
StringBuilder sb = new StringBuilder();
@@ -89,17 +94,26 @@ public class ASDocComment implements IASDocComment
lines[0] = lines[0].substring(0, c);
}
// clip off asdoc slash-star-star
-sb.append(lines[0].substring(3).trim());
+String line = lines[0].substring(3);
+if (trimlines)
+ sb.append(line.trim());
+else
+ sb.append(line + "\n");
for (int i = 1; i < n - 1; i++)
{
-String line = lines[i];
+line = lines[i];
int star = line.indexOf("*");
int at = line.indexOf("@");
if (at == -1)
{
sb.append(" ");
if (star > -1)
- sb.append(line.substring(star + 1).trim());
+ {
+ if (trimlines)
+ sb.append(line.substring(star + 1).trim());
+ else
+ sb.append(line.substring(star + 1) + "\n");
+ }
}
else
{
@@ -124,7 +138,10 @@ public class ASDocComment implements IASDocComment
}
}
}
-description = sb.toString().trim().replace("\"", "\\\"");
+if (trimlines)
+ description = sb.toString().trim().replace("\"", "\\\"");
+else
+ description = sb.toString();
}
@Override
@@ -138,7 +155,12 @@ public class ASDocComment implements IASDocComment
@Override
public IASDocTag getTag(String name)
{
-return tagMap.get(name).get(0);
+ if (tagMap == null)
+ return null;
+ List tags = tagMap.get(name);
+ if (tags == null)
+ return null;
+return tags.get(0);
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9345ae4f/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java
index 0ba33f0..8aa0552 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java
@@ -42,6 +42,7 @@ import
org.apache.flex.compiler.internal.driver.js.amd.AMDBackend;
import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration;
import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
import
org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocBackend;
+import
org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLFlexJSASDocDITABackend;
import org.ap
[1/2] git commit: [flex-falcon] [refs/heads/develop] - add compiler.exclude-defaults-css-files option to exclude certain kinds of CSS output. The entries should be paths to files or can reference the
Repository: flex-falcon
Updated Branches:
refs/heads/develop 1c96ccd6a -> ab582dd17
add compiler.exclude-defaults-css-files option to exclude certain kinds of CSS
output. The entries should be paths to files or can reference the defaults.css
in HTML.swc via HTML.swc:defaults.css
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ab582dd1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ab582dd1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ab582dd1
Branch: refs/heads/develop
Commit: ab582dd1761e3877d26717ea1544941257e2e718
Parents: 9345ae4
Author: Alex Harui
Authored: Sun Oct 23 23:42:49 2016 -0700
Committer: Alex Harui
Committed: Sun Oct 23 23:42:59 2016 -0700
--
.../compiler/internal/targets/FlexJSTarget.java | 1 +
.../org/apache/flex/compiler/clients/ASC.java | 6 ++
.../flex/compiler/config/Configuration.java | 59 ++--
.../internal/config/TargetSettings.java | 6 ++
.../css/codegen/CSSCompilationSession.java | 19 +++
.../internal/targets/FlexAppSWFTarget.java | 1 +
.../flex/compiler/targets/ITargetSettings.java | 5 ++
7 files changed, 91 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ab582dd1/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
index 89ad4ff..01c24f1 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
@@ -148,6 +148,7 @@ public class FlexJSTarget extends JSTarget implements
IJSTarget
{
JSCSSCompilationSession cssCompilationSession =
(JSCSSCompilationSession) flexProject.getCSSCompilationSession();
cssCompilationSession.setKeepAllTypeSelectors(targetSettings.keepAllTypeSelectors());
+
cssCompilationSession.setExcludeDefaultsCSSFiles(targetSettings.getExcludeDefaultsCSSFiles());
// Performance heuristic: let's start compilation on all of the
compilation
// units we know about up front. This is particularly useful on SWC
projects where
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ab582dd1/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
--
diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
b/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
index 432a445..a13c85a 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
@@ -426,6 +426,12 @@ public class ASC
}
@Override
+public List getExcludeDefaultsCSSFiles()
+{
+return ImmutableList.of();
+}
+
+@Override
public File getLinkReport()
{
return null;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ab582dd1/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
--
diff --git
a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
index 79e555d..ea1e879 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
@@ -2986,6 +2986,49 @@ public class Configuration
}
}
+//
+// 'compiler.exclude-defaults-css-files' option
+//
+
+private Deque excludeDefaultsCSSFiles = new ArrayDeque();
+
+/**
+ * List of filenames to exclude from list of defaults style stylesheets
(css only).
+ * For defaults.css files in a SWC, use HTML.swc:defaults.css where HTML
is the
+ * name of a SWC.
+ *
+ * For example:
+ * -exclude-defaults-css-files=[A, B, C]
+ * Then, 'A' should have precedence over 'B', then 'C', then SWCs
defaultsCssFiles should have the order: SWCS, C,
+ * B, A
+ *
+ * @see #setExcludeDefaultsCSSFiles
+ */
+public Deque getExcludeDefaultsCSSFiles()
+{
+return excludeDefaultsCSSFiles;
+}
+
+/**
+ * Excludes CSS files from the output.
+ *
+ * This option takes one or more files. The precedence for multiple CSS
files included with this option is from
+ * fir
git commit: [flex-sdk] [refs/heads/develop] - use flex download cache if downloads fail
Repository: flex-sdk
Updated Branches:
refs/heads/develop 0dff7f486 -> 522a06d61
use flex download cache if downloads fail
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/522a06d6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/522a06d6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/522a06d6
Branch: refs/heads/develop
Commit: 522a06d61ff477435ea0b44ae17466440bf092cb
Parents: 0dff7f4
Author: Alex Harui
Authored: Tue Oct 25 12:47:18 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 25 12:47:46 2016 -0700
--
frameworks/downloads.xml | 113 ++
modules/downloads.xml| 86 +---
2 files changed, 181 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/522a06d6/frameworks/downloads.xml
--
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 5d09c39..86536f1 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -107,7 +107,13 @@
verbose="false"/ -->
http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc?r=&ts=1381906346&use_mirror=optimate";
dest="${download.dir}/osmf.swc"
-verbose="false"/>
+verbose="false" ignoreerrors="true"/>
+
+
+
+
+
+
@@ -126,6 +132,12 @@
+
+
+
+
+
+
@@ -151,7 +163,14 @@
https://codeload.github.com/swfobject/swfobject/zip/2.2";
dest="${download.dir}/swfobject_2_2.zip"
-verbose="false"/>
+verbose="false" ignoreerrors="true"/>
+
+
+
+
+
+
+
@@ -160,6 +179,7 @@
+
@@ -172,6 +192,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -275,25 +313,49 @@
http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw";
-dest="${download.dir}/${adobe.afe.file}"/>
+dest="${download.dir}/${adobe.afe.file}" ignoreerrors="true"/>
+
+
+
+
+
+
http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw";
- dest="${download.dir}/${adobe.aglj40.file}"/>
+ dest="${download.dir}/${adobe.aglj40.file}" ignoreerrors="true"/>
+
+
+
+
+
+
http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw";
- dest="${download.dir}/${adobe.rideau.file}"/>
+ dest="${download.dir}/${adobe.rideau.file}" ignoreerrors="true"/>
+
+
+
+
+
+
http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw";
- dest="${download.dir}/${adobe.flex-fontkit.file}"/>
+ dest="${download.dir}/${adobe.flex-fontkit.file}"
ignoreerrors="true"/>
+
+
+
+
+
+
@@ -301,9 +363,13 @@
-
+
+
+
+
+
@@ -318,8 +384,11 @@
+
+
+
+
-
@@ -339,11 +408,35 @@
Using mirror: ${preferred}
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Need file: ${still_no_file}
+
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/522a06d6/modules/downloads.xml
--
diff --git a/modules/downloads.xml b/modules/downloads.xml
index dba18fe..a827ce5 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -165,
[1/2] flex-typedefs git commit: allow typedefs to get their downloads from the cache in case the true source is unavailable
Repository: flex-typedefs
Updated Branches:
refs/heads/develop 08f98e831 -> e0f9b7a13
allow typedefs to get their downloads from the cache in case the true source is
unavailable
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/e0f9b7a1
Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/e0f9b7a1
Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/e0f9b7a1
Branch: refs/heads/develop
Commit: e0f9b7a1354a97b87e17d7a61291556678f54cdf
Parents: 4f6ee20
Author: Alex Harui
Authored: Tue Oct 25 12:55:30 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 25 12:55:36 2016 -0700
--
createjs/build.xml| 47 +++-
google_maps/build.xml | 36 -
jasmine/build.xml | 38 +-
jquery/build.xml | 38 +-
js/build.xml | 37 -
node/build.xml| 183 ++---
6 files changed, 345 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/e0f9b7a1/createjs/build.xml
--
diff --git a/createjs/build.xml b/createjs/build.xml
index 2317049..86b9e41 100644
--- a/createjs/build.xml
+++ b/createjs/build.xml
@@ -85,13 +85,31 @@
https://github.com/CreateJS/EaselJS/archive/${createjs.version}.zip";
-dest="${basedir}/target/downloads/easel-${createjs.version}.zip"
skipexisting="true"/>
+dest="${basedir}/target/downloads/easel-${createjs.version}.zip"
skipexisting="true" ignoreerrors="true"/>
+
+
+
+
+
+
+
+
+
https://github.com/CreateJS/TweenJS/archive/${tweenjs.version}.zip";
-dest="${basedir}/target/downloads/tween-${tweenjs.version}.zip"
skipexisting="true"/>
+dest="${basedir}/target/downloads/tween-${tweenjs.version}.zip"
skipexisting="true" ignoreerrors="true"/>
+
+
+
+
+
+
+
+
+
[2/2] flex-typedefs git commit: change fireListener to a var so we can reassign it at runtime
change fireListener to a var so we can reassign it at runtime
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/4f6ee20b
Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/4f6ee20b
Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/4f6ee20b
Branch: refs/heads/develop
Commit: 4f6ee20bd4cf98bdae11cec16e81d14094432ded
Parents: 08f98e8
Author: Alex Harui
Authored: Tue Oct 25 12:55:09 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 25 12:55:36 2016 -0700
--
GCL/src/main/flex/goog/events.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/4f6ee20b/GCL/src/main/flex/goog/events.as
--
diff --git a/GCL/src/main/flex/goog/events.as b/GCL/src/main/flex/goog/events.as
index 62c7141..b01dbc9 100644
--- a/GCL/src/main/flex/goog/events.as
+++ b/GCL/src/main/flex/goog/events.as
@@ -14,8 +14,8 @@
package goog {
public class events {
-public static function get fireListener():Function{return null;}
-public static function set fireListener(value:Function):void{}
+ // fireListener is a static function, but we want to re-assign it from
FlexJS so we declare it as a var
+public static var fireListener:Function;
public static function hasListener(object:Object, type:String = null,
capture:Boolean = false):Boolean{return false};
public static function listen(object:Object, type:String,
handler:Function, capture:Boolean = false, scope:Object = null):Boolean{return
false};
public static function unlisten(object:Object, type:String,
handler:Function, capture:Boolean = false, scope:Object = null):Boolean{return
false};
git commit: [flex-falcon] [refs/heads/develop] - allow CI builds to use a download cache if downloads fail
Repository: flex-falcon
Updated Branches:
refs/heads/develop e7234729f -> cccaa5a16
allow CI builds to use a download cache if downloads fail
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cccaa5a1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cccaa5a1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cccaa5a1
Branch: refs/heads/develop
Commit: cccaa5a16d892174cdfa41d36ad5b82b4d98559e
Parents: e723472
Author: Alex Harui
Authored: Tue Oct 25 12:51:09 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 25 12:51:09 2016 -0700
--
compiler-jburg-types/build.xml | 10 ++-
compiler-jx/src/main/resources/downloads.xml | 90 --
compiler-jx/src/test/downloads.xml | 43 ++-
compiler-test-utils/build.xml| 8 +-
compiler/src/main/resources/downloads.xml| 94 ++-
compiler/src/test/downloads.xml | 57 --
debugger/build.xml | 36 -
flex-compiler-oem/build.xml | 37 -
8 files changed, 314 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cccaa5a1/compiler-jburg-types/build.xml
--
diff --git a/compiler-jburg-types/build.xml b/compiler-jburg-types/build.xml
index 7b2568c..69cc3bd 100644
--- a/compiler-jburg-types/build.xml
+++ b/compiler-jburg-types/build.xml
@@ -74,7 +74,15 @@
-
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cccaa5a1/compiler-jx/src/main/resources/downloads.xml
--
diff --git a/compiler-jx/src/main/resources/downloads.xml
b/compiler-jx/src/main/resources/downloads.xml
index 2bbb1a9..dc05561 100644
--- a/compiler-jx/src/main/resources/downloads.xml
+++ b/compiler-jx/src/main/resources/downloads.xml
@@ -182,7 +182,16 @@
-http://www.apache.org/licenses/LICENSE-2.0";
dest="${lib.dir}/${dest.folder}/${name}-LICENSE.txt"/>
+http://www.apache.org/licenses/LICENSE-2.0";
dest="${lib.dir}/${dest.folder}/${name}-LICENSE.txt" ignoreerrors="true"/>
+
+
+
+
+
+
+
+
+
@@ -192,7 +201,8 @@
-
+
+
@@ -201,7 +211,8 @@
-
+
+
@@ -231,7 +242,6 @@
-
@@ -242,7 +252,6 @@
-
@@ -268,7 +277,8 @@
srcFile - a .gz file for untar with gzip, else unzip
[md5]
[srcJarPath] - both src and dest required for the copy
- [destJarFile]
+ [destDir]
+ [destFile]
Note: This is purposely coded without so that a
dependency on
ant-contrib.jar isn't required.
@@ -276,11 +286,13 @@
-
+
+
-
+
+
@@ -290,7 +302,8 @@
-
+
+
@@ -299,17 +312,20 @@
-
+
+
-
+
+
-
+
+
@@ -323,17 +339,15 @@
srcDomain
srcFolder
srcFile
- destJarFile
+ destDir
+ destFile
[md5]
-->
-
-
-
-
-
+
+
@@ -345,10 +359,12 @@
-
+
+
+
+
-
-
+
@@ -357,7 +373,7 @@
${INFO_USING_CACHED_FILE}
${downloadCacheFolder}/${srcFolder}/${srcFile}
-
+
@@ -365,11 +381,11 @@
-
+
-
+
@@ -379,13 +395,37 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Need file: ${still_no_file}
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -112,8 +121,34 @@
http://search.maven.org/remotecontent?filepath=j
[1/2] git commit: [flex-asjs] [refs/heads/develop] - allow CI build to use download cache in case true source is unavailable
Repository: flex-asjs
Updated Branches:
refs/heads/develop 4c9ab06a8 -> 4b7967018
allow CI build to use download cache in case true source is unavailable
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4b796701
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4b796701
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4b796701
Branch: refs/heads/develop
Commit: 4b796701864d8b12a601c205b1e72bad2219c847
Parents: 64d564f
Author: Alex Harui
Authored: Tue Oct 25 13:00:03 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 25 13:00:42 2016 -0700
--
frameworks/downloads.xml | 76 ---
1 file changed, 72 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b796701/frameworks/downloads.xml
--
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 6238641..220b3f9 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -55,8 +55,15 @@
https://codeload.github.com/swfobject/swfobject/zip/2.2";
-dest="${download.dir}/swfobject_2_2.zip"
-verbose="false"/>
+dest="${download.dir}/swfobject_2_2.zip"
+verbose="false" ignoreerrors="true"/>
+
+
+
+
+
+
+
@@ -65,6 +72,7 @@
+
@@ -83,6 +91,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125,7 +151,16 @@
https://github.com/designmodo/Flat-UI/archive/2.2.2.zip";
dest="${download.dir}/flat-ui_2_2.zip"
-verbose="false"/>
+verbose="false" ignoreerrors="true"/>
+
+
+
+
+
+
+
+
+
@@ -158,8 +193,17 @@
https://github.com/google/closure-library/archive/master.zip";
dest="${download.dir}/google-closure-library-master.zip"
- verbose="false"/>
+ verbose="false" ignoreerrors="true"/>
+
+
+
+
+
+
+
+
+
@@ -225,4 +269,28 @@
value="${env.GOOG_HOME}" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Need file: ${still_no_file}
+
+
+
+
[2/2] git commit: [flex-asjs] [refs/heads/develop] - change name so the instance and static properties have different names. This was messing up reflection info
change name so the instance and static properties have different names. This
was messing up reflection info
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64d564f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64d564f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64d564f8
Branch: refs/heads/develop
Commit: 64d564f8f90b177ff573215983cb9da6b0da29f5
Parents: 4c9ab06
Author: Alex Harui
Authored: Tue Oct 25 12:59:38 2016 -0700
Committer: Alex Harui
Committed: Tue Oct 25 13:00:42 2016 -0700
--
.../HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64d564f8/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
index 76160c0..0719036 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleAlert.as
@@ -103,7 +103,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function show(parent:Object) : void
+ public function showAlert(parent:Object) : void
{
parent.addElement(this);
}
@@ -125,7 +125,7 @@ package org.apache.flex.html
{
var alert:SimpleAlert = new SimpleAlert();
alert.message = message;
-alert.show(parent);
+alert.showAlert(parent);
return alert;
}
git commit: [flex-asjs] [refs/heads/develop] - fix up installer after launch script name changes
Repository: flex-asjs
Updated Branches:
refs/heads/develop 561cf332a -> 4c78873df
fix up installer after launch script name changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4c78873d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4c78873d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4c78873d
Branch: refs/heads/develop
Commit: 4c78873dfa4f5faabd2e0130413be5a9e92776cb
Parents: 561cf33
Author: Alex Harui
Authored: Wed Oct 26 09:27:04 2016 -0700
Committer: Alex Harui
Committed: Wed Oct 26 09:27:11 2016 -0700
--
installer.xml | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c78873d/installer.xml
--
diff --git a/installer.xml b/installer.xml
index d6c8722..47fd118 100644
--- a/installer.xml
+++ b/installer.xml
@@ -967,7 +967,12 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
token="$FLEXJS_HOME"
value="${FLEXJS_HOME}"/>
-
+
+
+
+
@@ -1000,11 +1005,16 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc"
/>
token="PATH"
value="UNIX_PATH" />
-
+
+
+
+
svn commit: r1766701 - /flex/site/trunk/content/installer/sdk-installer-config-4.0.xml
Author: aharui Date: Wed Oct 26 16:39:31 2016 New Revision: 1766701 URL: http://svn.apache.org/viewvc?rev=1766701&view=rev Log: "update md5s" Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml URL: http://svn.apache.org/viewvc/flex/site/trunk/content/installer/sdk-installer-config-4.0.xml?rev=1766701&r1=1766700&r2=1766701&view=diff == --- flex/site/trunk/content/installer/sdk-installer-config-4.0.xml (original) +++ flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Wed Oct 26 16:39:31 2016 @@ -674,12 +674,12 @@ limitations under the License. https://fpdownload.macromedia.com/pub/flashplayer/updaters/22/flashplayer_22_sa_debug.exe https://fpdownload.macromedia.com/pub/flashplayer/updaters/22/flashplayer_22_sa_debug.dmg - + http://fpdownload.macromedia.com get/flashplayer/updaters/23/ http://fpdownload.macromedia.com/get/flashplayer/updaters/23/ playerglobal23_0.swc -2b32e95a3d2cf98021c59c6c814ce4ab +460477059d7a23e045a75d7e85c48bab 34 https://fpdownload.macromedia.com/pub/flashplayer/updaters/23/flashplayer_23_sa_debug.exe https://fpdownload.macromedia.com/pub/flashplayer/updaters/23/flashplayer_23_sa_debug.dmg
svn commit: r999957 - in /websites/production/flex: cgi-bin/ content/
Author: aharui Date: Wed Oct 26 16:50:09 2016 New Revision: 57 Log: Publishing svnmucc operation to flex site by aharui Added: websites/production/flex/cgi-bin/ - copied from r56, websites/staging/flex/trunk/cgi-bin/ websites/production/flex/content/ - copied from r56, websites/staging/flex/trunk/content/
git commit: [flex-asjs] [refs/heads/refactor-sprite] - fix ItemRendererEvent on SWF side
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite b8e533bec -> 6e3071bce
fix ItemRendererEvent on SWF side
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6e3071bc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6e3071bc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6e3071bc
Branch: refs/heads/refactor-sprite
Commit: 6e3071bce81dacbe48aaa3f325fe2bcf719f6f01
Parents: b8e533b
Author: Alex Harui
Authored: Wed Oct 26 12:48:36 2016 -0700
Committer: Alex Harui
Committed: Wed Oct 26 12:48:36 2016 -0700
--
.../src/main/flex/org/apache/flex/events/ItemRendererEvent.as | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6e3071bc/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRendererEvent.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRendererEvent.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRendererEvent.as
index f4044a4..cf2b803 100644
---
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRendererEvent.as
+++
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/events/ItemRendererEvent.as
@@ -21,6 +21,7 @@ package org.apache.flex.events
{
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.events.CustomEvent;
+ import org.apache.flex.events.IFlexJSEvent;
/**
* The ItemRendererEvent is dispatched by DataItemRendererFactory
classes under
@@ -80,7 +81,7 @@ package org.apache.flex.events
/**
* @private
*/
- override public function
cloneEvent():org.apache.flex.events.Event
+ override public function cloneEvent():IFlexJSEvent
{
var newEvent:ItemRendererEvent = new
ItemRendererEvent(type);
newEvent.itemRenderer = itemRenderer;
git commit: [flex-falcon] [refs/heads/develop] - allow [Embed(source="filename", mimeType="text/plain")] to initialize a string variable to the contents of a text file
Repository: flex-falcon
Updated Branches:
refs/heads/develop 9694d69bb -> f56565d61
allow [Embed(source="filename",mimeType="text/plain")] to initialize a string
variable to the contents of a text file
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f56565d6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f56565d6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f56565d6
Branch: refs/heads/develop
Commit: f56565d61e77c141eae1f71d50f51a737d65167a
Parents: 9694d69
Author: Alex Harui
Authored: Fri Oct 28 14:47:25 2016 -0700
Committer: Alex Harui
Committed: Fri Oct 28 14:47:37 2016 -0700
--
.../flex/compiler/codegen/as/IASEmitter.java| 3 +
.../internal/codegen/as/ASBlockWalker.java | 2 +-
.../compiler/internal/codegen/as/ASEmitter.java | 6 ++
.../codegen/js/flexjs/JSFlexJSEmitter.java | 64
.../compiler/internal/embedding/EmbedData.java | 3 +
.../internal/embedding/EmbedMIMEType.java | 2 +
.../compiler/internal/tree/as/EmbedNode.java| 36 +++
7 files changed, 115 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f56565d6/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java
index 2fe9eea..928259b 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/codegen/as/IASEmitter.java
@@ -32,6 +32,7 @@ import org.apache.flex.compiler.tree.as.ICatchNode;
import org.apache.flex.compiler.tree.as.IClassNode;
import org.apache.flex.compiler.tree.as.IContainerNode;
import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
+import org.apache.flex.compiler.tree.as.IEmbedNode;
import org.apache.flex.compiler.tree.as.IForLoopNode;
import org.apache.flex.compiler.tree.as.IFunctionCallNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
@@ -360,6 +361,8 @@ public interface IASEmitter extends IEmitter
void emitMetaTag(IMetaTagNode node);
+void emitEmbed(IEmbedNode node);
+
void emitContainer(IContainerNode node);
void emitE4XFilter(IMemberAccessExpressionNode node);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f56565d6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
index aa29f4d..5247583 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASBlockWalker.java
@@ -595,7 +595,7 @@ public class ASBlockWalker implements IASBlockVisitor,
IASBlockWalker
public void visitEmbed(IEmbedNode node)
{
debug("visitEmbed(" + node.getAttributes()[0].getValue() + ")");
-// TODO (mschmalle) visitEmbed()
+emitter.emitEmbed(node);
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f56565d6/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
--
diff --git
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
index f25d6c9..0320d6a 100644
---
a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
@@ -54,6 +54,7 @@ import org.apache.flex.compiler.tree.as.IContainerNode;
import org.apache.flex.compiler.tree.as.IContainerNode.ContainerType;
import org.apache.flex.compiler.tree.as.IDefinitionNode;
import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
+import org.apache.flex.compiler.tree.as.IEmbedNode;
import org.apache.flex.compiler.tree.as.IExpressionNode;
import org.apache.flex.compiler.tree.as.IForLoopNode;
import org.apache.flex.compiler.tree.as.IFunctionCallNode;
@@ -1511,6 +1512,11 @@ public class ASEmitter implements IASEmitter, IEmitter
}
@Override
+public void emitEmbed(IEmbedNode node)
+{
+}
+
+@Override
public void emitContainer(IContainerNode node)
{
}
http://git-wip-us.apache
flex-typedefs git commit: try to use patch instead of post process so Maven will see it. The default value isn't correct, but I don't think that matters
Repository: flex-typedefs
Updated Branches:
refs/heads/develop 13b17b14a -> e7609344d
try to use patch instead of post process so Maven will see it. The default
value isn't correct, but I don't think that matters
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/e7609344
Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/e7609344
Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/e7609344
Branch: refs/heads/develop
Commit: e7609344d2f519fd106b2a647e75d73f3563a8e4
Parents: 13b17b1
Author: Alex Harui
Authored: Tue Nov 1 16:02:29 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 16:02:29 2016 -0700
--
js/build.xml | 9 ++---
js/src/main/patch/js.patch | 17 -
2 files changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/e7609344/js/build.xml
--
diff --git a/js/build.xml b/js/build.xml
index eb1ba0e..302c0fc 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -114,6 +114,12 @@
+
+
+
+
+
+
@@ -157,9 +163,6 @@
-
-
-
http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/e7609344/js/src/main/patch/js.patch
--
diff --git a/js/src/main/patch/js.patch b/js/src/main/patch/js.patch
index cae08d5..f54f48f 100644
--- a/js/src/main/patch/js.patch
+++ b/js/src/main/patch/js.patch
@@ -16,9 +16,24 @@
Generated from Ant script
diff --git a/js/target/downloads/es3.js b/js/target/downloads/es3.js
-index fa5e5a6..6c5e3e7 100644
+index fa5e5a6..a6e4fa0 100644
--- a/js/target/downloads/es3.js
+++ b/js/target/downloads/es3.js
+@@ -174,12 +174,12 @@ function parseFloat(num) {}
+ * leader, then pass {@code undefined} as the base.
+ *
+ * @param {*} num
+- * @param {number|undefined} base
++ * @param {number=} base
+ * @return {number}
+ * @nosideeffects
+ * @see
http://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/parseInt
+ */
+-function parseInt(num, base) {}
++function parseInt(num, opt_base) {}
+
+ /**
+ * @param {string} code
@@ -201,10 +201,10 @@ function Object(opt_value) {}
/**
git commit: [flex-falcon] [refs/heads/develop] - set mxml.children-as-data for the 'extern' or xxJS.swc so the dependencies are the same as the transpile
Repository: flex-falcon Updated Branches: refs/heads/develop 39b119a47 -> 90ec96e50 set mxml.children-as-data for the 'extern' or xxJS.swc so the dependencies are the same as the transpile Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/90ec96e5 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/90ec96e5 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/90ec96e5 Branch: refs/heads/develop Commit: 90ec96e500a1d58e18fb39311e26b7da9fe796b9 Parents: 39b119a Author: Alex Harui Authored: Tue Nov 1 23:18:57 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 23:18:57 2016 -0700 -- .../src/main/resources/config/compile-extern-config.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/90ec96e5/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml -- diff --git a/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml b/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml index 6be6202..dce12d2 100644 --- a/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml +++ b/flexjs-maven-plugin/src/main/resources/config/compile-extern-config.xml @@ -48,6 +48,10 @@ false + +true + + false #foreach($define in $defines)
[12/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
new file mode 100644
index 000..91d1838
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
@@ -0,0 +1,36 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+/**
+ * The IGraphicsDrawing interface is a marker interface for beads
+ * that draw into the graphics layer. This helps a bead determine
+ * if it is the first of many graphics drawing beads so it can
+ * know whether or not to clear the graphics layer before drawing.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface IGraphicsDrawing
+ {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
new file mode 100644
index 000..f9159ce
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
@@ -0,0 +1,48 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IStrand;
+
+ /**
+* The IListView interface provides the protocol for any bead that
+* creates the visual parts for a org.apache.flex.html.List control.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public interface IListView extends IBeadView
+ {
+ /**
+* The component which parents all of the itemRenderers for
each
+* datum being displayed by the List component.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ function get dataGroup():IItemRendererParent;
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as
--
diff --git
a/frameworks/proj
[01/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - fix up installer after launch script name changes
Repository: flex-asjs
Updated Branches:
refs/heads/refactor-sprite 1829b467e -> 1b6c3af23
fix up installer after launch script name changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6c2e37f9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6c2e37f9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6c2e37f9
Branch: refs/heads/refactor-sprite
Commit: 6c2e37f99bf5716641611c642b31760421c6ecfd
Parents: 4448b42
Author: Alex Harui
Authored: Wed Oct 26 09:27:04 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:50 2016 -0700
--
installer.xml | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6c2e37f9/installer.xml
--
diff --git a/installer.xml b/installer.xml
index d6c8722..47fd118 100644
--- a/installer.xml
+++ b/installer.xml
@@ -967,7 +967,12 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
token="$FLEXJS_HOME"
value="${FLEXJS_HOME}"/>
-
+
+
+
+
@@ -1000,11 +1005,16 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc"
/>
token="PATH"
value="UNIX_PATH" />
-
+
+
+
+
[15/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
new file mode 100644
index 000..be86d41
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
@@ -0,0 +1,170 @@
+
+//
+// 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 org.apache.flex.html
+{
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IToggleButtonModel;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.IEventDispatcher;
+
+COMPILE::JS
+{
+import org.apache.flex.core.WrappedHTMLElement;
+}
+
+//--
+// Events
+//--
+
+/**
+ * Dispatched when the user clicks on a button.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="click", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * The ToggleButton class is a TextButton that supports
+ * a selected property.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ToggleTextButton extends TextButton implements IStrand,
IEventDispatcher, IUIBase
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ToggleTextButton()
+ {
+ super();
+COMPILE::JS
+{
+this.typeNames = 'toggleTextButton';
+}
+ }
+
+COMPILE::JS
+private var _selected:Boolean;
+
+COMPILE::JS
+private var SELECTED:String = "selected";
+
+/**
+ * true if the Button is selected.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function get selected():Boolean
+{
+COMPILE::SWF
+{
+return IToggleButtonModel(model).selected;
+}
+COMPILE::JS
+{
+return _selected;
+}
+}
+
+/**
+ * @private
+ */
+public function set selected(value:Boolean):void
+{
+COMPILE::SWF
+{
+IToggleButtonModel(model).selected = value;
+}
+COMPILE::JS
+{
+if (_selected != value)
+{
+_selected = value;
+
+var className:String = this.className;
+var typeNames:String = this.typeNames;
+if (value) {
+if (typeNames.indexOf(SELECTED) == -1) {
+typeNames = typeNames + SELECTED;
+if (className)
+element.className = typeNames + ' ' +
className;
+else
+element.className = typeNames;
+}
+}
+else {
+if (typeNames.indexOf(SELECTED) == typeNames.length -
SELECTED.length) {
+typeNames = typeNames.substring(0,
typeNames.length - SELECTED.length);
+if (className)
+
[30/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move UIBase and UIButtonBase
move UIBase and UIButtonBase
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/975d3f34
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/975d3f34
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/975d3f34
Branch: refs/heads/refactor-sprite
Commit: 975d3f34f058cf3fd79302a6e7037c5e29f7ac84
Parents: 87ee711
Author: Alex Harui
Authored: Fri Oct 28 08:06:04 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:55:20 2016 -0700
--
.../main/flex/org/apache/flex/core/UIBase.as| 1401 --
.../flex/org/apache/flex/core/UIButtonBase.as | 792 --
.../main/flex/org/apache/flex/core/UIBase.as| 1401 ++
.../flex/org/apache/flex/core/UIButtonBase.as | 792 ++
4 files changed, 2193 insertions(+), 2193 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/975d3f34/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
deleted file mode 100644
index 0e4a988..000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
+++ /dev/null
@@ -1,1401 +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 org.apache.flex.core
-{
-COMPILE::SWF
-{
-import flash.display.DisplayObject;
-import flash.display.Sprite;
-import flash.display.Stage;
-}
-
- import org.apache.flex.events.Event;
- import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.events.MouseEvent;
- import org.apache.flex.events.ValueChangeEvent;
- import org.apache.flex.events.utils.MouseEventConverter;
- COMPILE::SWF {
- import flash.display.InteractiveObject;
- }
-
- /**
-* Set a different class for click events so that
-* there aren't dependencies on the flash classes
-* on the JS side.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
-*/
- [Event(name="click", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for rollOver events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="rollOver", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for rollOut events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="rollOut", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for mouseDown events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="mouseDown", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for mouseUp events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="mouseUp", type="org.apache.flex.events.MouseEvent")]
-
[29/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move UIBase and UIButtonBase
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/975d3f34/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
new file mode 100644
index 000..0e4a988
--- /dev/null
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
@@ -0,0 +1,1401 @@
+
+//
+// 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 org.apache.flex.core
+{
+COMPILE::SWF
+{
+import flash.display.DisplayObject;
+import flash.display.Sprite;
+import flash.display.Stage;
+}
+
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.events.MouseEvent;
+ import org.apache.flex.events.ValueChangeEvent;
+ import org.apache.flex.events.utils.MouseEventConverter;
+ COMPILE::SWF {
+ import flash.display.InteractiveObject;
+ }
+
+ /**
+* Set a different class for click events so that
+* there aren't dependencies on the flash classes
+* on the JS side.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ [Event(name="click", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for rollOver events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="rollOver", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for rollOut events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="rollOut", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for mouseDown events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="mouseDown", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for mouseUp events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="mouseUp", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for mouseMove events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="mouseMove", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for mouseOut events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="mouseOut", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * Set a different class for mouseOver events so that
+ * there aren't dependencies on the flash classes
+ * on the JS side.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @produc
[23/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - copy former core classes into Basic
copy former core classes into Basic
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8f155cf8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8f155cf8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8f155cf8
Branch: refs/heads/refactor-sprite
Commit: 8f155cf80a983484689aa7e8c6143bfd7c374458
Parents: efd9dca
Author: Alex Harui
Authored: Thu Oct 27 16:28:10 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:52 2016 -0700
--
.../flex/org/apache/flex/core/Application.as| 637 +++
.../org/apache/flex/core/ApplicationBase.as | 110
.../flex/org/apache/flex/core/ContainerBase.as | 443 +
.../flex/core/ContainerBaseStrandChildren.as| 99 +++
.../org/apache/flex/core/FilledRectangle.as | 125
.../main/flex/org/apache/flex/core/ListBase.as | 126
.../apache/flex/core/ListBaseStrandChildren.as | 100 +++
.../src/main/flex/org/apache/flex/core/View.as | 34 +
.../main/flex/org/apache/flex/core/ViewBase.as | 97 +++
9 files changed, 1771 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8f155cf8/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
new file mode 100644
index 000..ff6e5a6
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
@@ -0,0 +1,637 @@
+
+//
+// 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 org.apache.flex.core
+{
+import org.apache.flex.events.Event;
+import org.apache.flex.events.IEventDispatcher;
+import org.apache.flex.events.MouseEvent;
+import org.apache.flex.events.utils.MouseEventConverter;
+import org.apache.flex.utils.MXMLDataInterpreter;
+ import org.apache.flex.utils.Timer;
+
+COMPILE::SWF {
+import flash.display.DisplayObject;
+import flash.display.Sprite;
+import flash.display.StageAlign;
+import flash.display.StageQuality;
+import flash.display.StageScaleMode;
+import flash.events.Event;
+import flash.system.ApplicationDomain;
+import flash.utils.getQualifiedClassName;
+}
+
+//--
+// Events
+//--
+
+/**
+ * Dispatched at startup. Attributes and sub-instances of
+ * the MXML document have been created and assigned.
+ * The component lifecycle is different
+ * than the Flex SDK. There is no creationComplete event.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="initialize", type="org.apache.flex.events.Event")]
+
+/**
+ * Dispatched at startup before the instances get created.
+ * Beads can call preventDefault and defer initialization.
+ * This event will be dispatched on every frame until no
+ * listeners call preventDefault(), then the initialize()
+ * method will be called.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="preinitialize", type="org.apache.flex.events.Event")]
+
+/**
+ * Dispatched at startup after the initial view has been
+ * put on the display list. This event is sent before
+ * applicationComplete is dispatched.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="viewChanged", type="org.apache.flex.events.E
[14/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
new file mode 100644
index 000..3150e7a
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
@@ -0,0 +1,350 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.display.DisplayObject;
+ import flash.display.Loader;
+ import flash.display.Shape;
+ import flash.display.SimpleButton;
+ import flash.display.Sprite;
+ import flash.events.Event;
+ import flash.net.URLRequest;
+ import flash.text.TextField;
+ import flash.text.TextFieldType;
+
+import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.CSSTextField;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ITextModel;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.html.TextButton;
+ import org.apache.flex.utils.CSSUtils;
+import org.apache.flex.utils.SolidBorderUtil;
+import org.apache.flex.utils.StringTrimmer;
+
+/**
+ * The CSSTextButtonView class is the default view for
+ * the org.apache.flex.html.TextButton class.
+ * It allows the look of the button to be expressed
+ * in CSS via the background-image style and displays
+ * a text label. This view does not support right-to-left
+ * text.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class CSSTextButtonView extends BeadViewBase implements IBeadView
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function CSSTextButtonView()
+ {
+ upSprite = new Sprite();
+ downSprite = new Sprite();
+ overSprite = new Sprite();
+ upTextField = new CSSTextField();
+ downTextField = new CSSTextField();
+ overTextField = new CSSTextField();
+ upTextField.selectable = false;
+ upTextField.type = TextFieldType.DYNAMIC;
+ downTextField.selectable = false;
+ downTextField.type = TextFieldType.DYNAMIC;
+ overTextField.selectable = false;
+ overTextField.type = TextFieldType.DYNAMIC;
+ upTextField.autoSize = "left";
+ downTextField.autoSize = "left";
+ overTextField.autoSize = "left";
+ upSprite.addChild(upTextField);
+ downSprite.addChild(downTextField);
+ overSprite.addChild(overTextField);
+ }
+
+ private var textModel:ITextModel;
+
+ private var shape:Shape;
+
+/**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+
[41/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - clean build after merge and fork
clean build after merge and fork Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fdc2a4c2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fdc2a4c2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fdc2a4c2 Branch: refs/heads/refactor-sprite Commit: fdc2a4c2386494f980d35ba7091a9d7f345ddcb1 Parents: ef2b90a Author: Alex Harui Authored: Mon Oct 31 21:42:38 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 08:12:11 2016 -0700 -- frameworks/build.xml| 2 +- .../Basic/src/main/flex/BasicClasses.as | 5 +- .../flex/org/apache/flex/core/Application.as| 46 ++-- .../org/apache/flex/core/FilledRectangle.as | 2 +- .../org/apache/flex/core/HTMLElementWrapper.as | 265 +++ .../main/flex/org/apache/flex/core/ImageBase.as | 84 ++ .../main/flex/org/apache/flex/core/UIBase.as| 51 +++- .../flex/org/apache/flex/core/UIButtonBase.as | 17 +- .../src/main/flex/org/apache/flex/html/Image.as | 8 +- .../org/apache/flex/html/beads/ComboBoxView.as | 3 +- .../org/apache/flex/html/beads/ContainerView.as | 11 +- .../apache/flex/html/beads/DropDownListView.as | 3 +- .../org/apache/flex/html/beads/ImageView.as | 181 + .../apache/flex/html/beads/SliderThumbView.as | 2 +- .../apache/flex/html/beads/WebBrowserView.as| 2 +- .../flex/html/beads/layouts/HorizontalLayout.as | 3 +- .../apache/flex/html/beads/models/ImageModel.as | 12 +- .../html/supportClasses/ContainerContentArea.as | 5 +- .../flex/html/supportClasses/DataGroup.as | 5 +- .../html/supportClasses/ScrollingViewport.as| 5 +- .../supportClasses/TextFieldItemRenderer.as | 16 ++ .../flex/org/apache/flex/svg/BinaryImage.as | 87 ++ .../org/apache/flex/svg/GraphicContainer.as | 4 +- .../flex/org/apache/flex/svg/GraphicShape.as| 6 +- .../src/main/flex/org/apache/flex/svg/Image.as | 133 ++ .../flex/org/apache/flex/svg/beads/ImageView.as | 87 ++ .../projects/Core/src/main/flex/CoreClasses.as | 7 + .../flex/org/apache/flex/core/IFlexJSElement.as | 4 +- .../flex/org/apache/flex/core/ImageViewBase.as | 23 +- .../org/apache/flex/core/WrappedMovieClip.as| 6 +- .../flex/org/apache/flex/core/WrappedShape.as | 6 +- .../org/apache/flex/core/WrappedSimpleButton.as | 6 +- .../flex/org/apache/flex/core/WrappedSprite.as | 6 +- .../org/apache/flex/core/WrappedTextField.as| 6 +- .../projects/HTML/src/main/flex/HTMLClasses.as | 5 +- .../flex/org/apache/flex/core/Application.as| 4 +- .../main/flex/org/apache/flex/core/UIBase.as| 3 +- 37 files changed, 847 insertions(+), 274 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fdc2a4c2/frameworks/build.xml -- diff --git a/frameworks/build.xml b/frameworks/build.xml index 65d06f7..ec3b6ff 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -81,7 +81,6 @@ - @@ -97,6 +96,7 @@ + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fdc2a4c2/frameworks/projects/Basic/src/main/flex/BasicClasses.as -- diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as index e63e9de..69fb902 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -54,7 +54,7 @@ internal class BasicClasses import org.apache.flex.html.beads.DropDownListView; DropDownListView; import org.apache.flex.html.beads.CloseButtonView; CloseButtonView; import org.apache.flex.html.beads.ImageAndTextButtonView; ImageAndTextButtonView; - import org.apache.flex.html.beads.ImageView; ImageView; + import org.apache.flex.html.beads.ImageView; org.apache.flex.html.beads.ImageView; } import org.apache.flex.html.beads.ImageButtonView; ImageButtonView; import org.apache.flex.html.beads.ListView; ListView; @@ -194,6 +194,9 @@ internal class BasicClasses import org.apache.flex.svg.Rect; Rect; import org.apache.flex.svg.Ellipse; Ellipse; import org.apache.flex.svg.Circle; Circle; + import org.apache.flex.svg.Image; Image; + import org.apache.flex.svg.BinaryImage; BinaryImage; + import org.apache.flex.svg.beads.ImageView; org.apache.flex.svg.beads.ImageView; import org.apache.flex.svg.Path; Path; import org.apache.flex.svg.Text; Text; imp
[31/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move more UIBase to HTML
r 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 org.apache.flex.svg
+{
+ import org.apache.flex.graphics.IText;
+ import org.apache.flex.graphics.SolidColor;
+
+COMPILE::SWF
+{
+import flash.text.TextFieldType;
+import org.apache.flex.core.CSSTextField;
+}
+COMPILE::JS
+{
+import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+* Draws a string of characters at a specific location using the stroke
+* value of color and alpha.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ * // TODO (aharui) ignore imports of external linkage interfaces?
+ * @flexjsignoreimport SVGLocatable
+*/
+ public class Text extends GraphicShape implements IText
+ {
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function Text()
+ {
+ super();
+
+COMPILE::SWF
+{
+_textField = new CSSTextField();
+$sprite.addChild(_textField);
+}
+ }
+
+
+COMPILE::SWF
+ private var _textField:CSSTextField;
+
+ COMPILE::JS
+ private var _text:WrappedHTMLElement;
+
+ /**
+* @copy org.apache.flex.core.ITextModel#textField
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+COMPILE::SWF
+ public function get textField() : CSSTextField
+ {
+ return _textField;
+ }
+
+ /**
+* Draws text at the given point.
+* @param value The string to draw.
+* @param xt The x position of the top-left corner of the
rectangle.
+* @param yt The y position of the top-left corner.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion Text
+ * @flexjsignorecoercion Node
+ * @flexjsignorecoercion SVGLocatable
+*/
+ public function drawText(value:String, xt:Number,
yt:Number):void
+ {
+COMPILE::SWF
+{
+textField.selectable = false;
+textField.type = TextFieldType.DYNAMIC;
+textField.mouseEnabled = false;
+textField.autoSize = "left";
+textField.text = value;
+
+var color:SolidColor = fill as SolidColor;
+if (color) {
+textField.textColor = color.color;
+textField.alpha = color.alpha;
+}
+
+textField.x = xt;
+textField.y = yt;
+}
+COMPILE::JS
+{
+var style:String = this.getStyleStr();
+ if (_text == null) {
+ _text =
document.createElementNS('http://www.w3.org/2000/svg', 'text') as
WrappedHTMLElement;
+ _text.flexjs_wrapper = this;
+ element.appendChild(_text);
+ }
+ else {
+ _text.removeChild(_text.childNodes[0]);
+ }
+_text.setAttribute(
[05/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
new file mode 100644
index 000..15b6587
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
@@ -0,0 +1,121 @@
+
+//
+// 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 org.apache.flex.html.supportClasses
+{
+import org.apache.flex.core.IContentView;
+import org.apache.flex.core.IItemRenderer;
+import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IRollOverModel;
+ import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.IStrand;
+import org.apache.flex.core.UIBase;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.ItemAddedEvent;
+ import org.apache.flex.events.ItemClickedEvent;
+ import org.apache.flex.events.ItemRemovedEvent;
+
+/**
+ * The DataGroup class is the IItemRendererParent used internally
+ * by org.apache.flex.html.List class.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class DataGroup extends ContainerContentArea implements
IItemRendererParent, IContentView
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function DataGroup()
+ {
+ super();
+ }
+
+ /**
+* @private
+*/
+ override public function addElement(c:Object,
dispatchEvent:Boolean = true):void
+ {
+ super.addElement(c, dispatchEvent);
+
+ var newEvent:ItemAddedEvent = new
ItemAddedEvent("itemAdded");
+ newEvent.item = c;
+
+ var strand:IEventDispatcher = parent as
IEventDispatcher;
+ strand.dispatchEvent(newEvent);
+ }
+
+ /**
+* @private
+*/
+ override public function removeElement(c:Object,
dispatchEvent:Boolean = true):void
+ {
+ super.removeElement(c, dispatchEvent);
+
+ var newEvent:ItemRemovedEvent = new
ItemRemovedEvent("itemRemoved");
+ newEvent.item = c;
+
+ var strand:IEventDispatcher = parent as
IEventDispatcher;
+ strand.dispatchEvent(newEvent);
+ }
+
+/**
+ * @copy
org.apache.flex.core.IItemRendererParent#getItemRendererForIndex()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function getItemRendererForIndex(index:int):IItemRenderer
+{
+ if (index < 0 || index >= numElements) return null;
+return getElementAt(index) as IItemRenderer;
+}
+
+ /**
+* Refreshes the itemRenderers. Useful after a size change by
the data group.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+*/
+
[18/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
try to copy HTML to Basic without losing history Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d8221452 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d8221452 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d8221452 Branch: refs/heads/refactor-sprite Commit: d822145269fcd59dca71b8310527edbf008072dc Parents: 6c2e37f Author: Alex Harui Authored: Wed Oct 26 13:16:24 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 07:46:51 2016 -0700 -- frameworks/projects/Basic/build.xml | 116 frameworks/projects/Basic/pom.xml | 128 .../Basic/src/main/config/compile-as-config.xml | 90 +++ .../projects/Basic/src/main/flex/HTMLClasses.as | 194 ++ .../apache/flex/core/IScrollingLayoutParent.as | 68 ++ .../org/apache/flex/events/ItemAddedEvent.as| 88 +++ .../org/apache/flex/events/ItemClickedEvent.as | 115 .../org/apache/flex/events/ItemRemovedEvent.as | 88 +++ .../org/apache/flex/events/ItemRendererEvent.as | 90 +++ .../src/main/flex/org/apache/flex/html/Alert.as | 287 .../main/flex/org/apache/flex/html/Button.as| 85 +++ .../main/flex/org/apache/flex/html/ButtonBar.as | 76 +++ .../flex/org/apache/flex/html/ButtonBase.as | 101 +++ .../main/flex/org/apache/flex/html/CheckBox.as | 187 ++ .../flex/org/apache/flex/html/CloseButton.as| 66 ++ .../main/flex/org/apache/flex/html/ComboBox.as | 277 .../main/flex/org/apache/flex/html/Container.as | 108 +++ .../flex/org/apache/flex/html/ControlBar.as | 99 +++ .../main/flex/org/apache/flex/html/DataGrid.as | 166 + .../org/apache/flex/html/DataGridButtonBar.as | 51 ++ .../flex/html/DataGridButtonBarTextButton.as| 55 ++ .../flex/org/apache/flex/html/DateChooser.as| 74 ++ .../main/flex/org/apache/flex/html/DateField.as | 95 +++ .../flex/org/apache/flex/html/DropDownList.as | 235 +++ .../src/main/flex/org/apache/flex/html/Form.as | 99 +++ .../flex/org/apache/flex/html/HContainer.as | 61 ++ .../src/main/flex/org/apache/flex/html/HRule.as | 63 ++ .../src/main/flex/org/apache/flex/html/Image.as | 93 +++ .../org/apache/flex/html/ImageAndTextButton.as | 128 .../flex/org/apache/flex/html/ImageButton.as| 89 +++ .../src/main/flex/org/apache/flex/html/Label.as | 194 ++ .../src/main/flex/org/apache/flex/html/List.as | 311 + .../flex/org/apache/flex/html/MXMLBeadView.as | 317 + .../flex/org/apache/flex/html/MultilineLabel.as | 76 +++ .../flex/org/apache/flex/html/NumericStepper.as | 202 ++ .../src/main/flex/org/apache/flex/html/Panel.as | 121 .../org/apache/flex/html/PanelWithControlBar.as | 121 .../flex/org/apache/flex/html/RadioButton.as| 350 ++ .../flex/org/apache/flex/html/RangeStepper.as | 69 ++ .../flex/org/apache/flex/html/SimpleAlert.as| 140 .../flex/org/apache/flex/html/SimpleList.as | 79 +++ .../main/flex/org/apache/flex/html/Slider.as| 233 +++ .../main/flex/org/apache/flex/html/Spacer.as| 64 ++ .../main/flex/org/apache/flex/html/Spinner.as | 166 + .../main/flex/org/apache/flex/html/TextArea.as | 126 .../flex/org/apache/flex/html/TextButton.as | 139 .../main/flex/org/apache/flex/html/TextInput.as | 187 ++ .../main/flex/org/apache/flex/html/TitleBar.as | 146 .../org/apache/flex/html/ToggleTextButton.as| 170 + .../main/flex/org/apache/flex/html/ToolTip.as | 60 ++ .../src/main/flex/org/apache/flex/html/Tree.as | 73 ++ .../flex/org/apache/flex/html/VContainer.as | 62 ++ .../src/main/flex/org/apache/flex/html/VRule.as | 68 ++ .../flex/org/apache/flex/html/WebBrowser.as | 145 .../accessories/NumericOnlyTextInputBead.as | 199 ++ .../flex/html/accessories/PasswordInputBead.as | 102 +++ .../flex/html/accessories/TextPromptBead.as | 148 .../apache/flex/html/accessories/ToolTipBead.as | 141 .../flex/html/beads/AlertMeasurementBead.as | 88 +++ .../org/apache/flex/html/beads/AlertView.as | 226 +++ .../flex/html/beads/BackgroundImageBead.as | 112 .../org/apache/flex/html/beads/ButtonBarView.as | 69 ++ .../org/apache/flex/html/beads/CSSButtonView.as | 167 + .../html/beads/CSSImageAndTextButtonView.as | 367 ++ .../apache/flex/html/beads/CSSTextButtonView.as | 350 ++ .../flex/html/beads/CSSTextToggleButtonView.as | 105 +++ .../org/apache/flex/html/beads/CheckBoxView.as | 296 .../apache/flex/html/beads/CloseButtonView.as | 101 +++ .../org/apache/flex/html/beads/ComboBoxView.as | 247 +++ .../org/apache/flex/html/beads/ContainerView.as | 553 +++ .../html/beads/ControlBarMeasurementBead.as | 116 .../flex/html/beads/DataGridColumnView.as | 101 +++ .../apache/flex/html/be
[22/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - also move SimpleApplication
also move SimpleApplication
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f241391d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f241391d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f241391d
Branch: refs/heads/refactor-sprite
Commit: f241391dfac6a12a4c72aad20dacc258e0b1438e
Parents: 8f155cf
Author: Alex Harui
Authored: Thu Oct 27 17:25:53 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:52 2016 -0700
--
.../org/apache/flex/core/SimpleApplication.as | 102 ---
.../org/apache/flex/core/SimpleApplication.as | 102 +++
2 files changed, 102 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f241391d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleApplication.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleApplication.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleApplication.as
deleted file mode 100644
index 770d0b2..000
---
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleApplication.as
+++ /dev/null
@@ -1,102 +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 org.apache.flex.core
-{
- COMPILE::SWF
- {
-import flash.display.DisplayObject;
-import flash.display.Sprite;
-import flash.display.StageAlign;
-import flash.display.StageQuality;
-import flash.display.StageScaleMode;
-import flash.events.Event;
-import flash.system.ApplicationDomain;
-import flash.utils.getQualifiedClassName;
- }
-
-import org.apache.flex.events.Event;
-import org.apache.flex.events.IEventDispatcher;
-import org.apache.flex.events.MouseEvent;
-import org.apache.flex.events.utils.MouseEventConverter;
-import org.apache.flex.utils.MXMLDataInterpreter;
-
- /**
-* A SWF application must be bootstrapped by a Flash Sprite.
-* The factory class is the default bootstrap.
-*
-* @langversion 3.0
-* @playerversion Flash 9
-* @playerversion AIR 1.1
-* @productversion Flex 3
-*/
- [Frame(factoryClass="org.apache.flex.core.ApplicationFactory")]
-
-/**
- * The SimpleApplication class can be used as the main class and entry
point
- * for low-level ActionScript-only FlexJS
- * applications. It is not indended for use in MXML applications or most
- * of the FlexJS components as they expect a certain application lifecycle
- * in the org.apache.flex.core.Application class.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-public class SimpleApplication extends ApplicationBase
-{
-/**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-public function SimpleApplication()
-{
-super();
- }
-
- COMPILE::SWF
-public function setRoot(r:WrappedMovieClip):void
-{
- element = r;
- start();
-}
-
-/**
- * The entry point. Override this and put all of your code in here.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function start():void
- {
- COMPILE::JS
- {
- this.element =
document.getElementsB
[24/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move implementation classes to HTML so variants can exist in other SWCs
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/efd9dcad/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
new file mode 100644
index 000..047b635
--- /dev/null
+++
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
@@ -0,0 +1,453 @@
+
+//
+// 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 org.apache.flex.core
+{
+ import org.apache.flex.core.IMXMLDocument;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.ValueChangeEvent;
+ import org.apache.flex.states.State;
+ import org.apache.flex.utils.MXMLDataInterpreter;
+
+/**
+ * Indicates that the state change has completed. All properties
+ * that need to change have been changed, and all transitinos
+ * that need to run have completed. However, any deferred work
+ * may not be completed, and the screen may not be updated until
+ * code stops executing.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="stateChangeComplete", type="org.apache.flex.events.Event")]
+
+/**
+ * Indicates that the initialization of the container is complete.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="initComplete", type="org.apache.flex.events.Event")]
+
+/**
+ * Indicates that the children of the container is have been added.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="childrenAdded", type="org.apache.flex.events.Event")]
+
+ [DefaultProperty("mxmlContent")]
+
+/**
+ * The ContainerBase class is the base class for most containers
+ * in FlexJS. It is usable as the root tag of MXML
+ * documents and UI controls and containers are added to it.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ContainerBase extends UIBase implements IMXMLDocument,
IStatesObject, IContainer, IContentViewHost
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ContainerBase()
+ {
+ super();
+
+ _strandChildren = new ContainerBaseStrandChildren(this);
+ }
+
+ private var _strandChildren:ContainerBaseStrandChildren;
+
+ /**
+* @private
+*/
+ public function get strandChildren():IParent
+ {
+ return _strandChildren;
+ }
+
+/**
+ * @copy org.apache.flex.core.IParent#getElementAt()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+override public function getElementAt(index:int):IChild
+{
+var contentView:IParent = view as IParent;
+if (contentView != null) {
+return contentView.getElementAt(index);
+} else {
+return super.getElementAt(index);
+}
+}
+
+/**
+ * @private
+ */
+override public func
[32/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move more UIBase to HTML
move more UIBase to HTML
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7af78c10
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7af78c10
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7af78c10
Branch: refs/heads/refactor-sprite
Commit: 7af78c10981886b14f7f067b5083b756beccad86
Parents: 6622b25
Author: Alex Harui
Authored: Fri Oct 28 23:17:40 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:55:20 2016 -0700
--
.../src/main/flex/org/apache/flex/svg/Circle.as | 119
.../flex/org/apache/flex/svg/CompoundGraphic.as | 584 ---
.../main/flex/org/apache/flex/svg/Ellipse.as| 171 --
.../flex/org/apache/flex/svg/GraphicShape.as| 233
.../src/main/flex/org/apache/flex/svg/Path.as | 133 -
.../src/main/flex/org/apache/flex/svg/Rect.as | 156 -
.../src/main/flex/org/apache/flex/svg/Text.as | 150 -
.../src/main/flex/org/apache/flex/svg/Circle.as | 119
.../flex/org/apache/flex/svg/CompoundGraphic.as | 584 +++
.../main/flex/org/apache/flex/svg/Ellipse.as| 171 ++
.../flex/org/apache/flex/svg/GraphicShape.as| 233
.../src/main/flex/org/apache/flex/svg/Path.as | 133 +
.../src/main/flex/org/apache/flex/svg/Rect.as | 156 +
.../src/main/flex/org/apache/flex/svg/Text.as | 150 +
14 files changed, 1546 insertions(+), 1546 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7af78c10/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as
deleted file mode 100644
index 07cc3d5..000
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Circle.as
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Licensed 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 org.apache.flex.svg
-{
- import org.apache.flex.graphics.ICircle;
-
-COMPILE::SWF
-{
-import flash.display.Graphics;
-import flash.geom.Point;
-import flash.geom.Rectangle;
-}
-COMPILE::JS
-{
-import org.apache.flex.core.WrappedHTMLElement;
-}
-
-public class Circle extends GraphicShape implements ICircle
-{
- /**
-* constructor.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.7
-*/
-public function Circle(cx:Number=0, cy:Number=0, r:Number=0)
-{
-x = cx;
-y = cy;
-radius = r;
-}
-
-private var _radius:Number;
-
-public function get radius():Number
-{
-return _radius;
-}
-
-public function set radius(value:Number):void
-{
-_radius = value;
-}
-
-COMPILE::JS
-private var _circle:WrappedHTMLElement;
-
-/**
- * Draw the circle.
- * @param cx The x location of the center of the circle
- * @param cy The y location of the center of the circle.
- * @param radius The radius of the circle.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- * @flexjsignorecoercion SVGCircleElement
- */
-public function drawCircle(cx:Number, cy:Number, radius):void
-{
-COMPILE::SWF
-{
-$sprite.graphics.clear();
-applyStroke();
-beginFill(new Rectangle(cx,cy,radius*2, radius*2),new
Point(cx-radius,cy-radius));
-$sprite.graphics.drawCircle(cx+radius,cy+radius,radius);
-endFill();
-}
-COMPILE::JS
-{
-var style:String = getStyleStr();
-
-if (_circle == null) {
-_circle =
[33/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - fix up after moving UIButtonBase
fix up after moving UIButtonBase
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1890b715
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1890b715
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1890b715
Branch: refs/heads/refactor-sprite
Commit: 1890b715660130240ef613890e92c26cbe19177d
Parents: 0d06e65
Author: Alex Harui
Authored: Fri Oct 28 23:21:25 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:59:02 2016 -0700
--
frameworks/projects/Core/src/main/flex/CoreClasses.as | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1890b715/frameworks/projects/Core/src/main/flex/CoreClasses.as
--
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as
b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index 325b36a..6be1c0b 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -98,10 +98,6 @@ internal class CoreClasses
}
import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
import org.apache.flex.core.DataBindingBase; DataBindingBase;
- COMPILE::SWF
- {
- import org.apache.flex.core.UIButtonBase; UIButtonBase;
- }
import org.apache.flex.events.CustomEvent; CustomEvent;
import org.apache.flex.events.Event; Event;
import org.apache.flex.events.ProgressEvent; ProgressEvent;
[17/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
new file mode 100644
index 000..fa91fec
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
@@ -0,0 +1,277 @@
+
+//
+// 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 org.apache.flex.html
+{
+ import org.apache.flex.core.IComboBoxModel;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.events.Event;
+
+COMPILE::JS
+{
+import goog.events;
+import org.apache.flex.core.WrappedHTMLElement;
+}
+
+ [Event(name="change", type="org.apache.flex.events.Event")]
+
+ /**
+* The ComboBox class is a component that displays an input field and
+* pop-up List with selections. Selecting an item from the pop-up List
+* places that item into the input field of the ComboBox. The ComboBox
+* uses the following bead types:
+*
+* org.apache.flex.core.IBeadModel: the data model, which includes the
dataProvider, selectedItem, and
+* so forth.
+* org.apache.flex.core.IBeadView: the bead that constructs the
visual parts of the component.
+* org.apache.flex.core.IBeadController: the bead that handles input
and output.
+* org.apache.flex.core.IPopUp: the bead responsible for displaying
the selection list.
+* org.apache.flex.core.IDataProviderItemRendererMapper: the bead
responsible for creating the itemRenders.
+* org.apache.flex.core.IItemRenderer: the class or factory used to
display an item in the component.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public class ComboBox extends UIBase
+ {
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function ComboBox()
+ {
+ super();
+ }
+
+ /**
+* The data for display by the ComboBox.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function get dataProvider():Object
+ {
+ return IComboBoxModel(model).dataProvider;
+ }
+ public function set dataProvider(value:Object):void
+ {
+ IComboBoxModel(model).dataProvider = value;
+ }
+
+ /**
+* The index of the currently selected item. Changing this
item changes
+* the selectedItem value.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function get selectedIndex():int
+ {
+ return IComboBoxModel(model).selectedIndex;
+ }
+ public function set selectedIndex(value:int):void
+ {
+ IComboBoxModel(model).selectedIndex = value;
+ }
+
+ /**
+* The item that is currently selected. Changing this item
changes
+* the selectedIndex.
+
[38/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move a few more Graphics classes to HTML
move a few more Graphics classes to HTML
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e020ba83
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e020ba83
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e020ba83
Branch: refs/heads/refactor-sprite
Commit: e020ba837067597d9ff97f828214c359455af13b
Parents: c60efc6
Author: Alex Harui
Authored: Mon Oct 31 09:23:03 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 08:02:15 2016 -0700
--
.../flex/org/apache/flex/svg/BinaryImage.as | 87
.../src/main/flex/org/apache/flex/svg/Image.as | 133 ---
.../flex/org/apache/flex/svg/beads/ImageView.as | 87
.../flex/org/apache/flex/svg/BinaryImage.as | 87
.../src/main/flex/org/apache/flex/svg/Image.as | 133 +++
.../flex/org/apache/flex/svg/beads/ImageView.as | 87
6 files changed, 307 insertions(+), 307 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e020ba83/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/BinaryImage.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/BinaryImage.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/BinaryImage.as
deleted file mode 100644
index c03793c..000
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/BinaryImage.as
+++ /dev/null
@@ -1,87 +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 org.apache.flex.svg
-{
- import org.apache.flex.core.IBinaryImage;
- import org.apache.flex.core.IBinaryImageModel;
- import org.apache.flex.core.ValuesManager;
- import org.apache.flex.core.IBinaryImageLoader;
- import org.apache.flex.utils.BinaryData;
-
- /**
-* The Image class is a component that displays a bitmap. The Image
uses
-* the following beads:
-*
-* org.apache.flex.core.IBeadModel: the data model for the Image,
including the url/binary property.
-* org.apache.flex.core.IBeadView: constructs the visual elements of
the component.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
-*/
- public class BinaryImage extends Image implements IBinaryImage
- {
- /**
-* constructor.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
-*/
- public function BinaryImage()
- {
- super();
- }
-
- override public function addedToParent():void
- {
- var c:Class = ValuesManager.valuesImpl.getValue(this,
"iBinaryImageLoader") as Class;
- if (c)
- {
- if (c)
- {
- var loader:IBinaryImageLoader = (new
c()) as IBinaryImageLoader;
- addBead(loader);
- }
- }
- super.addedToParent();
- }
-
- /**
-* The binary bitmap data.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.IImageModel
-*/
- public function get bi
[42/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - change TextButton to inherit from Button instead of ButtonBase so it picks up default styles on Button
change TextButton to inherit from Button instead of ButtonBase so it picks up
default styles on Button
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a5cf2777
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a5cf2777
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a5cf2777
Branch: refs/heads/refactor-sprite
Commit: a5cf27772f5bf71b92c8042f9c6ac1c4a03787bb
Parents: fdc2a4c
Author: Alex Harui
Authored: Mon Oct 31 23:36:11 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 08:12:11 2016 -0700
--
.../projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5cf2777/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
index a08c9b3..b2997c2 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextButton.as
@@ -35,7 +35,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class TextButton extends ButtonBase
+ public class TextButton extends Button
{
/**
* Constructor.
[19/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - fix BasicClasses
fix BasicClasses
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6683f9b9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6683f9b9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6683f9b9
Branch: refs/heads/refactor-sprite
Commit: 6683f9b960ebf9603678fe83c76296be15468ea4
Parents: d3b40de
Author: Alex Harui
Authored: Wed Oct 26 14:19:53 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:51 2016 -0700
--
frameworks/projects/Basic/src/main/flex/BasicClasses.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6683f9b9/frameworks/projects/Basic/src/main/flex/BasicClasses.as
--
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index 1271417..527d182 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -25,7 +25,7 @@ package
* beyond those that are found by dependecy analysis starting
* from the classes specified in manifest.xml.
*/
-internal class HTMLClasses
+internal class BasicClasses
{
import org.apache.flex.html.ToolTip; ToolTip;
[25/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move implementation classes to HTML so variants can exist in other SWCs
move implementation classes to HTML so variants can exist in other SWCs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/efd9dcad
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/efd9dcad
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/efd9dcad
Branch: refs/heads/refactor-sprite
Commit: efd9dcad4ca87c3050f4ee84810f08577f0e4118
Parents: 21c9340
Author: Alex Harui
Authored: Thu Oct 27 15:48:16 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:52 2016 -0700
--
.../flex/org/apache/flex/core/Application.as| 560 ---
.../org/apache/flex/core/ApplicationBase.as | 109
.../flex/org/apache/flex/core/ContainerBase.as | 453 ---
.../flex/core/ContainerBaseStrandChildren.as| 99
.../org/apache/flex/core/FilledRectangle.as | 125 -
.../main/flex/org/apache/flex/core/ListBase.as | 126 -
.../apache/flex/core/ListBaseStrandChildren.as | 100
.../src/main/flex/org/apache/flex/core/View.as | 34 --
.../main/flex/org/apache/flex/core/ViewBase.as | 97
.../flex/org/apache/flex/core/Application.as| 560 +++
.../org/apache/flex/core/ApplicationBase.as | 109
.../flex/org/apache/flex/core/ContainerBase.as | 453 +++
.../flex/core/ContainerBaseStrandChildren.as| 99
.../org/apache/flex/core/FilledRectangle.as | 125 +
.../main/flex/org/apache/flex/core/ListBase.as | 126 +
.../apache/flex/core/ListBaseStrandChildren.as | 100
.../src/main/flex/org/apache/flex/core/View.as | 34 ++
.../main/flex/org/apache/flex/core/ViewBase.as | 97
18 files changed, 1703 insertions(+), 1703 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/efd9dcad/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
deleted file mode 100644
index 0a9c69a..000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
+++ /dev/null
@@ -1,560 +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 org.apache.flex.core
-{
-import org.apache.flex.events.Event;
-import org.apache.flex.events.IEventDispatcher;
-import org.apache.flex.events.MouseEvent;
-import org.apache.flex.events.utils.MouseEventConverter;
-import org.apache.flex.utils.MXMLDataInterpreter;
-import org.apache.flex.utils.Timer;
-
-COMPILE::SWF {
-import flash.display.DisplayObject;
-import flash.display.Graphics;
-import flash.display.Sprite;
- import flash.events.Event;
-import flash.system.ApplicationDomain;
-import flash.utils.getQualifiedClassName;
-}
-
-//--
-// Events
-//--
-
-/**
- * Dispatched at startup. Attributes and sub-instances of
- * the MXML document have been created and assigned.
- * The component lifecycle is different
- * than the Flex SDK. There is no creationComplete event.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="initialize", type="org.apache.flex.events.Event")]
-
-/**
- * Dispatched at startup before the instances get created.
- * Beads can call preventDefault and defer initialization.
- * This event will be dispatched on every frame until no
- * listeners call preventDefault(), then the initialize()
- * method will be called.
- *
- * @langversion 3.0
- * @playerversion Flash
[40/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - clean build after moving UIBase out of Core
clean build after moving UIBase out of Core Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/069904ce Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/069904ce Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/069904ce Branch: refs/heads/refactor-sprite Commit: 069904ce6f7f7605f8e381df0d791987a8fd60af Parents: 7a65d3d Author: Alex Harui Authored: Sat Oct 29 22:29:12 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 08:02:15 2016 -0700 -- .../src/main/config/compile-js-config.xml | 1 + .../src/main/config/compile-js-config.xml | 1 + .../Basic/src/main/flex/BasicClasses.as | 8 +++ .../flex/org/apache/flex/core/Application.as| 4 +++- .../org/apache/flex/core/SimpleApplication.as | 4 +++- .../main/flex/org/apache/flex/core/UIBase.as| 4 +++- .../projects/Core/src/main/flex/CoreClasses.as | 12 +++ .../src/main/config/compile-as-config.xml | 1 + .../src/main/config/compile-as-config.xml | 1 + .../Graphics/src/main/flex/GraphicsClasses.as | 22 ++-- .../projects/HTML/src/main/flex/HTMLClasses.as | 9 .../flex/org/apache/flex/core/Application.as| 4 +++- .../org/apache/flex/core/SimpleApplication.as | 4 +++- .../main/flex/org/apache/flex/core/UIBase.as| 4 ++-- 14 files changed, 61 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml -- diff --git a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml index 10ea092..81a4671 100644 --- a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml @@ -54,6 +54,7 @@ if these swcs are on the external-library-path then their requires will not be listed --> ../../../../../libs/CoreJS.swc +../../../../../libs/HTMLJS.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml -- diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml index 2a1a3e4..93c4572 100644 --- a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml @@ -58,6 +58,7 @@ if these swcs are on the external-library-path then their requires will not be listed --> ../../../../../libs/CoreJS.swc +../../../../../libs/HTMLJS.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/BasicClasses.as -- diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as index 2c1665b..e63e9de 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -189,6 +189,14 @@ internal class BasicClasses import org.apache.flex.core.SimpleApplication; SimpleApplication; import org.apache.flex.svg.GraphicContainer; GraphicContainer; import org.apache.flex.svg.DOMWrapper; DOMWrapper; + + import org.apache.flex.svg.GraphicShape; GraphicShape; + import org.apache.flex.svg.Rect; Rect; + import org.apache.flex.svg.Ellipse; Ellipse; + import org.apache.flex.svg.Circle; Circle; + import org.apache.flex.svg.Path; Path; + import org.apache.flex.svg.Text; Text; + import org.apache.flex.svg.CompoundGraphic; CompoundGraphic; COMPILE::SWF http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as index ff6e5a6..85609cb 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
[07/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
new file mode 100644
index 000..77af305
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
@@ -0,0 +1,459 @@
+
+//
+// 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 org.apache.flex.html.beads.layouts
+{
+ import org.apache.flex.core.IBeadLayout;
+ import org.apache.flex.core.IDocument;
+ import org.apache.flex.core.ILayoutChild;
+ import org.apache.flex.core.ILayoutHost;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.geom.Rectangle;
+import org.apache.flex.utils.CSSContainerUtils;
+
+/**
+ * The OneFlexibleChildVerticalLayout class is a simple layout
+ * bead. It takes the set of children and lays them out
+ * vertically in one column, separating them according to
+ * CSS layout rules for margin and padding styles. But it
+ * will size the one child to take up as much or little
+ * room as possible.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class OneFlexibleChildVerticalLayout implements IBeadLayout,
IDocument
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function OneFlexibleChildVerticalLayout()
+ {
+ }
+
+
+/**
+ * The id of the flexible child
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public var flexibleChild:String;
+
+private var actualChild:ILayoutChild;
+
+// the strand/host container is also an ILayoutChild because
+// can have its size dictated by the host's parent which is
+// important to know for layout optimization
+private var host:ILayoutChild;
+
+/**
+ * @private
+ * The document.
+ */
+private var document:Object;
+
+/**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+host = value as ILayoutChild;
+ }
+
+private var _maxWidth:Number;
+
+/**
+ * @copy org.apache.flex.core.IBead#maxWidth
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function get maxWidth():Number
+{
+return _maxWidth;
+}
+
+/**
+ * @private
+ */
+public function set maxWidth(value:Number):void
+{
+_maxWidth = value;
+}
+
+private var _maxHeight:Numbe
[26/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move ContainerBase Graphics classes
move ContainerBase Graphics classes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6fee345f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6fee345f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6fee345f
Branch: refs/heads/refactor-sprite
Commit: 6fee345f119756d032d3ce36911e13f8f80cb368
Parents: f241391
Author: Alex Harui
Authored: Thu Oct 27 22:13:22 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:53 2016 -0700
--
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 -
.../org/apache/flex/svg/GraphicContainer.as | 209 ---
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 +
.../org/apache/flex/svg/GraphicContainer.as | 209 +++
4 files changed, 265 insertions(+), 265 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6fee345f/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
deleted file mode 100644
index 7bb20ff..000
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed 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 org.apache.flex.svg
-{
- COMPILE::JS
-{
-import org.apache.flex.core.WrappedHTMLElement;
-}
-
- import org.apache.flex.core.ContainerBase;
-
- public class DOMWrapper extends ContainerBase
- {
-
- /**
-* Constructor
-*
-* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
-*/
-public function DOMWrapper()
-{
- super();
-}
-
- /**
-* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
-*/
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- element =
document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject') as
WrappedHTMLElement;
- element.flexjs_wrapper = this;
- element.style.left = 0;
- element.style.top = 0;
- //element.offsetParent = null;
- positioner = element;
- positioner.style.position = 'relative';
-
- return element;
- }
-
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6fee345f/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
deleted file mode 100644
index 709d6ea..000
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * Licensed 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 org.apache.flex.svg
-{
-import org.apache.flex.core.ContainerBase;
-import org.apache.flex.core.IChild;
-import org.apache.flex.core.IFlexJSElement;
-import org.apache.flex.core.ITransformHost;
-
- COMPILE::JS
- {
- import org.apache.flex.core.IContainer;
- import org.apache.flex.core.UIBase;
- }
-
- [DefaultProperty("mxmlConte
[34/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - replace UIBase dependency
replace UIBase dependency
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0d06e658
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0d06e658
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0d06e658
Branch: refs/heads/refactor-sprite
Commit: 0d06e658dc87a1b6fd84e47565057c8e42f6a694
Parents: 7af78c1
Author: Alex Harui
Authored: Fri Oct 28 23:20:14 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:59:02 2016 -0700
--
.../main/flex/org/apache/flex/core/BrowserResizeListener.as | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0d06e658/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
index a8fb5c0..441bfee 100644
---
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
+++
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
@@ -109,11 +109,14 @@ COMPILE::SWF
}
}
+ /**
+* @flexjsignorecoercion org.apache.flex.core.ILayoutChild
+*/
private function resizeHandler(event:Event):void
{
COMPILE::SWF
{
-var initialView:UIBase = app.initialView as UIBase;
+var initialView:ILayoutChild = app.initialView as ILayoutChild;
var constrainedWidth:Number =
Math.max(isNaN(minWidth) ? 0 : minWidth, app.$displayObject.stage.stageWidth);
var constrainedHeight:Number =
Math.max(isNaN(minHeight) ? 0 : minHeight,
app.$displayObject.stage.stageHeight);
if (!isNaN(initialView.percentWidth) &&
!isNaN(initialView.percentHeight))
@@ -125,7 +128,7 @@ COMPILE::SWF
}
COMPILE::JS
{
-var initialView:UIBase = app.initialView as UIBase;
+var initialView:ILayoutChild = app.initialView as ILayoutChild;
var element:HTMLElement = app.element;
if (!isNaN(initialView.percentWidth) ||
!isNaN(initialView.percentHeight)) {
element.style.height = window.innerHeight + 'px';
[11/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
new file mode 100644
index 000..245c3d3
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/RadioButtonView.as
@@ -0,0 +1,281 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.display.Shape;
+ import flash.display.SimpleButton;
+ import flash.display.Sprite;
+ import flash.text.TextFieldAutoSize;
+ import flash.text.TextFieldType;
+
+import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.CSSTextField;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IValueToggleButtonModel;
+ import org.apache.flex.events.Event;
+
+ /**
+* The RadioButtonView class creates the visual elements of the
org.apache.flex.html.RadioButton
+* component.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public class RadioButtonView extends BeadViewBase implements IBeadView
+ {
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function RadioButtonView()
+ {
+ sprites = [ upSprite = new Sprite(),
+ downSprite = new Sprite(),
+ overSprite = new Sprite(),
+ upAndSelectedSprite = new
Sprite(),
+ downAndSelectedSprite = new
Sprite(),
+ overAndSelectedSprite = new
Sprite() ];
+
+ for each( var s:Sprite in sprites )
+ {
+ var tf:CSSTextField = new CSSTextField();
+ tf.type = TextFieldType.DYNAMIC;
+ tf.autoSize = TextFieldAutoSize.LEFT;
+ tf.name = "textField";
+ var icon:Shape = new Shape();
+ icon.name = "icon";
+ s.addChild(icon);
+ s.addChild(tf);
+ }
+ }
+
+ private var upSprite:Sprite;
+ private var downSprite:Sprite;
+ private var overSprite:Sprite;
+ private var upAndSelectedSprite:Sprite;
+ private var downAndSelectedSprite:Sprite;
+ private var overAndSelectedSprite:Sprite;
+
+ private var sprites:Array;
+
+ private var _toggleButtonModel:IValueToggleButtonModel;
+
+ /**
+* The model used for the RadioButton.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function get toggleButtonModel() :
IValueToggleButtonModel
+ {
+ return _toggleButtonModel;
+ }
+
+ /**
+* @copy org.apache.flex.core.IBead#stra
[13/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
new file mode 100644
index 000..42b159c
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
@@ -0,0 +1,194 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import org.apache.flex.collections.IArrayList;
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IDataProviderItemRendererMapper;
+ import org.apache.flex.core.IItemRendererClassFactory;
+ import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IListPresentationModel;
+ import org.apache.flex.core.ISelectableItemRenderer;
+ import org.apache.flex.core.ISelectionModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.SimpleCSSStyles;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.events.ItemRendererEvent;
+ import org.apache.flex.html.List;
+
+
[Event(name="itemRendererCreated",type="org.apache.flex.events.ItemRendererEvent")]
+
+/**
+ * The DataItemRendererFactoryForArrayList class uses an ArrayList
+* and creates an item renderer for every
+ * item in the collection. Other implementations of
+ * IDataProviderItemRendererMapper map different data
+ * structures or manage a virtual set of renderers.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class DataItemRendererFactoryForArrayList extends
EventDispatcher implements IBead, IDataProviderItemRendererMapper
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function
DataItemRendererFactoryForArrayList(target:Object=null)
+ {
+ super(target);
+ }
+
+ protected var selectionModel:ISelectionModel;
+
+ protected var labelField:String;
+
+ private var _strand:IStrand;
+
+/**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+
IEventDispatcher(_strand).addEventListener("beadsAdded", finishSetup);
+
IEventDispatcher(_strand).addEventListener("initComplete", finishSetup);
+ }
+
+ private function finishSetup(event:Event):void
+ {
+ selectionModel = _strand.getBeadByType(ISelectionModel)
as ISelectionModel;
+ var listView:IListView =
_strand.getBeadByType(IListView) as IListView;
+ dataGroup = listView.dataGroup;
+ selectionModel.addEventListener("dataProviderChanged",
dataProviderChangeHandler);
+
[20/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - rename HTMLClasses to BasicClasses
rename HTMLClasses to BasicClasses
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d3b40de0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d3b40de0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d3b40de0
Branch: refs/heads/refactor-sprite
Commit: d3b40de051fc69794596ca19dc3d55e3afcc4ab2
Parents: 7a2115d
Author: Alex Harui
Authored: Wed Oct 26 14:14:14 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:51 2016 -0700
--
.../Basic/src/main/flex/BasicClasses.as | 194 +++
.../projects/Basic/src/main/flex/HTMLClasses.as | 194 ---
2 files changed, 194 insertions(+), 194 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d3b40de0/frameworks/projects/Basic/src/main/flex/BasicClasses.as
--
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
new file mode 100644
index 000..1271417
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -0,0 +1,194 @@
+
+//
+// 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
+{
+
+/**
+ * @private
+ * This class is used to link additional classes into rpc.swc
+ * beyond those that are found by dependecy analysis starting
+ * from the classes specified in manifest.xml.
+ */
+internal class HTMLClasses
+{
+
+import org.apache.flex.html.ToolTip; ToolTip;
+ import org.apache.flex.html.accessories.NumericOnlyTextInputBead;
NumericOnlyTextInputBead;
+ import org.apache.flex.html.accessories.PasswordInputBead;
PasswordInputBead;
+ import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead;
+import org.apache.flex.html.beads.AlertView; AlertView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.BackgroundImageBead;
BackgroundImageBead;
+ }
+ import org.apache.flex.html.beads.ButtonBarView; ButtonBarView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
+ import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
+ }
+import org.apache.flex.html.beads.ContainerView; ContainerView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.ControlBarMeasurementBead;
ControlBarMeasurementBead;
+ import org.apache.flex.html.beads.CSSButtonView; CSSButtonView;
+ import org.apache.flex.html.beads.CSSImageAndTextButtonView;
CSSImageAndTextButtonView;
+ import org.apache.flex.html.beads.CSSTextButtonView;
CSSTextButtonView;
+ import org.apache.flex.html.beads.CSSTextToggleButtonView;
CSSTextToggleButtonView;
+ import org.apache.flex.html.beads.DropDownListView;
DropDownListView;
+ import org.apache.flex.html.beads.CloseButtonView;
CloseButtonView;
+ import org.apache.flex.html.beads.ImageAndTextButtonView;
ImageAndTextButtonView;
+ import org.apache.flex.html.beads.ImageView; ImageView;
+ }
+ import org.apache.flex.html.beads.ImageButtonView; ImageButtonView;
+ import org.apache.flex.html.beads.ListView; ListView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.NumericStepperView;
NumericStepperView;
+ }
+import org.apache.flex.html.beads.PanelView; PanelView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.PanelWithControlBarView;
PanelWithControlBarView;
+ import org.apache.flex.html.beads.RadioButtonView;
RadioButtonView;
+ import org.apache.flex.html.beads.VScrollBarView;
VScrollBarView;
+ import org.apache.flex.html.beads.HScrollBarView;
HScrollBarView;
+ import org.ap
[39/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - move ImageBase to HTML
move ImageBase to HTML
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ef2b90a1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ef2b90a1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ef2b90a1
Branch: refs/heads/refactor-sprite
Commit: ef2b90a1022989dc923fb610461f4714120f555d
Parents: e020ba8
Author: Alex Harui
Authored: Mon Oct 31 09:32:05 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 08:02:15 2016 -0700
--
.../main/flex/org/apache/flex/core/ImageBase.as | 84
.../main/flex/org/apache/flex/core/ImageBase.as | 84
2 files changed, 84 insertions(+), 84 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ef2b90a1/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ImageBase.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ImageBase.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ImageBase.as
deleted file mode 100644
index 71454a7..000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ImageBase.as
+++ /dev/null
@@ -1,84 +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 org.apache.flex.core
-{
- import org.apache.flex.core.IImage;
- import org.apache.flex.core.IImageModel;
- import org.apache.flex.core.UIBase;
-
- /**
-* The ImageBase class serves as a base class for components that
displays a bitmap. The Image uses
-* the following beads:
-*
-* org.apache.flex.core.IBeadModel: the data model for the Image,
including the url/binary property.
-* org.apache.flex.core.IBeadView: constructs the visual elements of
the component.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
-*/
- public class ImageBase extends UIBase implements IImage
- {
- /**
-* constructor.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
-*/
- public function ImageBase()
- {
- super();
- }
-
- /**
-* The location of the bitmap, usually a URL.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.IImageModel
-*/
- public function get url():String
- {
- return (model as IImageModel).url;
- }
- public function set url(value:String):void
- {
- (model as IImageModel).url = value;
- }
-
- COMPILE::JS
- public function get imageElement():Element
- {
- return null;
- // override this
- }
-
- COMPILE::JS
- public function applyImageData(binaryDataAsString:String):void
- {
- // override this
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ef2b90a1/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as
--
diff --git
a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as
b/frameworks
[37/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - add
add
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c60efc66
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c60efc66
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c60efc66
Branch: refs/heads/refactor-sprite
Commit: c60efc66212a3312e483eb12d1b23db044757569
Parents: 1acc00e
Author: Alex Harui
Authored: Sun Oct 30 21:06:27 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 08:02:15 2016 -0700
--
.../main/flex/org/apache/flex/core/IInitialViewApplication.as | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c60efc66/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
index 2eb3e64..47f44b8 100755
---
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
+++
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as
@@ -20,6 +20,7 @@ package org.apache.flex.core
{
COMPILE::SWF
{
+ import flash.display.DisplayObject;
import flash.display.Stage;
}
import org.apache.flex.events.IEventDispatcher;
@@ -54,6 +55,12 @@ COMPILE::SWF
/**
* @private
*/
+COMPILE::SWF
+ function get $displayObject():DisplayObject;
+
+/**
+ * @private
+ */
COMPILE::JS
function get element():HTMLElement;
[08/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
new file mode 100644
index 000..b566354
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
@@ -0,0 +1,445 @@
+
+//
+// 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 org.apache.flex.html.beads.layouts
+{
+
+ import org.apache.flex.core.IBeadLayout;
+ import org.apache.flex.core.ILayoutChild;
+ import org.apache.flex.core.ILayoutHost;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+import org.apache.flex.utils.CSSUtils;
+ //import org.apache.flex.utils.dbg.DOMPathUtil;
+
+/**
+ * The BasicLayout class is a simple layout
+ * bead. It takes the set of children and lays them out
+ * as specified by CSS properties like left, right, top
+ * and bottom.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class BasicLayout implements IBeadLayout
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function BasicLayout()
+ {
+ }
+
+// the strand/host container is also an ILayoutChild because
+// can have its size dictated by the host's parent which is
+// important to know for layout optimization
+private var host:ILayoutChild;
+
+/**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+host = value as ILayoutChild;
+ }
+
+/**
+ * @copy org.apache.flex.core.IBeadLayout#layout
+* @flexjsignorecoercion org.apache.flex.core.ILayoutHost
+* @flexjsignorecoercion org.apache.flex.core.UIBase
+ */
+ public function layout():Boolean
+ {
+COMPILE::SWF
+{
+//trace(DOMPathUtil.getPath(host), event ? event.type : "fixed
size");
+var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost)
as ILayoutHost;
+var contentView:IParentIUIBase = layoutParent ?
layoutParent.contentView : IParentIUIBase(host);
+
+var gotMargin:Boolean;
+var marginLeft:Object;
+var marginRight:Object;
+var marginTop:Object;
+var marginBottom:Object;
+var margin:Object;
+var ml:Number;
+var mr:Number;
+var mt:Number;
+var mb:Number;
+var hostWidthSizedToContent:Boolean =
host.isWidthSizedToContent();
+var hostHeightSizedToContent:Boolean =
host.isHeightSizedToContent();
+var w:Number = hostWidthSizedToContent ? 0 : contentView.width;
+var h:Number = hostHeightSizedToContent ? 0 :
contentView.height;
+var n:int
[09/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
new file mode 100644
index 000..c0bed5b
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/DateChooserMouseController.as
@@ -0,0 +1,127 @@
+
+//
+// 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 org.apache.flex.html.beads.controllers
+{
+ import org.apache.flex.html.beads.DateChooserView;
+ import org.apache.flex.html.beads.models.DateChooserModel;
+ import org.apache.flex.html.supportClasses.DateChooserButton;
+
+ import org.apache.flex.core.IBeadController;
+ import org.apache.flex.core.IBeadModel;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.MouseEvent;
+ import org.apache.flex.events.IEventDispatcher;
+
+ /**
+* The DateChooserMouseController class is responsible for listening to
+* mouse event related to the DateChooser. Events such as selecting a
date
+* or changing the calendar.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public class DateChooserMouseController implements IBeadController
+ {
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function DateChooserMouseController()
+ {
+ }
+
+ private var _strand:IStrand;
+
+ /**
+* @copy org.apache.flex.core.IBead#strand
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+
+ var view:DateChooserView =
value.getBeadByType(IBeadView) as DateChooserView;
+ view.prevMonthButton.addEventListener("click",
prevMonthClickHandler);
+ view.nextMonthButton.addEventListener("click",
nextMonthClickHandler);
+
+ var dayButtons:Array = view.dayButtons;
+ for(var i:int=0; i < dayButtons.length; i++) {
+
IEventDispatcher(dayButtons[i]).addEventListener("click",
dayButtonClickHandler);
+ }
+ }
+
+ /**
+* @private
+*/
+ private function prevMonthClickHandler(event:Event):void
+ {
+ var model:DateChooserModel =
_strand.getBeadByType(IBeadModel) as DateChooserModel;
+ var month:Number = model.displayedMonth - 1;
+ var year:Number = model.displayedYear;
+ if (month < 0) {
+ month = 11;
+ year--;
+ }
+ model.displayedMonth = month;
+ model.displayedYear = year;
+ }
+
+ /**
+* @priv
[10/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
new file mode 100644
index 000..61b6edb
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
@@ -0,0 +1,54 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.text.TextFieldType;
+
+/**
+ * The TextFieldView class is the default view for
+ * the org.apache.flex.html.Label class.
+ * It displays text using a TextField, so there is no
+ * right-to-left text support in this view.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class TextFieldView extends TextFieldViewBase
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function TextFieldView()
+ {
+ super();
+
+ textField.selectable = false;
+ textField.type = TextFieldType.DYNAMIC;
+ textField.mouseEnabled = false;
+ textField.autoSize = "left";
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
new file mode 100644
index 000..3ab2874
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -0,0 +1,404 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.display.DisplayObject;
+ import flash.display.DisplayObjectContainer;
+ import flash.text.StyleSheet;
+
+ import org.apache.flex.core.CSSTextField;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.ILayoutChild;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ITextModel;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+
+/**
+ * The TextFieldViewBase class is the base
[35/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - copy files moved from Graphics to HTML
copy files moved from Graphics to HTML
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7a65d3d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7a65d3d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7a65d3d7
Branch: refs/heads/refactor-sprite
Commit: 7a65d3d737ba648459d8a0c680045316e99e3e2b
Parents: 1890b71
Author: Alex Harui
Authored: Fri Oct 28 23:26:57 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:59:03 2016 -0700
--
.../src/main/flex/org/apache/flex/svg/Circle.as | 118
.../flex/org/apache/flex/svg/CompoundGraphic.as | 585 +++
.../main/flex/org/apache/flex/svg/Ellipse.as| 152 +
.../flex/org/apache/flex/svg/GraphicShape.as| 225 +++
.../src/main/flex/org/apache/flex/svg/Path.as | 133 +
.../src/main/flex/org/apache/flex/svg/Rect.as | 156 +
.../src/main/flex/org/apache/flex/svg/Text.as | 150 +
7 files changed, 1519 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a65d3d7/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
new file mode 100644
index 000..586bbfd
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
@@ -0,0 +1,118 @@
+/**
+ * Licensed 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 org.apache.flex.svg
+{
+ import org.apache.flex.graphics.ICircle;
+
+COMPILE::SWF
+{
+import flash.geom.Point;
+import flash.geom.Rectangle;
+}
+COMPILE::JS
+{
+import org.apache.flex.core.WrappedHTMLElement;
+}
+
+public class Circle extends GraphicShape implements ICircle
+{
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.7
+*/
+public function Circle(cx:Number=0, cy:Number=0, r:Number=0)
+{
+x = cx;
+y = cy;
+radius = r;
+}
+
+private var _radius:Number;
+
+public function get radius():Number
+{
+return _radius;
+}
+
+public function set radius(value:Number):void
+{
+_radius = value;
+}
+
+COMPILE::JS
+private var _circle:WrappedHTMLElement;
+
+/**
+ * Draw the circle.
+ * @param cx The x location of the center of the circle
+ * @param cy The y location of the center of the circle.
+ * @param radius The radius of the circle.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion SVGCircleElement
+ */
+public function drawCircle(cx:Number, cy:Number, radius):void
+{
+COMPILE::SWF
+{
+graphics.clear();
+applyStroke();
+beginFill(new Rectangle(cx,cy,radius*2, radius*2),new
Point(cx-radius,cy-radius));
+graphics.drawCircle(cx,cy,radius);
+endFill();
+}
+COMPILE::JS
+{
+var style:String = getStyleStr();
+
+if (_circle == null) {
+_circle =
document.createElementNS('http://www.w3.org/2000/svg', 'circle') as
WrappedHTMLElement;
+_circle.flexjs_wrapper = this;
+element.appendChild(_circle);
+}
+_circle.setAttribute('style', style);
+if (stroke)
+{
+_circle.setAttribute('cx', radius + stroke.weight);
+_circle.setAttribute('cy', radius + stroke.weight);
+}
+else
+{
+
[43/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - clean up build after merge. I wonder if fork is causing things to mess up on merges. I thought I'd made these changes before
clean up build after merge. I wonder if fork is causing things to mess up on
merges. I thought I'd made these changes before
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1b6c3af2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1b6c3af2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1b6c3af2
Branch: refs/heads/refactor-sprite
Commit: 1b6c3af235708d1b73e9816bf8f4aa2e79326694
Parents: a5cf277
Author: Alex Harui
Authored: Tue Nov 1 08:33:05 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 08:33:05 2016 -0700
--
.../flex/org/apache/flex/core/ContainerBase.as | 20 ++--
.../flex/core/ContainerBaseStrandChildren.as| 10 +-
.../main/flex/org/apache/flex/core/ListBase.as | 10 +-
.../apache/flex/core/ListBaseStrandChildren.as | 12 +---
.../main/flex/org/apache/flex/core/UIBase.as| 19 +++
.../org/apache/flex/svg/GraphicContainer.as | 18 +++---
6 files changed, 43 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1b6c3af2/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
index 5b6cc26..0dd0b53 100644
---
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
@@ -106,7 +106,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
-override public function getElementAt(index:int):Object
+override public function getElementAt(index:int):IChild
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -119,7 +119,7 @@ package org.apache.flex.core
/**
* @private
*/
-override public function getElementIndex(c:Object):int
+override public function getElementIndex(c:IChild):int
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -132,7 +132,7 @@ package org.apache.flex.core
/**
* @private
*/
-override public function addElement(c:Object, dispatchEvent:Boolean =
true):void
+override public function addElement(c:IChild, dispatchEvent:Boolean =
true):void
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -148,7 +148,7 @@ package org.apache.flex.core
/**
* @private
*/
-override public function addElementAt(c:Object, index:int,
dispatchEvent:Boolean = true):void
+override public function addElementAt(c:IChild, index:int,
dispatchEvent:Boolean = true):void
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -164,7 +164,7 @@ package org.apache.flex.core
/**
* @private
*/
-override public function removeElement(c:Object, dispatchEvent:Boolean
= true):void
+override public function removeElement(c:IChild, dispatchEvent:Boolean
= true):void
{
var contentView:IParent = view as IParent;
if (contentView != null) {
@@ -229,7 +229,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $addElement(c:Object, dispatchEvent:Boolean =
true):void
+ public function $addElement(c:IChild, dispatchEvent:Boolean =
true):void
{
super.addElement(c, dispatchEvent);
}
@@ -239,7 +239,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $addElementAt(c:Object, index:int,
dispatchEvent:Boolean = true):void
+ public function $addElementAt(c:IChild, index:int,
dispatchEvent:Boolean = true):void
{
super.addElementAt(c, index, dispatchEvent);
}
@@ -249,7 +249,7 @@ package org.apache.flex.core
* @suppress {undefinedNames}
* Support strandChildren.
*/
- public function $removeElement(c:Object, dispatchEvent:Boolean
= true):void
+ public function $removeElement(c:I
[21/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Copy HTMLJS to BasicJS. Use --follow for history
Copy HTMLJS to BasicJS. Use --follow for history
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7a2115d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7a2115d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7a2115d7
Branch: refs/heads/refactor-sprite
Commit: 7a2115d7bcf6a015ac7bfc280327458f52d4fa5e
Parents: d822145
Author: Alex Harui
Authored: Wed Oct 26 14:11:51 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:51 2016 -0700
--
frameworks/js/FlexJS/projects/BasicJS/build.xml | 142 +++
.../src/main/config/compile-js-config.xml | 96 +
2 files changed, 238 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a2115d7/frameworks/js/FlexJS/projects/BasicJS/build.xml
--
diff --git a/frameworks/js/FlexJS/projects/BasicJS/build.xml
b/frameworks/js/FlexJS/projects/BasicJS/build.xml
new file mode 100644
index 000..5a39024
--- /dev/null
+++ b/frameworks/js/FlexJS/projects/BasicJS/build.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+target.name.nojs=${ant.project.name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a2115d7/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
--
diff --git
a/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
new file mode 100644
index 000..ec61db4
--- /dev/null
+++
b/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
@@ -0,0 +1,96 @@
+
+
+
+
+false
+
+
+ true
+
+
org.apache.flex.events.ValueChangeEvent
+
org.apache.flex.events.ValueChangeEvent
+
valueChange
+
+
+COMPILE::SWF
+false
+
+
+COMPILE::JS
+true
+
+
+
+ Bindable
+ Managed
+ ChangeEvent
+ NonCommittingChangeEvent
+ Transient
+
+
+
+
+
+
+
../../../../../../../../js/libs/GCL.swc
+
+../../../../../libs/BindingJS.swc
+../../../../../libs/CoreJS.swc
+../../../../../libs/GraphicsJS.swc
+../../../../../libs/CollectionsJS.swc
+
+
+
+
+library://ns.apache.org/flexjs/basic
+
../../../../../../../projects/Basic/src/main/resources/basic-manifest.xml
+
+
+library://ns.apache.org/flexjs/svg
+
../../../../../../../projects/Basic/src/main/resources/svg-manifest.xml
+
+
+
+
+
../../../../../../../projects/Basic/src/main/flex
+
+
+false
+
+
+
+
+
+
+
+
+
+BasicClasses
+
+
+
+library://ns.apache.org/flexjs/basic
+library://ns.apache.org/flexjs/svg
+
+
+
+
[03/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - add basic swc
add basic swc Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/21c93409 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/21c93409 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/21c93409 Branch: refs/heads/refactor-sprite Commit: 21c9340930ac59c15ed2ff18c17ad528cc11952a Parents: 6683f9b Author: Alex Harui Authored: Wed Oct 26 16:17:22 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 07:46:51 2016 -0700 -- frameworks/build.xml | 6 ++ frameworks/js/FlexJS/build.xml | 6 ++ 2 files changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/21c93409/frameworks/build.xml -- diff --git a/frameworks/build.xml b/frameworks/build.xml index 75dda80..65d06f7 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -81,6 +81,7 @@ + @@ -133,6 +134,7 @@ + @@ -210,6 +212,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/21c93409/frameworks/js/FlexJS/build.xml -- diff --git a/frameworks/js/FlexJS/build.xml b/frameworks/js/FlexJS/build.xml index a08f92d..882e380 100644 --- a/frameworks/js/FlexJS/build.xml +++ b/frameworks/js/FlexJS/build.xml @@ -80,6 +80,7 @@ + @@ -128,6 +129,7 @@ + @@ -186,6 +188,10 @@ + + + +
[36/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - this got renamed
this got renamed
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1acc00ec
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1acc00ec
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1acc00ec
Branch: refs/heads/refactor-sprite
Commit: 1acc00ec28ff9620ea373709fee1ca47edbd4be2
Parents: 069904c
Author: Alex Harui
Authored: Sun Oct 30 21:06:06 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 08:02:15 2016 -0700
--
frameworks/projects/Core/src/main/flex/CoreClasses.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1acc00ec/frameworks/projects/Core/src/main/flex/CoreClasses.as
--
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as
b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index f34684e..797fafb 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -169,7 +169,7 @@ internal class CoreClasses
import org.apache.flex.utils.CSSUtils; CSSUtils;
import org.apache.flex.utils.Proxy; Proxy;
-import org.apache.flex.core.HTMLElementWrapper; HTMLElementWrapper;
+import org.apache.flex.core.UIHTMLElementWrapper; UIHTMLElementWrapper;
COMPILE::JS
{
[27/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - clean build after moving and forking files
clean build after moving and forking files
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87ee7114
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87ee7114
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87ee7114
Branch: refs/heads/refactor-sprite
Commit: 87ee711439b55ded11edb33ce1451728808b0226
Parents: 6fee345
Author: Alex Harui
Authored: Thu Oct 27 23:15:04 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:55:19 2016 -0700
--
.../Basic/src/main/flex/BasicClasses.as | 9 +
.../org/apache/flex/core/SimpleApplication.as | 102 +
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 +
.../org/apache/flex/svg/GraphicContainer.as | 208 +++
.../Basic/src/main/resources/basic-manifest.xml | 2 +
.../projects/Basic/src/test/flex/build.xml | 2 +
frameworks/projects/Core/build.xml | 2 +-
.../projects/Core/src/main/flex/CoreClasses.as | 7 -
.../apache/flex/core/BrowserResizeListener.as | 4 +-
.../org/apache/flex/core/BrowserScroller.as | 4 +-
.../apache/flex/core/IInitialViewApplication.as | 61 ++
.../Core/src/main/resources/basic-manifest.xml | 2 -
.../Graphics/src/main/flex/GraphicsClasses.as | 2 -
.../projects/HTML/src/main/flex/HTMLClasses.as | 8 +
.../HTML/src/main/resources/basic-manifest.xml | 2 +
.../projects/HTML/src/test/flex/build.xml | 2 +
16 files changed, 457 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/flex/BasicClasses.as
--
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index 527d182..2c1665b 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -181,6 +181,15 @@ internal class BasicClasses
import org.apache.flex.html.beads.WebBrowserView; WebBrowserView;
import org.apache.flex.html.beads.models.WebBrowserModel;
WebBrowserModel;
+
+ import org.apache.flex.core.ListBase; ListBase;
+ import org.apache.flex.core.ListBaseStrandChildren;
ListBaseStrandChildren;
+ import org.apache.flex.core.FilledRectangle; FilledRectangle;
+import org.apache.flex.core.UIBase; UIBase;
+import org.apache.flex.core.SimpleApplication; SimpleApplication;
+ import org.apache.flex.svg.GraphicContainer; GraphicContainer;
+ import org.apache.flex.svg.DOMWrapper; DOMWrapper;
+
COMPILE::SWF
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
new file mode 100644
index 000..b824288
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
@@ -0,0 +1,102 @@
+
+//
+// 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 org.apache.flex.core
+{
+ COMPILE::SWF
+ {
+import flash.display.DisplayObject;
+import flash.display.Sprite;
+import flash.display.StageAlign;
+import flash.display.StageQuality;
+import flash.display.StageScaleMode;
+import flash.events.Event;
+import flash.system.ApplicationDomain;
+import flash.utils.getQualifiedClassName;
+ }
+
+import org.apache.flex.events.Event;
+import org.apache.flex.events.IEventDispatcher;
+import org.apache.flex.events.MouseEvent;
+import org.ap
[16/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
new file mode 100644
index 000..1807381
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
@@ -0,0 +1,317 @@
+
+//
+// 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 org.apache.flex.html
+{
+ import org.apache.flex.states.State;
+
+ import org.apache.flex.core.IBead;
+import org.apache.flex.core.ILayoutHost;
+import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+import org.apache.flex.core.IStatesImpl;
+ import org.apache.flex.core.ValuesManager;
+import org.apache.flex.html.beads.ContainerView;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.ValueChangeEvent;
+ import org.apache.flex.utils.MXMLDataInterpreter;
+
+[DefaultProperty("mxmlContent")]
+
+/**
+ * The MXMLBeadView class extends ContainerView
+ * and adds support for databinding and specification
+ * of children in MXML.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class MXMLBeadView extends ContainerView implements IStrand,
ILayoutHost
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function MXMLBeadView()
+ {
+ super();
+ }
+
+[Bindable("strandChanged")]
+/**
+ * An MXMLBeadView doesn't create its children until it is added to
+ * the strand.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+override public function set strand(value:IStrand):void
+{
+super.strand = value;
+// each MXML file can also have styles in fx:Style block
+ValuesManager.valuesImpl.init(this);
+
+dispatchEvent(new Event("strandChanged"));
+
+for each (var bead:IBead in beads)
+addBead(bead);
+
+dispatchEvent(new org.apache.flex.events.Event("beadsAdded"));
+
+MXMLDataInterpreter.generateMXMLInstances(this, IParent(value),
MXMLDescriptor);
+
+dispatchEvent(new Event("initBindings"))
+dispatchEvent(new Event("initComplete"))
+dispatchEvent(new Event("childrenAdded"));
+}
+
+[Bindable("__NoChangeEvent__")]
+/**
+ * The model object.
+ */
+public function get model():Object
+{
+return _strand["model"];
+}
+
+/**
+ * @copy org.apache.flex.core.Application#MXMLDescriptor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function get MXMLDescriptor():Array
+{
+return null;
+}
+
+/**
+ * @copy org.apache.flex.core.Application#generateMXMLAttributes()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function generateMXMLAttributes(data:Array):void
+{
+MXMLDataInterpre
[06/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.as
new file mode 100644
index 000..01dd3e9
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.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 org.apache.flex.html.beads.models
+{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ITextModel;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.events.IEventDispatcher;
+
+/**
+ * The ImageAndTextModel class is associates and image
+ * with some text.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ImageAndTextModel extends TextModel
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ImageAndTextModel()
+ {
+ }
+
+
+private var _image:String;
+
+/**
+ * The URL of an icon to use in the button
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function get image():String
+{
+return _image;
+}
+
+/**
+ * @private
+ */
+public function set image(value:String):void
+{
+_image = value;
+dispatchEvent(new Event("imageChange"));
+}
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
new file mode 100644
index 000..7742c2b
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
@@ -0,0 +1,89 @@
+
+//
+// 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 org.apache.flex.html.beads.models
+{
+ import org.apache.flex.core.IImageModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.
[16/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
new file mode 100644
index 000..61b6edb
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldView.as
@@ -0,0 +1,54 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.text.TextFieldType;
+
+/**
+ * The TextFieldView class is the default view for
+ * the org.apache.flex.html.Label class.
+ * It displays text using a TextField, so there is no
+ * right-to-left text support in this view.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class TextFieldView extends TextFieldViewBase
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function TextFieldView()
+ {
+ super();
+
+ textField.selectable = false;
+ textField.type = TextFieldType.DYNAMIC;
+ textField.mouseEnabled = false;
+ textField.autoSize = "left";
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
new file mode 100644
index 000..3ab2874
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextFieldViewBase.as
@@ -0,0 +1,404 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.display.DisplayObject;
+ import flash.display.DisplayObjectContainer;
+ import flash.text.StyleSheet;
+
+ import org.apache.flex.core.CSSTextField;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.ILayoutChild;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ITextModel;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+
+/**
+ * The TextFieldViewBase class is the base
[02/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - - Adjusted the distribution build: -- Updated the version in flex-sdk-description.xml to be greater than 4.8.0 -- Added mxml-manifest.xml
- Adjusted the distribution build:
-- Updated the version in flex-sdk-description.xml to be greater than 4.8.0
-- Added mxml-manifest.xml, spark-manifest.xml and airmobile-config.xml
-- Added locale and rsls directories
-- Removed the version suffix from the libs in the "lib" directory
-- Included the "ide" directory in the output
TODO:
- The dummy-jars: mxmlc.jar, compc.jar are still missing ...
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4448b422
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4448b422
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4448b422
Branch: refs/heads/refactor-sprite
Commit: 4448b4224bfbfe52fc1d4b61f368561e488ef06e
Parents: 1829b46
Author: Christofer Dutz
Authored: Wed Oct 26 17:15:39 2016 +0200
Committer: Alex Harui
Committed: Tue Nov 1 07:46:50 2016 -0700
--
distribution/pom.xml| 11 +-
.../src/main/assembly/component-air.xml | 10 ++
.../src/main/assembly/component-fontkit.xml | 3 +
distribution/src/main/assembly/component.xml| 11 +-
.../src/main/assembly/filter.properties | 21 ---
distribution/src/main/resources/air/adt | 2 +-
distribution/src/main/resources/air/adt.bat | 2 +-
.../src/main/resources/flex-sdk-description.xml | 4 +-
.../main/resources/frameworks/air-config.xml| 4 +-
.../resources/frameworks/airmobile-config.xml | 135 +++
.../resources/frameworks/createjs-config.xml| 8 +-
.../main/resources/frameworks/flex-config.xml | 4 +-
.../main/resources/frameworks/jquery-config.xml | 8 +-
.../src/main/resources/frameworks/js-config.xml | 8 +-
.../main/resources/frameworks/locale/readme.md | 20 +++
.../main/resources/frameworks/mxml-manifest.xml | 21 +++
.../main/resources/frameworks/node-config.xml | 4 +-
.../main/resources/frameworks/rsls/readme.md| 20 +++
.../resources/frameworks/spark-manifest.xml | 21 +++
pom.xml | 2 +
20 files changed, 268 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 09f41bf..4db74fb 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -35,9 +35,6 @@
apache-flex-flexjs-${project.version}
-${flash.version}
-${air.version}
-
${maven.build.timestamp}
MMddHHmm
@@ -56,6 +53,11 @@
org.apache.flex.flexjs.compiler
+ flexjs-ant-tasks
+ 0.8.0-SNAPSHOT
+
+
+ org.apache.flex.flexjs.compiler
debugger
0.8.0-SNAPSHOT
@@ -458,9 +460,6 @@
single
-
-src/main/assembly/filter.properties
-
src/main/assembly/bin.xml
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/src/main/assembly/component-air.xml
--
diff --git a/distribution/src/main/assembly/component-air.xml
b/distribution/src/main/assembly/component-air.xml
index d2a9636..e24c2f4 100644
--- a/distribution/src/main/assembly/component-air.xml
+++ b/distribution/src/main/assembly/component-air.xml
@@ -23,6 +23,9 @@ under the License.
false
lib
+
+
+
${artifact.artifactId}.${artifact.extension}
com.adobe.air.compiler:adt:jar
@@ -38,6 +41,13 @@ under the License.
true
+
+ false
+ frameworks
+
+
+
+
false
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/src/main/assembly/component-fontkit.xml
--
diff --git a/distribution/src/main/assembly/component-fontkit.xml
b/distribution/src/main/assembly/component-fontkit.xml
index 0b6a026..625535a 100644
--- a/distribution/src/main/assembly/component-fontkit.xml
+++ b/distribution/src/main/assembly/component-fontkit.xml
@@ -22,6 +22,9 @@ under the License.
false
lib
+
+
+
${artifact.artifactId}.${artifact.extension}
com.adobe:fontkit
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/src/main/assembly/component.xml
--
diff --git a/distribution/src/main/assembly/component.xml
b/distribution/src/main/assembly/component.xml
index cb86030..3293692 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distributi
[10/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
new file mode 100644
index 000..285282a
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
@@ -0,0 +1,151 @@
+
+//
+// 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 org.apache.flex.html.supportClasses
+{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IContentView;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.IViewport;
+ import org.apache.flex.core.IViewportModel;
+ import org.apache.flex.core.UIBase;
+import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+import org.apache.flex.geom.Rectangle;
+import org.apache.flex.geom.Size;
+ import org.apache.flex.html.beads.models.ScrollBarModel;
+import org.apache.flex.utils.CSSContainerUtils;
+
+/**
+ * A Viewport is the area of a Container set aside for displaying
+ * content and any scrolling controls.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ */
+ public class Viewport implements IBead, IViewport
+ {
+ /**
+* Constructor
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function Viewport()
+ {
+ }
+
+ protected var contentArea:UIBase;
+
+ /**
+* Get the actual parent of the container's content.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+public function get contentView():IUIBase
+{
+return contentArea;
+}
+
+ protected var _strand:IStrand;
+
+/**
+ * @flexjsignorecoercion Class
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+contentArea = _strand.getBeadByType(IContentView) as UIBase;
+if (!contentArea)
+{
+var c:Class = ValuesManager.valuesImpl.getValue(_strand,
'iContentView') as Class;
+contentArea = new c() as UIBase;
+}
+ }
+
+/**
+ * @copy org.apache.flex.core.IViewport#setPosition()
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ */
+public function setPosition(x:Number, y:Number):void
+{
+contentArea.x = x;
+contentArea.y = y;
+}
+
+/**
+ * @copy
org.apache.flex.core.IViewport#layoutViewportBeforeContentLayout()
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ */
+ public function layoutViewportBeforeContentLayout(width:Number,
height:Number):void
+ {
+ if (!isNaN(width))
+contentArea.width = width;
+if (!isNaN(height))
+contentArea.height = height;
+ }
+
+/**
+ * @copy
org.
[05/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - fix up installer after launch script name changes
fix up installer after launch script name changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6c2e37f9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6c2e37f9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6c2e37f9
Branch: refs/heads/develop
Commit: 6c2e37f99bf5716641611c642b31760421c6ecfd
Parents: 4448b42
Author: Alex Harui
Authored: Wed Oct 26 09:27:04 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:50 2016 -0700
--
installer.xml | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6c2e37f9/installer.xml
--
diff --git a/installer.xml b/installer.xml
index d6c8722..47fd118 100644
--- a/installer.xml
+++ b/installer.xml
@@ -967,7 +967,12 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
token="$FLEXJS_HOME"
value="${FLEXJS_HOME}"/>
-
+
+
+
+
@@ -1000,11 +1005,16 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc"
/>
token="PATH"
value="UNIX_PATH" />
-
+
+
+
+
[07/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - add basic swc
add basic swc Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/21c93409 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/21c93409 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/21c93409 Branch: refs/heads/develop Commit: 21c9340930ac59c15ed2ff18c17ad528cc11952a Parents: 6683f9b Author: Alex Harui Authored: Wed Oct 26 16:17:22 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 07:46:51 2016 -0700 -- frameworks/build.xml | 6 ++ frameworks/js/FlexJS/build.xml | 6 ++ 2 files changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/21c93409/frameworks/build.xml -- diff --git a/frameworks/build.xml b/frameworks/build.xml index 75dda80..65d06f7 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -81,6 +81,7 @@ + @@ -133,6 +134,7 @@ + @@ -210,6 +212,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/21c93409/frameworks/js/FlexJS/build.xml -- diff --git a/frameworks/js/FlexJS/build.xml b/frameworks/js/FlexJS/build.xml index a08f92d..882e380 100644 --- a/frameworks/js/FlexJS/build.xml +++ b/frameworks/js/FlexJS/build.xml @@ -80,6 +80,7 @@ + @@ -128,6 +129,7 @@ + @@ -186,6 +188,10 @@ + + + +
[01/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - copy files moved from Graphics to HTML
Repository: flex-asjs
Updated Branches:
refs/heads/develop 5f8b1654f -> e42e19a24
copy files moved from Graphics to HTML
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f07982d6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f07982d6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f07982d6
Branch: refs/heads/develop
Commit: f07982d6ef11f02d384843133382be92724f2fed
Parents: 4c98a37
Author: Alex Harui
Authored: Fri Oct 28 23:26:57 2016 -0700
Committer: Alex Harui
Committed: Fri Oct 28 23:26:57 2016 -0700
--
.../src/main/flex/org/apache/flex/svg/Circle.as | 118
.../flex/org/apache/flex/svg/CompoundGraphic.as | 585 +++
.../main/flex/org/apache/flex/svg/Ellipse.as| 152 +
.../flex/org/apache/flex/svg/GraphicShape.as| 225 +++
.../src/main/flex/org/apache/flex/svg/Path.as | 133 +
.../src/main/flex/org/apache/flex/svg/Rect.as | 156 +
.../src/main/flex/org/apache/flex/svg/Text.as | 150 +
7 files changed, 1519 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f07982d6/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
new file mode 100644
index 000..586bbfd
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/Circle.as
@@ -0,0 +1,118 @@
+/**
+ * Licensed 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 org.apache.flex.svg
+{
+ import org.apache.flex.graphics.ICircle;
+
+COMPILE::SWF
+{
+import flash.geom.Point;
+import flash.geom.Rectangle;
+}
+COMPILE::JS
+{
+import org.apache.flex.core.WrappedHTMLElement;
+}
+
+public class Circle extends GraphicShape implements ICircle
+{
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.7
+*/
+public function Circle(cx:Number=0, cy:Number=0, r:Number=0)
+{
+x = cx;
+y = cy;
+radius = r;
+}
+
+private var _radius:Number;
+
+public function get radius():Number
+{
+return _radius;
+}
+
+public function set radius(value:Number):void
+{
+_radius = value;
+}
+
+COMPILE::JS
+private var _circle:WrappedHTMLElement;
+
+/**
+ * Draw the circle.
+ * @param cx The x location of the center of the circle
+ * @param cy The y location of the center of the circle.
+ * @param radius The radius of the circle.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ * @flexjsignorecoercion SVGCircleElement
+ */
+public function drawCircle(cx:Number, cy:Number, radius):void
+{
+COMPILE::SWF
+{
+graphics.clear();
+applyStroke();
+beginFill(new Rectangle(cx,cy,radius*2, radius*2),new
Point(cx-radius,cy-radius));
+graphics.drawCircle(cx,cy,radius);
+endFill();
+}
+COMPILE::JS
+{
+var style:String = getStyleStr();
+
+if (_circle == null) {
+_circle =
document.createElementNS('http://www.w3.org/2000/svg', 'circle') as
WrappedHTMLElement;
+_circle.flexjs_wrapper = this;
+element.appendChild(_circle);
+}
+_circle.setAttribute('style', style);
+if (stroke)
+{
+_circle.setAttribute('cx', radius + stroke.weight);
+_circle.setAttribute('cy', radius + stroke.weight
[09/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - Copy HTMLJS to BasicJS. Use --follow for history
Copy HTMLJS to BasicJS. Use --follow for history
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7a2115d7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7a2115d7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7a2115d7
Branch: refs/heads/develop
Commit: 7a2115d7bcf6a015ac7bfc280327458f52d4fa5e
Parents: d822145
Author: Alex Harui
Authored: Wed Oct 26 14:11:51 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:51 2016 -0700
--
frameworks/js/FlexJS/projects/BasicJS/build.xml | 142 +++
.../src/main/config/compile-js-config.xml | 96 +
2 files changed, 238 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a2115d7/frameworks/js/FlexJS/projects/BasicJS/build.xml
--
diff --git a/frameworks/js/FlexJS/projects/BasicJS/build.xml
b/frameworks/js/FlexJS/projects/BasicJS/build.xml
new file mode 100644
index 000..5a39024
--- /dev/null
+++ b/frameworks/js/FlexJS/projects/BasicJS/build.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+target.name.nojs=${ant.project.name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a2115d7/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
--
diff --git
a/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
new file mode 100644
index 000..ec61db4
--- /dev/null
+++
b/frameworks/js/FlexJS/projects/BasicJS/src/main/config/compile-js-config.xml
@@ -0,0 +1,96 @@
+
+
+
+
+false
+
+
+ true
+
+
org.apache.flex.events.ValueChangeEvent
+
org.apache.flex.events.ValueChangeEvent
+
valueChange
+
+
+COMPILE::SWF
+false
+
+
+COMPILE::JS
+true
+
+
+
+ Bindable
+ Managed
+ ChangeEvent
+ NonCommittingChangeEvent
+ Transient
+
+
+
+
+
+
+
../../../../../../../../js/libs/GCL.swc
+
+../../../../../libs/BindingJS.swc
+../../../../../libs/CoreJS.swc
+../../../../../libs/GraphicsJS.swc
+../../../../../libs/CollectionsJS.swc
+
+
+
+
+library://ns.apache.org/flexjs/basic
+
../../../../../../../projects/Basic/src/main/resources/basic-manifest.xml
+
+
+library://ns.apache.org/flexjs/svg
+
../../../../../../../projects/Basic/src/main/resources/svg-manifest.xml
+
+
+
+
+
../../../../../../../projects/Basic/src/main/flex
+
+
+false
+
+
+
+
+
+
+
+
+
+BasicClasses
+
+
+
+library://ns.apache.org/flexjs/basic
+library://ns.apache.org/flexjs/svg
+
+
+
+
[37/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - replace UIBase dependency
replace UIBase dependency
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0d06e658
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0d06e658
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0d06e658
Branch: refs/heads/develop
Commit: 0d06e658dc87a1b6fd84e47565057c8e42f6a694
Parents: 7af78c1
Author: Alex Harui
Authored: Fri Oct 28 23:20:14 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:59:02 2016 -0700
--
.../main/flex/org/apache/flex/core/BrowserResizeListener.as | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0d06e658/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
index a8fb5c0..441bfee 100644
---
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
+++
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as
@@ -109,11 +109,14 @@ COMPILE::SWF
}
}
+ /**
+* @flexjsignorecoercion org.apache.flex.core.ILayoutChild
+*/
private function resizeHandler(event:Event):void
{
COMPILE::SWF
{
-var initialView:UIBase = app.initialView as UIBase;
+var initialView:ILayoutChild = app.initialView as ILayoutChild;
var constrainedWidth:Number =
Math.max(isNaN(minWidth) ? 0 : minWidth, app.$displayObject.stage.stageWidth);
var constrainedHeight:Number =
Math.max(isNaN(minHeight) ? 0 : minHeight,
app.$displayObject.stage.stageHeight);
if (!isNaN(initialView.percentWidth) &&
!isNaN(initialView.percentHeight))
@@ -125,7 +128,7 @@ COMPILE::SWF
}
COMPILE::JS
{
-var initialView:UIBase = app.initialView as UIBase;
+var initialView:ILayoutChild = app.initialView as ILayoutChild;
var element:HTMLElement = app.element;
if (!isNaN(initialView.percentWidth) ||
!isNaN(initialView.percentHeight)) {
element.style.height = window.innerHeight + 'px';
[25/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - rename HTMLClasses to BasicClasses
rename HTMLClasses to BasicClasses
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d3b40de0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d3b40de0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d3b40de0
Branch: refs/heads/develop
Commit: d3b40de051fc69794596ca19dc3d55e3afcc4ab2
Parents: 7a2115d
Author: Alex Harui
Authored: Wed Oct 26 14:14:14 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:51 2016 -0700
--
.../Basic/src/main/flex/BasicClasses.as | 194 +++
.../projects/Basic/src/main/flex/HTMLClasses.as | 194 ---
2 files changed, 194 insertions(+), 194 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d3b40de0/frameworks/projects/Basic/src/main/flex/BasicClasses.as
--
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
new file mode 100644
index 000..1271417
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -0,0 +1,194 @@
+
+//
+// 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
+{
+
+/**
+ * @private
+ * This class is used to link additional classes into rpc.swc
+ * beyond those that are found by dependecy analysis starting
+ * from the classes specified in manifest.xml.
+ */
+internal class HTMLClasses
+{
+
+import org.apache.flex.html.ToolTip; ToolTip;
+ import org.apache.flex.html.accessories.NumericOnlyTextInputBead;
NumericOnlyTextInputBead;
+ import org.apache.flex.html.accessories.PasswordInputBead;
PasswordInputBead;
+ import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead;
+import org.apache.flex.html.beads.AlertView; AlertView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.BackgroundImageBead;
BackgroundImageBead;
+ }
+ import org.apache.flex.html.beads.ButtonBarView; ButtonBarView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
+ import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
+ }
+import org.apache.flex.html.beads.ContainerView; ContainerView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.ControlBarMeasurementBead;
ControlBarMeasurementBead;
+ import org.apache.flex.html.beads.CSSButtonView; CSSButtonView;
+ import org.apache.flex.html.beads.CSSImageAndTextButtonView;
CSSImageAndTextButtonView;
+ import org.apache.flex.html.beads.CSSTextButtonView;
CSSTextButtonView;
+ import org.apache.flex.html.beads.CSSTextToggleButtonView;
CSSTextToggleButtonView;
+ import org.apache.flex.html.beads.DropDownListView;
DropDownListView;
+ import org.apache.flex.html.beads.CloseButtonView;
CloseButtonView;
+ import org.apache.flex.html.beads.ImageAndTextButtonView;
ImageAndTextButtonView;
+ import org.apache.flex.html.beads.ImageView; ImageView;
+ }
+ import org.apache.flex.html.beads.ImageButtonView; ImageButtonView;
+ import org.apache.flex.html.beads.ListView; ListView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.NumericStepperView;
NumericStepperView;
+ }
+import org.apache.flex.html.beads.PanelView; PanelView;
+ COMPILE::SWF
+ {
+ import org.apache.flex.html.beads.PanelWithControlBarView;
PanelWithControlBarView;
+ import org.apache.flex.html.beads.RadioButtonView;
RadioButtonView;
+ import org.apache.flex.html.beads.VScrollBarView;
VScrollBarView;
+ import org.apache.flex.html.beads.HScrollBarView;
HScrollBarView;
+ import org.apache.fle
[28/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - copy former core classes into Basic
copy former core classes into Basic
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8f155cf8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8f155cf8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8f155cf8
Branch: refs/heads/develop
Commit: 8f155cf80a983484689aa7e8c6143bfd7c374458
Parents: efd9dca
Author: Alex Harui
Authored: Thu Oct 27 16:28:10 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:52 2016 -0700
--
.../flex/org/apache/flex/core/Application.as| 637 +++
.../org/apache/flex/core/ApplicationBase.as | 110
.../flex/org/apache/flex/core/ContainerBase.as | 443 +
.../flex/core/ContainerBaseStrandChildren.as| 99 +++
.../org/apache/flex/core/FilledRectangle.as | 125
.../main/flex/org/apache/flex/core/ListBase.as | 126
.../apache/flex/core/ListBaseStrandChildren.as | 100 +++
.../src/main/flex/org/apache/flex/core/View.as | 34 +
.../main/flex/org/apache/flex/core/ViewBase.as | 97 +++
9 files changed, 1771 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8f155cf8/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
new file mode 100644
index 000..ff6e5a6
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
@@ -0,0 +1,637 @@
+
+//
+// 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 org.apache.flex.core
+{
+import org.apache.flex.events.Event;
+import org.apache.flex.events.IEventDispatcher;
+import org.apache.flex.events.MouseEvent;
+import org.apache.flex.events.utils.MouseEventConverter;
+import org.apache.flex.utils.MXMLDataInterpreter;
+ import org.apache.flex.utils.Timer;
+
+COMPILE::SWF {
+import flash.display.DisplayObject;
+import flash.display.Sprite;
+import flash.display.StageAlign;
+import flash.display.StageQuality;
+import flash.display.StageScaleMode;
+import flash.events.Event;
+import flash.system.ApplicationDomain;
+import flash.utils.getQualifiedClassName;
+}
+
+//--
+// Events
+//--
+
+/**
+ * Dispatched at startup. Attributes and sub-instances of
+ * the MXML document have been created and assigned.
+ * The component lifecycle is different
+ * than the Flex SDK. There is no creationComplete event.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="initialize", type="org.apache.flex.events.Event")]
+
+/**
+ * Dispatched at startup before the instances get created.
+ * Beads can call preventDefault and defer initialization.
+ * This event will be dispatched on every frame until no
+ * listeners call preventDefault(), then the initialize()
+ * method will be called.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="preinitialize", type="org.apache.flex.events.Event")]
+
+/**
+ * Dispatched at startup after the initial view has been
+ * put on the display list. This event is sent before
+ * applicationComplete is dispatched.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+[Event(name="viewChanged", type="org.apache.flex.events.Event")]
[30/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - move ContainerBase Graphics classes
move ContainerBase Graphics classes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6fee345f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6fee345f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6fee345f
Branch: refs/heads/develop
Commit: 6fee345f119756d032d3ce36911e13f8f80cb368
Parents: f241391
Author: Alex Harui
Authored: Thu Oct 27 22:13:22 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:53 2016 -0700
--
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 -
.../org/apache/flex/svg/GraphicContainer.as | 209 ---
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 +
.../org/apache/flex/svg/GraphicContainer.as | 209 +++
4 files changed, 265 insertions(+), 265 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6fee345f/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
deleted file mode 100644
index 7bb20ff..000
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/DOMWrapper.as
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed 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 org.apache.flex.svg
-{
- COMPILE::JS
-{
-import org.apache.flex.core.WrappedHTMLElement;
-}
-
- import org.apache.flex.core.ContainerBase;
-
- public class DOMWrapper extends ContainerBase
- {
-
- /**
-* Constructor
-*
-* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
-*/
-public function DOMWrapper()
-{
- super();
-}
-
- /**
-* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
-*/
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- element =
document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject') as
WrappedHTMLElement;
- element.flexjs_wrapper = this;
- element.style.left = 0;
- element.style.top = 0;
- //element.offsetParent = null;
- positioner = element;
- positioner.style.position = 'relative';
-
- return element;
- }
-
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6fee345f/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
deleted file mode 100644
index 709d6ea..000
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * Licensed 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 org.apache.flex.svg
-{
-import org.apache.flex.core.ContainerBase;
-import org.apache.flex.core.IChild;
-import org.apache.flex.core.IFlexJSElement;
-import org.apache.flex.core.ITransformHost;
-
- COMPILE::JS
- {
- import org.apache.flex.core.IContainer;
- import org.apache.flex.core.UIBase;
- }
-
- [DefaultProperty("mxmlContent")]
-
[33/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - move UIBase and UIButtonBase
move UIBase and UIButtonBase
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/975d3f34
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/975d3f34
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/975d3f34
Branch: refs/heads/develop
Commit: 975d3f34f058cf3fd79302a6e7037c5e29f7ac84
Parents: 87ee711
Author: Alex Harui
Authored: Fri Oct 28 08:06:04 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:55:20 2016 -0700
--
.../main/flex/org/apache/flex/core/UIBase.as| 1401 --
.../flex/org/apache/flex/core/UIButtonBase.as | 792 --
.../main/flex/org/apache/flex/core/UIBase.as| 1401 ++
.../flex/org/apache/flex/core/UIButtonBase.as | 792 ++
4 files changed, 2193 insertions(+), 2193 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/975d3f34/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
deleted file mode 100644
index 0e4a988..000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
+++ /dev/null
@@ -1,1401 +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 org.apache.flex.core
-{
-COMPILE::SWF
-{
-import flash.display.DisplayObject;
-import flash.display.Sprite;
-import flash.display.Stage;
-}
-
- import org.apache.flex.events.Event;
- import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.events.MouseEvent;
- import org.apache.flex.events.ValueChangeEvent;
- import org.apache.flex.events.utils.MouseEventConverter;
- COMPILE::SWF {
- import flash.display.InteractiveObject;
- }
-
- /**
-* Set a different class for click events so that
-* there aren't dependencies on the flash classes
-* on the JS side.
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion FlexJS 0.0
-*/
- [Event(name="click", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for rollOver events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="rollOver", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for rollOut events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="rollOut", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for mouseDown events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="mouseDown", type="org.apache.flex.events.MouseEvent")]
-
-/**
- * Set a different class for mouseUp events so that
- * there aren't dependencies on the flash classes
- * on the JS side.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="mouseUp", type="org.apache.flex.events.MouseEvent")]
-
-/**
[41/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - clean build after moving UIBase out of Core
clean build after moving UIBase out of Core Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/069904ce Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/069904ce Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/069904ce Branch: refs/heads/develop Commit: 069904ce6f7f7605f8e381df0d791987a8fd60af Parents: 7a65d3d Author: Alex Harui Authored: Sat Oct 29 22:29:12 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 08:02:15 2016 -0700 -- .../src/main/config/compile-js-config.xml | 1 + .../src/main/config/compile-js-config.xml | 1 + .../Basic/src/main/flex/BasicClasses.as | 8 +++ .../flex/org/apache/flex/core/Application.as| 4 +++- .../org/apache/flex/core/SimpleApplication.as | 4 +++- .../main/flex/org/apache/flex/core/UIBase.as| 4 +++- .../projects/Core/src/main/flex/CoreClasses.as | 12 +++ .../src/main/config/compile-as-config.xml | 1 + .../src/main/config/compile-as-config.xml | 1 + .../Graphics/src/main/flex/GraphicsClasses.as | 22 ++-- .../projects/HTML/src/main/flex/HTMLClasses.as | 9 .../flex/org/apache/flex/core/Application.as| 4 +++- .../org/apache/flex/core/SimpleApplication.as | 4 +++- .../main/flex/org/apache/flex/core/UIBase.as| 4 ++-- 14 files changed, 61 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml -- diff --git a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml index 10ea092..81a4671 100644 --- a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml @@ -54,6 +54,7 @@ if these swcs are on the external-library-path then their requires will not be listed --> ../../../../../libs/CoreJS.swc +../../../../../libs/HTMLJS.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml -- diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml index 2a1a3e4..93c4572 100644 --- a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml @@ -58,6 +58,7 @@ if these swcs are on the external-library-path then their requires will not be listed --> ../../../../../libs/CoreJS.swc +../../../../../libs/HTMLJS.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/BasicClasses.as -- diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as index 2c1665b..e63e9de 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -189,6 +189,14 @@ internal class BasicClasses import org.apache.flex.core.SimpleApplication; SimpleApplication; import org.apache.flex.svg.GraphicContainer; GraphicContainer; import org.apache.flex.svg.DOMWrapper; DOMWrapper; + + import org.apache.flex.svg.GraphicShape; GraphicShape; + import org.apache.flex.svg.Rect; Rect; + import org.apache.flex.svg.Ellipse; Ellipse; + import org.apache.flex.svg.Circle; Circle; + import org.apache.flex.svg.Path; Path; + import org.apache.flex.svg.Text; Text; + import org.apache.flex.svg.CompoundGraphic; CompoundGraphic; COMPILE::SWF http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as index ff6e5a6..85609cb 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as @@ -21,
[14/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
new file mode 100644
index 000..b566354
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
@@ -0,0 +1,445 @@
+
+//
+// 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 org.apache.flex.html.beads.layouts
+{
+
+ import org.apache.flex.core.IBeadLayout;
+ import org.apache.flex.core.ILayoutChild;
+ import org.apache.flex.core.ILayoutHost;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+import org.apache.flex.utils.CSSUtils;
+ //import org.apache.flex.utils.dbg.DOMPathUtil;
+
+/**
+ * The BasicLayout class is a simple layout
+ * bead. It takes the set of children and lays them out
+ * as specified by CSS properties like left, right, top
+ * and bottom.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class BasicLayout implements IBeadLayout
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function BasicLayout()
+ {
+ }
+
+// the strand/host container is also an ILayoutChild because
+// can have its size dictated by the host's parent which is
+// important to know for layout optimization
+private var host:ILayoutChild;
+
+/**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+host = value as ILayoutChild;
+ }
+
+/**
+ * @copy org.apache.flex.core.IBeadLayout#layout
+* @flexjsignorecoercion org.apache.flex.core.ILayoutHost
+* @flexjsignorecoercion org.apache.flex.core.UIBase
+ */
+ public function layout():Boolean
+ {
+COMPILE::SWF
+{
+//trace(DOMPathUtil.getPath(host), event ? event.type : "fixed
size");
+var layoutParent:ILayoutHost = host.getBeadByType(ILayoutHost)
as ILayoutHost;
+var contentView:IParentIUIBase = layoutParent ?
layoutParent.contentView : IParentIUIBase(host);
+
+var gotMargin:Boolean;
+var marginLeft:Object;
+var marginRight:Object;
+var marginTop:Object;
+var marginBottom:Object;
+var margin:Object;
+var ml:Number;
+var mr:Number;
+var mt:Number;
+var mb:Number;
+var hostWidthSizedToContent:Boolean =
host.isWidthSizedToContent();
+var hostHeightSizedToContent:Boolean =
host.isHeightSizedToContent();
+var w:Number = hostWidthSizedToContent ? 0 : contentView.width;
+var h:Number = hostHeightSizedToContent ? 0 :
contentView.height;
+var n:int
[21/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
new file mode 100644
index 000..be86d41
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as
@@ -0,0 +1,170 @@
+
+//
+// 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 org.apache.flex.html
+{
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IToggleButtonModel;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.IEventDispatcher;
+
+COMPILE::JS
+{
+import org.apache.flex.core.WrappedHTMLElement;
+}
+
+//--
+// Events
+//--
+
+/**
+ * Dispatched when the user clicks on a button.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="click", type="org.apache.flex.events.MouseEvent")]
+
+/**
+ * The ToggleButton class is a TextButton that supports
+ * a selected property.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ToggleTextButton extends TextButton implements IStrand,
IEventDispatcher, IUIBase
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ToggleTextButton()
+ {
+ super();
+COMPILE::JS
+{
+this.typeNames = 'toggleTextButton';
+}
+ }
+
+COMPILE::JS
+private var _selected:Boolean;
+
+COMPILE::JS
+private var SELECTED:String = "selected";
+
+/**
+ * true if the Button is selected.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function get selected():Boolean
+{
+COMPILE::SWF
+{
+return IToggleButtonModel(model).selected;
+}
+COMPILE::JS
+{
+return _selected;
+}
+}
+
+/**
+ * @private
+ */
+public function set selected(value:Boolean):void
+{
+COMPILE::SWF
+{
+IToggleButtonModel(model).selected = value;
+}
+COMPILE::JS
+{
+if (_selected != value)
+{
+_selected = value;
+
+var className:String = this.className;
+var typeNames:String = this.typeNames;
+if (value) {
+if (typeNames.indexOf(SELECTED) == -1) {
+typeNames = typeNames + SELECTED;
+if (className)
+element.className = typeNames + ' ' +
className;
+else
+element.className = typeNames;
+}
+}
+else {
+if (typeNames.indexOf(SELECTED) == typeNames.length -
SELECTED.length) {
+typeNames = typeNames.substring(0,
typeNames.length - SELECTED.length);
+if (className)
+
[04/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
new file mode 100644
index 000..285282a
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
@@ -0,0 +1,151 @@
+
+//
+// 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 org.apache.flex.html.supportClasses
+{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IContentView;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.IViewport;
+ import org.apache.flex.core.IViewportModel;
+ import org.apache.flex.core.UIBase;
+import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+import org.apache.flex.geom.Rectangle;
+import org.apache.flex.geom.Size;
+ import org.apache.flex.html.beads.models.ScrollBarModel;
+import org.apache.flex.utils.CSSContainerUtils;
+
+/**
+ * A Viewport is the area of a Container set aside for displaying
+ * content and any scrolling controls.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ */
+ public class Viewport implements IBead, IViewport
+ {
+ /**
+* Constructor
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public function Viewport()
+ {
+ }
+
+ protected var contentArea:UIBase;
+
+ /**
+* Get the actual parent of the container's content.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+public function get contentView():IUIBase
+{
+return contentArea;
+}
+
+ protected var _strand:IStrand;
+
+/**
+ * @flexjsignorecoercion Class
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+contentArea = _strand.getBeadByType(IContentView) as UIBase;
+if (!contentArea)
+{
+var c:Class = ValuesManager.valuesImpl.getValue(_strand,
'iContentView') as Class;
+contentArea = new c() as UIBase;
+}
+ }
+
+/**
+ * @copy org.apache.flex.core.IViewport#setPosition()
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ */
+public function setPosition(x:Number, y:Number):void
+{
+contentArea.x = x;
+contentArea.y = y;
+}
+
+/**
+ * @copy
org.apache.flex.core.IViewport#layoutViewportBeforeContentLayout()
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+ */
+ public function layoutViewportBeforeContentLayout(width:Number,
height:Number):void
+ {
+ if (!isNaN(width))
+contentArea.width = width;
+if (!isNaN(height))
+contentArea.height = height;
+ }
+
+/**
+ * @copy
org.
[06/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - - Adjusted the distribution build: -- Updated the version in flex-sdk-description.xml to be greater than 4.8.0 -- Added mxml-manifest.xml
- Adjusted the distribution build:
-- Updated the version in flex-sdk-description.xml to be greater than 4.8.0
-- Added mxml-manifest.xml, spark-manifest.xml and airmobile-config.xml
-- Added locale and rsls directories
-- Removed the version suffix from the libs in the "lib" directory
-- Included the "ide" directory in the output
TODO:
- The dummy-jars: mxmlc.jar, compc.jar are still missing ...
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4448b422
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4448b422
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4448b422
Branch: refs/heads/develop
Commit: 4448b4224bfbfe52fc1d4b61f368561e488ef06e
Parents: 1829b46
Author: Christofer Dutz
Authored: Wed Oct 26 17:15:39 2016 +0200
Committer: Alex Harui
Committed: Tue Nov 1 07:46:50 2016 -0700
--
distribution/pom.xml| 11 +-
.../src/main/assembly/component-air.xml | 10 ++
.../src/main/assembly/component-fontkit.xml | 3 +
distribution/src/main/assembly/component.xml| 11 +-
.../src/main/assembly/filter.properties | 21 ---
distribution/src/main/resources/air/adt | 2 +-
distribution/src/main/resources/air/adt.bat | 2 +-
.../src/main/resources/flex-sdk-description.xml | 4 +-
.../main/resources/frameworks/air-config.xml| 4 +-
.../resources/frameworks/airmobile-config.xml | 135 +++
.../resources/frameworks/createjs-config.xml| 8 +-
.../main/resources/frameworks/flex-config.xml | 4 +-
.../main/resources/frameworks/jquery-config.xml | 8 +-
.../src/main/resources/frameworks/js-config.xml | 8 +-
.../main/resources/frameworks/locale/readme.md | 20 +++
.../main/resources/frameworks/mxml-manifest.xml | 21 +++
.../main/resources/frameworks/node-config.xml | 4 +-
.../main/resources/frameworks/rsls/readme.md| 20 +++
.../resources/frameworks/spark-manifest.xml | 21 +++
pom.xml | 2 +
20 files changed, 268 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 09f41bf..4db74fb 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -35,9 +35,6 @@
apache-flex-flexjs-${project.version}
-${flash.version}
-${air.version}
-
${maven.build.timestamp}
MMddHHmm
@@ -56,6 +53,11 @@
org.apache.flex.flexjs.compiler
+ flexjs-ant-tasks
+ 0.8.0-SNAPSHOT
+
+
+ org.apache.flex.flexjs.compiler
debugger
0.8.0-SNAPSHOT
@@ -458,9 +460,6 @@
single
-
-src/main/assembly/filter.properties
-
src/main/assembly/bin.xml
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/src/main/assembly/component-air.xml
--
diff --git a/distribution/src/main/assembly/component-air.xml
b/distribution/src/main/assembly/component-air.xml
index d2a9636..e24c2f4 100644
--- a/distribution/src/main/assembly/component-air.xml
+++ b/distribution/src/main/assembly/component-air.xml
@@ -23,6 +23,9 @@ under the License.
false
lib
+
+
+
${artifact.artifactId}.${artifact.extension}
com.adobe.air.compiler:adt:jar
@@ -38,6 +41,13 @@ under the License.
true
+
+ false
+ frameworks
+
+
+
+
false
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/src/main/assembly/component-fontkit.xml
--
diff --git a/distribution/src/main/assembly/component-fontkit.xml
b/distribution/src/main/assembly/component-fontkit.xml
index 0b6a026..625535a 100644
--- a/distribution/src/main/assembly/component-fontkit.xml
+++ b/distribution/src/main/assembly/component-fontkit.xml
@@ -22,6 +22,9 @@ under the License.
false
lib
+
+
+
${artifact.artifactId}.${artifact.extension}
com.adobe:fontkit
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4448b422/distribution/src/main/assembly/component.xml
--
diff --git a/distribution/src/main/assembly/component.xml
b/distribution/src/main/assembly/component.xml
index cb86030..3293692 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/m
[03/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - SVG elements don't respond to className string assignments, so use polymorphism and assign class instead.
SVG elements don't respond to className string assignments, so use polymorphism
and assign class instead.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/66b2fcb8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/66b2fcb8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/66b2fcb8
Branch: refs/heads/develop
Commit: 66b2fcb87b541afc65f700c26a8c40b9dfd6e72e
Parents: d5fd8e9
Author: yishayw
Authored: Sun Oct 30 12:52:19 2016 +0200
Committer: yishayw
Committed: Sun Oct 30 12:52:19 2016 +0200
--
.../Core/src/main/flex/org/apache/flex/core/UIBase.as | 9 -
.../main/flex/org/apache/flex/svg/GraphicContainer.as | 5 +
.../src/main/flex/org/apache/flex/svg/GraphicShape.as | 14 ++
3 files changed, 23 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66b2fcb8/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
index 2a9ce3e..0e4a988 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/UIBase.as
@@ -945,12 +945,19 @@ package org.apache.flex.core
{
COMPILE::JS
{
-element.className = typeNames ? value + ' ' + typeNames :
value;
+setClassName(typeNames ? value + ' ' + typeNames : value);
}
_className = value;
dispatchEvent(new Event("classNameChanged"));
}
}
+
+ COMPILE::JS
+ protected function setClassName(value:String):void
+ {
+ element.className = value;
+ }
+
/**
* @copy org.apache.flex.core.Application#beads
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66b2fcb8/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
index 3e8e40e..709d6ea 100644
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
+++
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as
@@ -67,6 +67,11 @@ package org.apache.flex.svg
return element;
}
+ COMPILE::JS
+ override protected function setClassName(value:String):void
+ {
+ element.setAttribute('class', value);
+ }
override public function get
transformElement():org.apache.flex.core.WrappedHTMLElement
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66b2fcb8/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
--
diff --git
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
index 06b5585..8f9e326 100644
---
a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
+++
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
@@ -17,10 +17,10 @@ package org.apache.flex.svg
COMPILE::SWF
{
import flash.display.Graphics;
-import flash.display.Sprite;
-import flash.geom.Point;
-import flash.geom.Rectangle;
-import org.apache.flex.core.WrappedSprite;
+ import flash.display.Sprite;
+ import flash.geom.Point;
+ import flash.geom.Rectangle;
+ import org.apache.flex.core.WrappedSprite;
}
COMPILE::JS
{
@@ -177,6 +177,12 @@ package org.apache.flex.svg
return fillStr + ';' + strokeStr;
}
+ COMPILE::JS
+ override protected function setClassName(value:String):void
+ {
+ element.setAttribute('class', value);
+ }
+
/**
* @param x X position.
[27/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - move implementation classes to HTML so variants can exist in other SWCs
move implementation classes to HTML so variants can exist in other SWCs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/efd9dcad
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/efd9dcad
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/efd9dcad
Branch: refs/heads/develop
Commit: efd9dcad4ca87c3050f4ee84810f08577f0e4118
Parents: 21c9340
Author: Alex Harui
Authored: Thu Oct 27 15:48:16 2016 -0700
Committer: Alex Harui
Committed: Tue Nov 1 07:46:52 2016 -0700
--
.../flex/org/apache/flex/core/Application.as| 560 ---
.../org/apache/flex/core/ApplicationBase.as | 109
.../flex/org/apache/flex/core/ContainerBase.as | 453 ---
.../flex/core/ContainerBaseStrandChildren.as| 99
.../org/apache/flex/core/FilledRectangle.as | 125 -
.../main/flex/org/apache/flex/core/ListBase.as | 126 -
.../apache/flex/core/ListBaseStrandChildren.as | 100
.../src/main/flex/org/apache/flex/core/View.as | 34 --
.../main/flex/org/apache/flex/core/ViewBase.as | 97
.../flex/org/apache/flex/core/Application.as| 560 +++
.../org/apache/flex/core/ApplicationBase.as | 109
.../flex/org/apache/flex/core/ContainerBase.as | 453 +++
.../flex/core/ContainerBaseStrandChildren.as| 99
.../org/apache/flex/core/FilledRectangle.as | 125 +
.../main/flex/org/apache/flex/core/ListBase.as | 126 +
.../apache/flex/core/ListBaseStrandChildren.as | 100
.../src/main/flex/org/apache/flex/core/View.as | 34 ++
.../main/flex/org/apache/flex/core/ViewBase.as | 97
18 files changed, 1703 insertions(+), 1703 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/efd9dcad/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
deleted file mode 100644
index 0a9c69a..000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
+++ /dev/null
@@ -1,560 +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 org.apache.flex.core
-{
-import org.apache.flex.events.Event;
-import org.apache.flex.events.IEventDispatcher;
-import org.apache.flex.events.MouseEvent;
-import org.apache.flex.events.utils.MouseEventConverter;
-import org.apache.flex.utils.MXMLDataInterpreter;
-import org.apache.flex.utils.Timer;
-
-COMPILE::SWF {
-import flash.display.DisplayObject;
-import flash.display.Graphics;
-import flash.display.Sprite;
- import flash.events.Event;
-import flash.system.ApplicationDomain;
-import flash.utils.getQualifiedClassName;
-}
-
-//--
-// Events
-//--
-
-/**
- * Dispatched at startup. Attributes and sub-instances of
- * the MXML document have been created and assigned.
- * The component lifecycle is different
- * than the Flex SDK. There is no creationComplete event.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
-[Event(name="initialize", type="org.apache.flex.events.Event")]
-
-/**
- * Dispatched at startup before the instances get created.
- * Beads can call preventDefault and defer initialization.
- * This event will be dispatched on every frame until no
- * listeners call preventDefault(), then the initialize()
- * method will be called.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
-
[20/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
new file mode 100644
index 000..3150e7a
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/CSSTextButtonView.as
@@ -0,0 +1,350 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import flash.display.DisplayObject;
+ import flash.display.Loader;
+ import flash.display.Shape;
+ import flash.display.SimpleButton;
+ import flash.display.Sprite;
+ import flash.events.Event;
+ import flash.net.URLRequest;
+ import flash.text.TextField;
+ import flash.text.TextFieldType;
+
+import org.apache.flex.core.BeadViewBase;
+ import org.apache.flex.core.CSSTextField;
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ITextModel;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.html.TextButton;
+ import org.apache.flex.utils.CSSUtils;
+import org.apache.flex.utils.SolidBorderUtil;
+import org.apache.flex.utils.StringTrimmer;
+
+/**
+ * The CSSTextButtonView class is the default view for
+ * the org.apache.flex.html.TextButton class.
+ * It allows the look of the button to be expressed
+ * in CSS via the background-image style and displays
+ * a text label. This view does not support right-to-left
+ * text.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class CSSTextButtonView extends BeadViewBase implements IBeadView
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function CSSTextButtonView()
+ {
+ upSprite = new Sprite();
+ downSprite = new Sprite();
+ overSprite = new Sprite();
+ upTextField = new CSSTextField();
+ downTextField = new CSSTextField();
+ overTextField = new CSSTextField();
+ upTextField.selectable = false;
+ upTextField.type = TextFieldType.DYNAMIC;
+ downTextField.selectable = false;
+ downTextField.type = TextFieldType.DYNAMIC;
+ overTextField.selectable = false;
+ overTextField.type = TextFieldType.DYNAMIC;
+ upTextField.autoSize = "left";
+ downTextField.autoSize = "left";
+ overTextField.autoSize = "left";
+ upSprite.addChild(upTextField);
+ downSprite.addChild(downTextField);
+ overSprite.addChild(overTextField);
+ }
+
+ private var textModel:ITextModel;
+
+ private var shape:Shape;
+
+/**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+
[12/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.as
new file mode 100644
index 000..01dd3e9
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageAndTextModel.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 org.apache.flex.html.beads.models
+{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ITextModel;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.events.IEventDispatcher;
+
+/**
+ * The ImageAndTextModel class is associates and image
+ * with some text.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class ImageAndTextModel extends TextModel
+ {
+/**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ImageAndTextModel()
+ {
+ }
+
+
+private var _image:String;
+
+/**
+ * The URL of an icon to use in the button
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+public function get image():String
+{
+return _image;
+}
+
+/**
+ * @private
+ */
+public function set image(value:String):void
+{
+_image = value;
+dispatchEvent(new Event("imageChange"));
+}
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
new file mode 100644
index 000..7742c2b
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ImageModel.as
@@ -0,0 +1,89 @@
+
+//
+// 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 org.apache.flex.html.beads.models
+{
+ import org.apache.flex.core.IImageModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.
[18/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - try to copy HTML to Basic without losing history
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
new file mode 100644
index 000..91d1838
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IGraphicsDrawing.as
@@ -0,0 +1,36 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+/**
+ * The IGraphicsDrawing interface is a marker interface for beads
+ * that draw into the graphics layer. This helps a bead determine
+ * if it is the first of many graphics drawing beads so it can
+ * know whether or not to clear the graphics layer before drawing.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface IGraphicsDrawing
+ {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
--
diff --git
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
new file mode 100644
index 000..f9159ce
--- /dev/null
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IListView.as
@@ -0,0 +1,48 @@
+
+//
+// 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 org.apache.flex.html.beads
+{
+ import org.apache.flex.core.IBeadView;
+ import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IStrand;
+
+ /**
+* The IListView interface provides the protocol for any bead that
+* creates the visual parts for a org.apache.flex.html.List control.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ public interface IListView extends IBeadView
+ {
+ /**
+* The component which parents all of the itemRenderers for
each
+* datum being displayed by the List component.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion FlexJS 0.0
+*/
+ function get dataGroup():IItemRendererParent;
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d8221452/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/IScrollBarView.as
--
diff --git
a/frameworks/proj
[48/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'refactor-sprite' into develop
Merge branch 'refactor-sprite' into develop Conflicts: frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/ListBase.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleApplication.as frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicContainer.as Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/956037ae Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/956037ae Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/956037ae Branch: refs/heads/develop Commit: 956037aec4a12620d4bbc29005e9043a83125f49 Parents: ecd8e10 1b6c3af Author: Alex Harui Authored: Tue Nov 1 23:20:17 2016 -0700 Committer: Alex Harui Committed: Tue Nov 1 23:20:17 2016 -0700 -- .../CordovaCameraExample/src/MyInitialView.mxml | 2 +- .../DataGridExample/src/models/ProductsModel.as | 15 +- .../src/products/ProductItemRenderer.as | 2 +- .../flexjs/FlexJSStore/src/FlexJSStore.mxml | 2 +- examples/flexjs/FlexJSStore/src/HomeView.mxml | 8 +- .../flexjs/FlexJSStore/src/SupportView.mxml | 6 +- .../FlexJSStore/src/productsView/Grip.mxml | 4 +- .../productsView/ProductCatalogThumbnail.mxml | 2 +- .../src/productsView/ProductDetails.mxml| 2 +- .../src/productsView/ProductListItem.mxml | 2 +- .../src/samples/flexstore/ProductThumbEvent.as | 18 +- .../FlexJSStore_jquery/src/FlexJSStore.mxml | 2 +- .../flexjs/FlexJSStore_jquery/src/HomeView.mxml | 10 +- .../FlexJSStore_jquery/src/SupportView.mxml | 6 +- .../src/productsView/Grip.mxml | 4 +- .../productsView/ProductCatalogThumbnail.mxml | 2 +- .../src/productsView/ProductDetails.mxml| 2 +- .../src/productsView/ProductListItem.mxml | 2 +- .../flexjs/MobileTrader/src/MyInitialView.mxml | 2 +- frameworks/build.xml| 1 - .../Basic/src/main/flex/BasicClasses.as | 5 +- .../flex/org/apache/flex/core/Application.as| 46 +- .../flex/org/apache/flex/core/ContainerBase.as | 20 +- .../flex/core/ContainerBaseStrandChildren.as| 10 +- .../org/apache/flex/core/FilledRectangle.as | 2 +- .../org/apache/flex/core/HTMLElementWrapper.as | 265 +++ .../main/flex/org/apache/flex/core/ImageBase.as | 84 .../main/flex/org/apache/flex/core/ListBase.as | 10 +- .../apache/flex/core/ListBaseStrandChildren.as | 12 +- .../main/flex/org/apache/flex/core/UIBase.as| 70 ++- .../flex/org/apache/flex/core/UIButtonBase.as | 17 +- .../src/main/flex/org/apache/flex/html/Image.as | 8 +- .../org/apache/flex/html/beads/ComboBoxView.as | 3 +- .../org/apache/flex/html/beads/ContainerView.as | 11 +- .../apache/flex/html/beads/DropDownListView.as | 3 +- .../org/apache/flex/html/beads/ImageView.as | 181 +--- .../apache/flex/html/beads/SliderThumbView.as | 2 +- .../apache/flex/html/beads/WebBrowserView.as| 2 +- .../flex/html/beads/layouts/HorizontalLayout.as | 3 +- .../apache/flex/html/beads/models/ImageModel.as | 12 +- .../html/supportClasses/ContainerContentArea.as | 5 +- .../flex/html/supportClasses/DataGroup.as | 5 +- .../html/supportClasses/ScrollingViewport.as| 5 +- .../supportClasses/TextFieldItemRenderer.as | 16 + .../flex/org/apache/flex/svg/BinaryImage.as | 87 .../org/apache/flex/svg/GraphicContainer.as | 22 +- .../flex/org/apache/flex/svg/GraphicShape.as| 6 +- ...
