You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/04/03 06:38:07 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - MXML output
wasn't including interface impls
Repository: flex-falcon
Updated Branches:
refs/heads/develop 4930a2a57 -> c5286f512
MXML output wasn't including interface impls
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/da2d6923
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/da2d6923
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/da2d6923
Branch: refs/heads/develop
Commit: da2d6923702c70880a35e675ac0be6bd41b06d84
Parents: 4930a2a
Author: Alex Harui <ah...@apache.org>
Authored: Sun Apr 2 23:25:10 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Apr 2 23:25:10 2017 -0700
----------------------------------------------------------------------
.../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/da2d6923/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 74fa0a5..573e0ff 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -691,6 +691,14 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
writeNewline("/**");
writeNewline(" * @constructor");
writeNewline(" * @extends {" + formatQualifiedName(baseClassName) + "}");
+ if (interfaceList != null && interfaceList.length() > 0)
+ {
+ String[] interfaces = interfaceList.split(",");
+ for (String iface : interfaces)
+ {
+ writeNewline(" * @implements {" + formatQualifiedName(iface.trim()) + "}");
+ }
+ }
writeNewline(" */");
writeToken(formatQualifiedName(cname));
writeToken(ASEmitterTokens.EQUAL);
[2/2] git commit: [flex-falcon] [refs/heads/develop] - don't remove
requires for static deps
Posted by ah...@apache.org.
don't remove requires for static deps
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c5286f51
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c5286f51
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c5286f51
Branch: refs/heads/develop
Commit: c5286f512ac2d9addbaccd489451a6e42f47e666
Parents: da2d692
Author: Alex Harui <ah...@apache.org>
Authored: Sun Apr 2 23:26:25 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Apr 2 23:26:25 2017 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/internal/graph/GoogDepsWriter.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c5286f51/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
index 9d3439f..6065efc 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
@@ -415,10 +415,11 @@ public class GoogDepsWriter {
{
int c2 = line.indexOf(")");
String s = line.substring(c + 14, c2 - 1);
- if (gd.fileInfo.impls == null || !gd.fileInfo.impls.contains(s))
+ if ((gd.fileInfo.impls == null || !gd.fileInfo.impls.contains(s)) &&
+ (gd.fileInfo.staticDeps == null || !gd.fileInfo.staticDeps.contains(s)))
{
- // don't add the require if some class needs it at static initialization
- // time and that class is not this class
+ // don't remove the require if some class needs it at static initialization
+ // time
suppressCount++;
System.out.println(gd.filePath + " removing require: " + s);
if (!firstDependency)