From eec4ce759ea2c86b216896a5d9e78d9b2812c825 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 13 Jan 2020 15:51:42 +0100
Subject: [PATCH] cleanup

GitOrigin-RevId: 4d70ab0081386a1720afec739c0cf621dd39ebc4
---
 .../projectView/impl/GroupByTypeComparator.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java
index 596a06d1ac92..9534506d0f5d 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/GroupByTypeComparator.java
@@ -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;
       }