MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: do not fallback to non-transitive node comparator

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-12-17 15:43:55 +03:00
parent e687da4fb5
commit 6fe6d97f5a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java
+7 -4
View File
@@ -53,13 +53,16 @@ public class TreeModelBuilder {
int sortWeightDiff = Comparing.compare(node1.getSortWeight(), node2.getSortWeight());
if (sortWeightDiff != 0) return sortWeightDiff;
if (node1 instanceof Comparable && node1.getClass().equals(node2.getClass())) {
Class<?> clazz1 = node1.getClass();
Class<?> clazz2 = node2.getClass();
if (!clazz1.equals(clazz2)) return Comparing.compare(clazz1.getName(), clazz2.getName());
if (node1 instanceof Comparable) {
return ((Comparable)node1).compareTo(node2);
}
if (!node1.getClass().equals(node2.getClass())) {
return String.CASE_INSENSITIVE_ORDER.compare(node1.getTextPresentation(), node2.getTextPresentation());
else {
return node1.compareUserObjects(node2.getUserObject());
}
return node1.compareUserObjects(node2.getUserObject());
};
protected final static Comparator<FilePath> PATH_COMPARATOR = comparingInt(path -> path.getPath().length());