Repository: flex-falcon Updated Branches: refs/heads/develop e395dcdfc -> bc19c66a4
mainCU can be null in compc Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bc19c66a Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bc19c66a Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bc19c66a Branch: refs/heads/develop Commit: bc19c66a4bc47b366aeb5d158402c4ab91b27c24 Parents: e395dcd Author: Alex Harui <aha...@apache.org> Authored: Wed Apr 13 16:47:15 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Apr 13 17:11:04 2016 -0700 ---------------------------------------------------------------------- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 73 ++++++++++---------- 1 file changed, 38 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bc19c66a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java index 094f5c7..8beba40 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java @@ -208,43 +208,46 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements if (project instanceof FlexJSProject) { FlexJSProject flexJSProject = (FlexJSProject) project; - String mainDef = null; - try { - mainDef = flexJSProject.mainCU.getQualifiedNames().get(0); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - String thisDef = documentDefinition.getQualifiedName(); - if (mainDef != null && mainDef.equals(thisDef)) - { - Set<String> mixins = flexJSProject.config.getIncludes(); - if (mixins.size() > 0) - { - String infoInject = "\n\n" + thisDef + ".prototype.info = function() {\n" + - " return { mixins: ["; - boolean firstOne = true; - for (String mixin : mixins) + if (flexJSProject.mainCU != null) + { + String mainDef = null; + try { + mainDef = flexJSProject.mainCU.getQualifiedNames().get(0); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + String thisDef = documentDefinition.getQualifiedName(); + if (mainDef != null && mainDef.equals(thisDef)) + { + Set<String> mixins = flexJSProject.config.getIncludes(); + if (mixins.size() > 0) { - if (!firstOne) - infoInject += ", "; - infoInject += mixin; - firstOne = false; - StringBuilder appendString = new StringBuilder(); - appendString.append(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); - appendString.append(ASEmitterTokens.PAREN_OPEN.getToken()); - appendString.append(ASEmitterTokens.SINGLE_QUOTE.getToken()); - appendString.append(mixin); - appendString.append(ASEmitterTokens.SINGLE_QUOTE.getToken()); - appendString.append(ASEmitterTokens.PAREN_CLOSE.getToken()); - appendString.append(ASEmitterTokens.SEMICOLON.getToken()); - finalLines.add(endRequires, appendString.toString()); - //addLineToMappings(finalLines.size()); + String infoInject = "\n\n" + thisDef + ".prototype.info = function() {\n" + + " return { mixins: ["; + boolean firstOne = true; + for (String mixin : mixins) + { + if (!firstOne) + infoInject += ", "; + infoInject += mixin; + firstOne = false; + StringBuilder appendString = new StringBuilder(); + appendString.append(JSGoogEmitterTokens.GOOG_REQUIRE.getToken()); + appendString.append(ASEmitterTokens.PAREN_OPEN.getToken()); + appendString.append(ASEmitterTokens.SINGLE_QUOTE.getToken()); + appendString.append(mixin); + appendString.append(ASEmitterTokens.SINGLE_QUOTE.getToken()); + appendString.append(ASEmitterTokens.PAREN_CLOSE.getToken()); + appendString.append(ASEmitterTokens.SEMICOLON.getToken()); + finalLines.add(endRequires, appendString.toString()); + //addLineToMappings(finalLines.size()); + } + infoInject += "]}};"; + finalLines.add(infoInject); + //addLineToMappings(finalLines.size()); } - infoInject += "]}};"; - finalLines.add(infoInject); - //addLineToMappings(finalLines.size()); - } + } } } return Joiner.on("\n").join(finalLines);
