flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [02/17] git commit: [flex-falcon] [refs/heads/develop] - 'goog.require' for super classes were causing circular dependencies in SDK
Date Fri, 21 Nov 2014 12:10:22 GMT
'goog.require' for super classes were causing circular dependencies in SDK

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/16c4b3e6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/16c4b3e6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/16c4b3e6

Branch: refs/heads/develop
Commit: 16c4b3e6f8f42369a27ad8497744e220c7326918
Parents: 92a5dfe
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Fri Nov 21 11:39:54 2014 +0100
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Fri Nov 21 11:39:54 2014 +0100

----------------------------------------------------------------------
 .../org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/16c4b3e6/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
index 5bb4013..4d625d4 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java
@@ -174,7 +174,7 @@ public class VF2JSDepsWriter {
                 		Charset.defaultCharset());
                 ArrayList<String> finalLines = new ArrayList<String>();
                 
-                String inherits = getBaseClass(fileLines, className);
+                //String inherits = getBaseClass(fileLines, className);
                 
                 for (String line : fileLines)
                 {
@@ -183,7 +183,7 @@ public class VF2JSDepsWriter {
                     {
                         int c2 = line.indexOf(")");
                         String s = line.substring(c + 14, c2 - 1);
-                        if (circulars.contains(s) && !s.equals(inherits))
+                        if (circulars.contains(s) /* && !s.equals(inherits) */ )
                             continue;
                     }
                     finalLines.add(line);


Mime
View raw message