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

cleanup

Browse Source 
GitOrigin-RevId: 4d70ab0081386a1720afec739c0cf621dd39ebc4
This commit is contained in:
Vladimir Krivosheev
2020-01-13 17:08:44 +00:00
committed by intellij-monorepo-bot
parent 480ae9c969
commit eec4ce759e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java
+7 -7
View File
@@ -17,7 +17,7 @@ import static com.intellij.openapi.util.text.StringUtil.naturalCompare;
/**
* @author cdr
*/
public class GroupByTypeComparator implements Comparator<NodeDescriptor> {
public class GroupByTypeComparator implements Comparator<NodeDescriptor<?>> {
private ProjectView myProjectView;
private String myPaneId;
private boolean myForceSortByType;
@@ -34,14 +34,14 @@ public class GroupByTypeComparator implements Comparator<NodeDescriptor> {
@Override
public int compare(NodeDescriptor descriptor1, NodeDescriptor descriptor2) {
if (!isSortByType() && descriptor1 instanceof ProjectViewNode && ((ProjectViewNode) descriptor1).isSortByFirstChild()) {
final Collection<AbstractTreeNode<?>> children = ((ProjectViewNode)descriptor1).getChildren();
Collection<? extends AbstractTreeNode<?>> children = ((ProjectViewNode<?>)descriptor1).getChildren();
if (!children.isEmpty()) {
descriptor1 = children.iterator().next();
descriptor1.update();
}
}
if (!isSortByType() && descriptor2 instanceof ProjectViewNode && ((ProjectViewNode) descriptor2).isSortByFirstChild()) {
final Collection<AbstractTreeNode<?>> children = ((ProjectViewNode)descriptor2).getChildren();
Collection<? extends AbstractTreeNode<?>> children = ((ProjectViewNode<?>)descriptor2).getChildren();
if (!children.isEmpty()) {
descriptor2 = children.iterator().next();
descriptor2.update();
@@ -49,12 +49,12 @@ public class GroupByTypeComparator implements Comparator<NodeDescriptor> {
}
if (descriptor1 instanceof ProjectViewNode && descriptor2 instanceof ProjectViewNode) {
ProjectViewNode node1 = (ProjectViewNode)descriptor1;
ProjectViewNode node2 = (ProjectViewNode)descriptor2;
ProjectViewNode<?> node1 = (ProjectViewNode<?>)descriptor1;
ProjectViewNode<?> node2 = (ProjectViewNode<?>)descriptor2;
if (isManualOrder()) {
final Comparable key1 = node1.getManualOrderKey();
final Comparable key2 = node2.getManualOrderKey();
Comparable key1 = node1.getManualOrderKey();
Comparable key2 = node2.getManualOrderKey();
int result = compare(key1, key2);
if (result != 0) return result;
}