diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java index a7f082a54..6c93a773d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java @@ -54,6 +54,7 @@ import java.io.Serializable; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -264,6 +265,7 @@ public abstract class Trait implements Cloneable, Serializable { } boolean hasImport = false; + Collections.sort(imports); for (DottedChain imp : imports) { if (imp.size() > 1) { //No imports from root package writer.appendNoHilight("import " + imp.toPrintableString(true) + ";").newLine(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java index b2f27a692..83831c68a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java @@ -28,7 +28,7 @@ import java.util.List; * * @author JPEXS */ -public class DottedChain implements Serializable { +public class DottedChain implements Serializable, Comparable { public static final DottedChain EMPTY = new DottedChain(true); @@ -278,4 +278,9 @@ public class DottedChain implements Serializable { return true; } + + @Override + public int compareTo(DottedChain o) { + return toRawString().compareTo(o.toRawString()); + } }