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/2d0adbb1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2d0adbb1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2d0adbb1 Branch: refs/heads/develop Commit: 2d0adbb1ab0293d343b4ae077971171a8abee6eb Parents: 08846be Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Sun May 31 19:47:38 2015 +0200 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Sun May 31 19:47:38 2015 +0200 ---------------------------------------------------------------------- .../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/2d0adbb1/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/2d0adbb1/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/2d0adbb1/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) {