Repository: flex-falcon Updated Branches: refs/heads/develop 02566ca74 -> 9c8d336cc
sort order of entries so tests don't fail Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9c8d336c Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9c8d336c Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9c8d336c Branch: refs/heads/develop Commit: 9c8d336cc8936b97cc420d369fed9edb49adf6ca Parents: 02566ca Author: Alex Harui <aha...@apache.org> Authored: Fri Jan 13 12:37:38 2017 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Fri Jan 13 12:37:38 2017 -0800 ---------------------------------------------------------------------- .../internal/codegen/js/jx/BindableEmitter.java | 16 +++++++++- .../codegen/js/flexjs/TestFlexJSClass.java | 33 ++++++++++---------- 2 files changed, 32 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c8d336c/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BindableEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BindableEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BindableEmitter.java index 8f26835..314b637 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BindableEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/BindableEmitter.java @@ -32,7 +32,11 @@ import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; +import java.util.ArrayList; +import java.util.Comparator; import java.util.Map.Entry; +import java.util.Collections; +import java.util.Set; public class BindableEmitter extends JSSubEmitter implements ISubEmitter<IClassDefinition> @@ -230,7 +234,17 @@ public class BindableEmitter extends JSSubEmitter implements writeNewline(ASEmitterTokens.BLOCK_OPEN); boolean firstTime = true; - for (Entry<String,BindableVarInfo> var : getModel().getBindableVars().entrySet()) + Set<Entry<String,BindableVarInfo>> entries = getModel().getBindableVars().entrySet(); + ArrayList<Entry<String,BindableVarInfo>> listOfEntries = new ArrayList<Entry<String,BindableVarInfo>>(); + listOfEntries.addAll(entries); + class CustomComparator implements Comparator<Entry<String,BindableVarInfo>> { + @Override + public int compare(Entry<String,BindableVarInfo> o1, Entry<String,BindableVarInfo> o2) { + return o1.getKey().compareTo(o2.getKey()); + } + } + Collections.sort(listOfEntries, new CustomComparator()); + for (Entry<String,BindableVarInfo> var : listOfEntries) { if (!var.getValue().isStatic) { if (firstTime) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9c8d336c/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java index a6f4787..bb03418 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java @@ -256,6 +256,23 @@ public class TestFlexJSClass extends TestGoogClass " */\n" + "org.apache.flex.A.prototype.e;Object.defineProperties(org.apache.flex.A.prototype, /** @lends {org.apache.flex.A.prototype} */ {\n" + "/** @export\n" + + " * @type {Object} */\n" + + "a: {\n" + + "/** @this {org.apache.flex.A} */\n" + + " get: function() {\n" + + " return this.a_;\n" + + " },\n" + + "\n" + + "/** @this {org.apache.flex.A} */\n" + + "set: function(value) {\n" + + "if (value != this.a_) {\n" + + " var oldValue = this.a_;\n" + + " this.a_ = value;\n" + + " this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" + + " this, \"a\", oldValue, value));\n" + + "}\n" + + "}}," + + "/** @export\n" + " * @private\n" + " * @type {string} */\n" + "b: {\n" + @@ -289,22 +306,6 @@ public class TestFlexJSClass extends TestGoogClass " this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" + " this, \"c\", oldValue, value));\n" + "}\n" + - "}},/** @export\n" + - " * @type {Object} */\n" + - "a: {\n" + - "/** @this {org.apache.flex.A} */\n" + - " get: function() {\n" + - " return this.a_;\n" + - " },\n" + - "\n" + - "/** @this {org.apache.flex.A} */\n" + - "set: function(value) {\n" + - "if (value != this.a_) {\n" + - " var oldValue = this.a_;\n" + - " this.a_ = value;\n" + - " this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" + - " this, \"a\", oldValue, value));\n" + - "}\n" + "}}}\n" + ");"); }