You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/01 03:12:59 UTC
[6/7] git commit: [flex-falcon] [refs/heads/dual] - hashmaps iterate
in different orders on different Java versions,
so sort the list so tests will ass
hashmaps iterate in different orders on different Java versions, so sort the list so tests will ass
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7137de6b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7137de6b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7137de6b
Branch: refs/heads/dual
Commit: 7137de6b19cd11630ee1ef29f7a9164166e35b10
Parents: 3f9ed83
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 24 00:17:35 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 24 00:17:35 2017 -0700
----------------------------------------------------------------------
.../compiler/internal/codegen/js/jx/PackageHeaderEmitter.java | 6 ++++++
.../compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7137de6b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
index 5c9c91c..0f1d0cd 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -154,8 +154,14 @@ public class PackageHeaderEmitter extends JSSubEmitter implements
HashMap<String, String> internalClasses = getEmitter().getModel().getInternalClasses();
if (internalClasses.size() > 0)
{
+ ArrayList<String> classesInOrder = new ArrayList<String>();
for (String internalClass : internalClasses.keySet())
{
+ classesInOrder.add(internalClass);
+ }
+ Collections.sort(classesInOrder);
+ for (String internalClass : classesInOrder)
+ {
/* goog.provide('x');\n\n */
write(JSGoogEmitterTokens.GOOG_PROVIDE);
write(ASEmitterTokens.PAREN_OPEN);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7137de6b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
index 01932d0..f9afc81 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
@@ -1000,8 +1000,8 @@ public class TestFlexJSPackage extends TestGoogPackage
" */\n" +
"\n" +
"goog.provide('foo.bar.baz.A');\n" +
- "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"goog.provide('foo.bar.baz.A.ITestInterface');\n" +
+ "goog.provide('foo.bar.baz.A.InternalClass');\n" +
"\n" +
"\n" +
"\n" +