LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-08 11:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1189 Sort imports to have same order always

Browse Source
This commit is contained in:
Jindra Petřík
2016-08-16 20:45:43 +02:00
parent 5024093c54
commit ebedbd9523
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
View File

@@ -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();

7
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java
View File

@@ -28,7 +28,7 @@ import java.util.List;
*
* @author JPEXS
*/
public class DottedChain implements Serializable {
public class DottedChain implements Serializable, Comparable<DottedChain> {
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());
}
}