You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ft...@apache.org on 2015/06/02 14:42:22 UTC
[15/35] git commit: [flex-falcon] [refs/heads/IDEA-FLEX_JS_COMPILER]
- Bypass FlexJS' new underscored namespace convention
Bypass FlexJS' new underscored namespace convention
Signed-off-by: Erik de Bruin <er...@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/cfc1a336
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cfc1a336
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cfc1a336
Branch: refs/heads/IDEA-FLEX_JS_COMPILER
Commit: cfc1a3367ba0ade2d3159e01b62503dfcbbd40ad
Parents: e7636ff
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Mon Feb 16 12:52:23 2015 +0100
Committer: Frédéric THOMAS <we...@gmail.com>
Committed: Tue Jun 2 13:40:40 2015 +0100
----------------------------------------------------------------------
.../codegen/js/vf2js/JSVF2JSDocEmitter.java | 48 ++++++++++++++++++++
.../codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 2 +-
.../codegen/mxml/vf2js/MXMLVF2JSPublisher.java | 2 +-
3 files changed, 50 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cfc1a336/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 c0a1241..f731c2b 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,6 +40,7 @@ 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;
@@ -52,6 +53,41 @@ 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);
@@ -268,4 +304,16 @@ 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/cfc1a336/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 5c2aae0..d18f626 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
@@ -1492,7 +1492,7 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements
if (project.mainCU != null &&
cu.getName().equals(project.mainCU.getName()))
{
- emitHeaderLine(JSFlexJSEmitterTokens.LANGUAGE_QNAME.getToken());
+ emitHeaderLine("org.apache.flex.utils.Language");
}
writeNewline();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cfc1a336/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 164806c..5adbc90 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)
{