Repository: flex-falcon Updated Branches: refs/heads/develop 88578e4fe -> a04e8accb
get tests to pass on windows Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a04e8acc Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a04e8acc Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a04e8acc Branch: refs/heads/develop Commit: a04e8accb551567bb9f356a48c354ee3f19eeabd Parents: 88578e4 Author: Alex Harui <[email protected]> Authored: Mon Oct 5 06:23:23 2015 +0100 Committer: Alex Harui <[email protected]> Committed: Mon Oct 5 06:23:23 2015 +0100 ---------------------------------------------------------------------- .../test-files/vf2js/projects/sdk/SomeSDKClass_result.js | 2 +- .../compiler/internal/codegen/js/jx/PackageHeaderEmitter.java | 5 ++++- .../flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java | 3 +++ .../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a04e8acc/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js b/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js index d193945..fd32667 100644 --- a/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js +++ b/compiler.jx.tests/test-files/vf2js/projects/sdk/SomeSDKClass_result.js @@ -21,8 +21,8 @@ goog.provide('SomeSDKClass'); -goog.require('mx.core.mx_internal'); goog.require('bases.HelperBaseClass'); +goog.require('mx.core.mx_internal'); goog.require('org.apache.flex.utils.Language'); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a04e8acc/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java index 21ec30f..0bbd191 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java @@ -21,6 +21,7 @@ package org.apache.flex.compiler.internal.codegen.js.jx; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.apache.flex.compiler.asdoc.flexjs.ASDocComment; @@ -144,13 +145,14 @@ public class PackageHeaderEmitter extends JSSubEmitter implements .getCompilationUnitForDefinition(type); ArrayList<String> requiresList = flexProject.getRequires(cu); ArrayList<String> interfacesList = flexProject.getInterfaces(cu); - + String cname = type.getQualifiedName(); writtenRequires.add(cname); // make sure we don't add ourselves boolean emitsRequires = false; if (requiresList != null) { + Collections.sort(requiresList); for (String imp : requiresList) { if (imp.contains(JSGoogEmitterTokens.AS3.getToken())) @@ -184,6 +186,7 @@ public class PackageHeaderEmitter extends JSSubEmitter implements boolean emitsInterfaces = false; if (interfacesList != null) { + Collections.sort(interfacesList); for (String imp : interfacesList) { if (writtenRequires.indexOf(imp) == -1) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a04e8acc/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java index 55c5f9e..fceccc2 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java @@ -22,6 +22,7 @@ package org.apache.flex.compiler.internal.codegen.js.vf2js; import java.io.FilterWriter; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -1542,6 +1543,7 @@ public class JSVF2JSEmitter extends JSGoogEmitter implements IJSVF2JSEmitter boolean emitsRequires = false; if (requiresList != null) { + Collections.sort(requiresList); for (String imp : requiresList) { if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1) @@ -1575,6 +1577,7 @@ public class JSVF2JSEmitter extends JSGoogEmitter implements IJSVF2JSEmitter boolean emitsInterfaces = false; if (interfacesList != null) { + Collections.sort(interfacesList); for (String imp : interfacesList) { write(JSGoogEmitterTokens.GOOG_REQUIRE); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a04e8acc/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 12aafab..da9becf 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 @@ -23,6 +23,7 @@ package org.apache.flex.compiler.internal.codegen.mxml.flexjs; import java.io.File; import java.io.FilterWriter; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -1813,6 +1814,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements if (deps != null) { + Collections.sort(deps); for (String imp : deps) { if (imp.indexOf(JSGoogEmitterTokens.AS3.getToken()) != -1)
