Commit 9797fe5b authored by Ahmed Ashour's avatar Ahmed Ashour Committed by skylot

fix(gui): sort resources according to their type, then name (PR #479)

parent 6d052d39
...@@ -3,6 +3,7 @@ package jadx.gui.treemodel; ...@@ -3,6 +3,7 @@ package jadx.gui.treemodel;
import javax.swing.*; import javax.swing.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -68,6 +69,14 @@ public class JResource extends JLoadableNode implements Comparable<JResource> { ...@@ -68,6 +69,14 @@ public class JResource extends JLoadableNode implements Comparable<JResource> {
} }
} else { } else {
removeAllChildren(); removeAllChildren();
Comparator<JResource> typeComparator
= (r1, r2) -> r1.type.ordinal() - r2.type.ordinal();
Comparator<JResource> nameComparator
= Comparator.comparing(JResource::getName, String.CASE_INSENSITIVE_ORDER);
files.sort(typeComparator.thenComparing(nameComparator));
for (JResource res : files) { for (JResource res : files) {
res.update(); res.update();
add(res); add(res);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment