From d99e251a1d17c5c9fd318657eafc5bf19bdb2653 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 7 Jul 2010 14:54:50 +0400
Subject: [PATCH] favorites view: sort by type (IDEA-55967)

---
 .../FavoritesComparator.java                  | 90 ++-----------------
 .../FavoritesProjectViewPane.java             |  2 +-
 .../impl/GroupByTypeComparator.java           |  2 +-
 3 files changed, 8 insertions(+), 86 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesComparator.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesComparator.java
index ae9cbfd0501b..e35fa26b3ca9 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesComparator.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesComparator.java
@@ -8,99 +8,21 @@
  */
 package com.intellij.ide.favoritesTreeView;
 
-import com.intellij.ide.projectView.impl.ModuleGroup;
-import com.intellij.ide.projectView.impl.nodes.LibraryGroupElement;
-import com.intellij.ide.projectView.impl.nodes.NamedLibraryElement;
+import com.intellij.ide.projectView.ProjectView;
+import com.intellij.ide.projectView.impl.GroupByTypeComparator;
 import com.intellij.ide.util.treeView.NodeDescriptor;
-import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.SmartPsiElementPointer;
 
-import java.util.Comparator;
+public class FavoritesComparator extends GroupByTypeComparator {
 
-public class FavoritesComparator implements Comparator<NodeDescriptor> {
-  private final FavoriteNodeProvider[] myNodeProviders;
-  private final boolean mySortByType;
-
-  public FavoritesComparator(final boolean sortByType, final Project project) {
-    mySortByType = sortByType;
-    myNodeProviders = Extensions.getExtensions(FavoriteNodeProvider.EP_NAME, project);
-  }
-
-  private int getWeight(NodeDescriptor descriptor) {
-    FavoritesTreeNodeDescriptor favoritesTreeNodeDescriptor = (FavoritesTreeNodeDescriptor)descriptor;
-    Object value = favoritesTreeNodeDescriptor.getElement().getValue();
-    if (value instanceof SmartPsiElementPointer){
-      value = ((SmartPsiElementPointer)value).getElement();
-    }
-    if (value instanceof ModuleGroup){
-      return 0;
-    }
-    if (value instanceof Module){
-      return 1;
-    }
-    if (value instanceof PsiDirectory){
-      return 2;
-    }
-   
-    if (value instanceof PsiFile){
-      return 6;
-    }
-    if (value instanceof PsiElement){
-      return 7;
-    }
-    if (value instanceof LibraryGroupElement){
-      return 8;
-    }
-    if (value instanceof NamedLibraryElement){
-      return 9;
-    }
-    for(FavoriteNodeProvider provider: myNodeProviders) {
-      int weight = provider.getElementWeight(value, mySortByType);
-      if (weight != -1) return weight;
-    }
-    return 9;
+  public FavoritesComparator(ProjectView projectView, String paneId) {
+    super(projectView, paneId);
   }
 
   public int compare(NodeDescriptor nd1, NodeDescriptor nd2) {
     if (nd1 instanceof FavoritesTreeNodeDescriptor && nd2 instanceof FavoritesTreeNodeDescriptor){
       FavoritesTreeNodeDescriptor fd1 = (FavoritesTreeNodeDescriptor)nd1;
       FavoritesTreeNodeDescriptor fd2 = (FavoritesTreeNodeDescriptor)nd2;
-      int weight1 = getWeight(fd1);
-      int weight2 = getWeight(fd2);
-      if (weight1 != weight2) {
-        if (mySortByType) {
-          if (weight1 < 10) {
-            if (weight2 > 10) {//class kind
-              weight2 = 3;
-            }
-          }
-          else if (weight2 < 10) {
-            if (weight1 > 10) {
-              weight1 = 3;
-            }
-          }
-        }
-        return weight1 - weight2;
-      }
-      String s1 = fd1.toString();
-      String s2 = fd2.toString();
-      if (s1 == null) return s2 == null ? 0 : -1;
-      if (s2 == null) return +1;
-      if (!s1.equals(s2)) {
-        return s1.compareToIgnoreCase(s2);
-      }
-      else {
-        s1 = fd1.getLocation();
-        s2 = fd2.getLocation();
-        if (s1 == null) return s2 == null ? 0 : -1;
-        if (s2 == null) return +1;
-        return s1.compareToIgnoreCase(s2);
-      }
+      return super.compare(fd1.getElement(), fd2.getElement());
     }
     return 0;
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java
index 97e0b8a25aed..cc1ad6ea1de3 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java
@@ -91,7 +91,7 @@ public class FavoritesProjectViewPane extends AbstractProjectViewPane {
 
   public void installComparator() {
     final ProjectView projectView = ProjectView.getInstance(myProject);
-    getTreeBuilder().setNodeDescriptorComparator(new FavoritesComparator(projectView.isSortByType(ID), myProject));
+    getTreeBuilder().setNodeDescriptorComparator(new FavoritesComparator(projectView, ID));
   }
 
   public JComponent createComponent() {
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 f28ba06f9ea2..7b8bb0753383 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
@@ -102,7 +102,7 @@ public class GroupByTypeComparator implements Comparator<NodeDescriptor> {
     return AlphaComparator.INSTANCE.compare(descriptor1, descriptor2);
   }
 
-  private boolean isSortByType() {
+  protected boolean isSortByType() {
     if (myProjectView != null) {
       return myProjectView.isSortByType(myPaneId);
     }