flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ftho...@apache.org
Subject [20/35] git commit: [flex-falcon] [refs/heads/IDEA-FLEX_JS_COMPILER] - Revert "Bypass FlexJS' new underscored namespace convention"
Date Tue, 02 Jun 2015 12:42:27 GMT
Revert "Bypass FlexJS' new underscored namespace convention"

This reverts commit a388b191544e7fee7d999b0301d2e4a0b8f1f939.


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

Branch: refs/heads/IDEA-FLEX_JS_COMPILER
Commit: da5a71483c68e954cf15d8b5101e7ded4627cb96
Parents: 11fe07b
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Sun May 31 19:47:38 2015 +0200
Committer: Frédéric THOMAS <webdoublefx@gmail.com>
Committed: Tue Jun 2 13:40:57 2015 +0100

----------------------------------------------------------------------
 .../codegen/js/vf2js/JSVF2JSDocEmitter.java     | 48 --------------------
 .../codegen/mxml/vf2js/MXMLVF2JSEmitter.java    |  2 +-
 .../codegen/mxml/vf2js/MXMLVF2JSPublisher.java  |  2 +-
 3 files changed, 2 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/da5a7148/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
index f731c2b..c0a1241 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
@@ -40,7 +40,6 @@ import org.apache.flex.compiler.projects.ICompilerProject;
 import org.apache.flex.compiler.tree.as.IDefinitionNode;
 import org.apache.flex.compiler.tree.as.IExpressionNode;
 import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
 import org.apache.flex.compiler.tree.as.IParameterNode;
 import org.apache.flex.compiler.tree.as.IVariableNode;
 
@@ -53,41 +52,6 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter
     }
 
     @Override
-    public void emitInterfaceDoc(IInterfaceNode node, ICompilerProject project)
-    {
-        begin();
-
-        emitJSDocLine(JSEmitterTokens.INTERFACE.getToken());
-
-        boolean hasQualifiedNames = true;
-        IExpressionNode[] inodes = node.getExtendedInterfaceNodes();
-        for (IExpressionNode inode : inodes)
-        {
-            IDefinition dnode = inode.resolve(project);
-            if (dnode != null)
-            {
-                emitJSDocLine(ASEmitterTokens.EXTENDS, dnode.getQualifiedName());
-            }
-            else
-            {
-                hasQualifiedNames = false;
-                break;
-            }
-        }
-        
-        if (!hasQualifiedNames)
-        {
-            String[] inames = node.getExtendedInterfaces();
-            for (String iname : inames)
-            {
-                emitJSDocLine(ASEmitterTokens.EXTENDS, iname);
-            }
-        }
-
-        end();
-    }
-
-    @Override
     public void emitMethodDoc(IFunctionNode node, ICompilerProject project)
     {
         IClassDefinition classDefinition = resolveClassDefinition(node);
@@ -304,16 +268,4 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter
             emitPublic(node);
         }
     }
-
-    @Override
-    public void emitExtends(IClassDefinition superDefinition, String packageName)
-    {
-        emitJSDocLine(ASEmitterTokens.EXTENDS, superDefinition.getQualifiedName());
-    }
-
-    @Override
-    public void emitImplements(ITypeDefinition definition, String packageName)
-    {
-        emitJSDocLine(ASEmitterTokens.IMPLEMENTS, definition.getQualifiedName());
-    }
 }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/da5a7148/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
index 209916a..e56a654 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java
@@ -1495,7 +1495,7 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements
         if (project.mainCU != null &&
                 cu.getName().equals(project.mainCU.getName()))
         {
-            emitHeaderLine("org.apache.flex.utils.Language");
+            emitHeaderLine(JSFlexJSEmitterTokens.LANGUAGE_QNAME.getToken());
         }
 
         writeNewline();

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/da5a7148/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
index 5adbc90..164806c 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
@@ -205,7 +205,7 @@ public class MXMLVF2JSPublisher extends JSGoogPublisher implements
                 + File.separator + outputFileName;
 
         appendExportSymbol(projectIntermediateJSFilePath, projectName);
-        //appendEncodedCSS(projectIntermediateJSFilePath, projectName);
+        appendEncodedCSS(projectIntermediateJSFilePath, projectName);
 
         if (!subsetGoog)
         {


Mime
View raw message