JavaAdapter (reverting optimization)

source/com/intellij/ide/actions/ViewStructureAction.java

@@ -94,6 +94,8 @@ public class ViewStructureAction extends AnAction implements TreeActionsOwner{
   }
 
   public boolean isActionActive(String name) {
-    return InheritedMembersFilter.ID.equals(name) || KindSorter.ID.equals(name) || Sorter.ALPHA_SORTER_ID.equals(name);
+    return InheritedMembersFilter.ID.equals(name)
+           || KindSorter.ID.equals(name)
+           || Sorter.ALPHA_SORTER_ID.equals(name);
   }
 }

source/com/intellij/ide/structureView/impl/java/KindSorter.java

@@ -51,17 +51,23 @@ public class KindSorter implements Sorter {
 
     private int getWeight(final Object value1) {
       if (value1 instanceof JavaClassTreeElement) {
-        return 1;
+        return 0;
       }
-      else if (value1 instanceof PsiFieldTreeElement) {
+      else if (value1 instanceof SuperTypeGroup) {
         return 2;
       }
       else if (value1 instanceof PsiMethodTreeElement) {
         return 3;
       }
-      else {
+      else if (value1 instanceof PropertyGroup) {
         return 4;
       }
+      else if (value1 instanceof PsiFieldTreeElement) {
+        return 5;
+      }
+      else {
+        return 6;
+      }
     }
   };
 

source/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java

@@ -453,7 +453,7 @@ public class StructureViewComponent extends JPanel implements TreeActionsOwner,
   }
 
   public boolean isActionActive(String name) {
-    return StructureViewFactory.getInstance(myProject).isActionActive(name);
+    return KindSorter.ID.equals(name) || StructureViewFactory.getInstance(myProject).isActionActive(name);
   }
 
   public AbstractTreeStructure getTreeStructure() {