From a72cc80610dd37f45ea7988654e7aca56016a9db Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 31 Jan 2017 18:53:50 +0300 Subject: [PATCH] simplification: use generified TreeUtil.sortRecursively to avoid casts --- .../projectRoot/BaseLibrariesConfigurable.java | 6 +----- .../packageDependencies/ui/TreeModelBuilder.java | 2 +- .../com/intellij/execution/impl/RunConfigurable.java | 6 +++--- .../util/scopeChooser/ScopeChooserConfigurable.java | 11 ++++------- .../moduleDependencies/ModulesDependenciesPanel.java | 4 ++-- .../packageDependencies/ui/FileTreeModelBuilder.java | 2 +- .../ui/SingleInspectionProfilePanel.java | 2 +- .../intellij/openapi/ui/MasterDetailsComponent.java | 2 +- .../ui/tree/BreakpointItemsTreeController.java | 2 +- .../idea/svn/config/SvnConfigureProxiesComponent.java | 2 +- 10 files changed, 16 insertions(+), 23 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java index 8476a7b2519e..66b63934fb1f 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java @@ -149,11 +149,7 @@ public abstract class BaseLibrariesConfigurable extends BaseStructureConfigurabl for (Library library : libraries) { myRoot.add(new MyNode(new LibraryConfigurable(modelProvider, library, myContext, TREE_UPDATER))); } - TreeUtil.sort(myRoot, (o1, o2) -> { - MyNode node1 = (MyNode)o1; - MyNode node2 = (MyNode)o2; - return node1.getDisplayName().compareToIgnoreCase(node2.getDisplayName()); - }); + TreeUtil.sortRecursively(myRoot, (o1, o2) -> o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName())); ((DefaultTreeModel)myTree.getModel()).reload(myRoot); } diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java b/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java index a3ba6f7f8bbc..94902b2d5a35 100644 --- a/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java +++ b/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java @@ -259,7 +259,7 @@ public class TreeModelBuilder { buildingRunnable.run(); } - TreeUtil.sort(myRoot, new DependencyNodeComparator()); + TreeUtil.sortRecursively(myRoot, new DependencyNodeComparator()); return new TreeModel(myRoot, myTotalFileCount, myMarkedFileCount); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index acb25ec67a05..482ab93e958b 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -414,9 +414,9 @@ class RunConfigurable extends BaseConfigurable { private void sortTopLevelBranches() { List expandedPaths = TreeUtil.collectExpandedPaths(myTree); - TreeUtil.sort(myRoot, (o1, o2) -> { - final Object userObject1 = ((DefaultMutableTreeNode)o1).getUserObject(); - final Object userObject2 = ((DefaultMutableTreeNode)o2).getUserObject(); + TreeUtil.sortRecursively(myRoot, (o1, o2) -> { + final Object userObject1 = o1.getUserObject(); + final Object userObject2 = o2.getUserObject(); if (userObject1 instanceof ConfigurationType && userObject2 instanceof ConfigurationType) { return ((ConfigurationType)userObject1).getDisplayName().compareTo(((ConfigurationType)userObject2).getDisplayName()); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java index 633c6fcd158d..ea70b34ab166 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java @@ -119,13 +119,10 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements loadComponentState(); final List order = getScopesState().myOrder; - TreeUtil.sort(myRoot, new Comparator() { - @Override - public int compare(final DefaultMutableTreeNode o1, final DefaultMutableTreeNode o2) { - final int idx1 = order.indexOf(((MyNode)o1).getDisplayName()); - final int idx2 = order.indexOf(((MyNode)o2).getDisplayName()); - return idx1 - idx2; - } + TreeUtil.sortRecursively(myRoot, (o1, o2) -> { + final int idx1 = order.indexOf(o1.getDisplayName()); + final int idx2 = order.indexOf(o2.getDisplayName()); + return idx1 - idx2; }); if (getScopesState().myOrder.size() != myRoot.getChildCount()) { diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java index e431eb424e7b..219065e9c875 100644 --- a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java @@ -187,7 +187,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable { for (Module dependency : getModuleDependencies(module)) { child.add(new DefaultMutableTreeNode(new MyUserObject(isInCycle(dependency), dependency))); } - TreeUtil.sort(child, NODE_COMPARATOR); + TreeUtil.sortRecursively(child, NODE_COMPARATOR); } } } @@ -342,7 +342,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable { } }, AnalysisScopeBundle.message("update.module.tree.progress.title"), true, myProject); - TreeUtil.sort(root, NODE_COMPARATOR); + TreeUtil.sortRecursively(root, NODE_COMPARATOR); ((DefaultTreeModel)myLeftTree.getModel()).reload(); TreeUtil.selectFirstNode(myLeftTree); } diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java index 9fd3edcfaa81..2d4deb5057ee 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java @@ -230,7 +230,7 @@ public class FileTreeModelBuilder { buildingRunnable.run(); } - TreeUtil.sort(myRoot, new DependencyNodeComparator()); + TreeUtil.sortRecursively(myRoot, new DependencyNodeComparator()); return new TreeModel(myRoot, myTotalFileCount, myMarkedFileCount); } diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index 4dab63b255e4..5e746a68117c 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -748,7 +748,7 @@ public class SingleInspectionProfilePanel extends JPanel { fillTreeData(filter, false); } } - TreeUtil.sort(myRoot, new InspectionsConfigTreeComparator()); + TreeUtil.sortRecursively(myRoot, new InspectionsConfigTreeComparator()); } // TODO 134099: see IntentionDescriptionPanel#readHTML diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index eabfcf4bd099..aa8c901fdfe1 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -565,7 +565,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom } protected void sortDescendants(MyNode root) { - TreeUtil.sort(root, getNodeComparator()); + TreeUtil.sortRecursively(root, getNodeComparator()); ((DefaultTreeModel)myTree.getModel()).reload(root); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java index 036677904ac4..5e770ce928c8 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java @@ -116,7 +116,7 @@ public class BreakpointItemsTreeController implements BreakpointsCheckboxTree.De parent.add(node); myNodes.put(breakpoint, node); } - TreeUtil.sort(myRoot, myComparator); + TreeUtil.sortRecursively(myRoot, myComparator); myInBuild = true; ((DefaultTreeModel)(myTreeView.getModel())).nodeStructureChanged(myRoot); state.applyTo(myTreeView, myRoot); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java index 51cfebed4544..a83379b88526 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java @@ -267,7 +267,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent { myRoot.add(createNodeForObject(entry.getValue())); } - TreeUtil.sort(myRoot, GroupNodesComparator.getInstance()); + TreeUtil.sortRecursively(myRoot, GroupNodesComparator.getInstance()); ((DefaultTreeModel) myTree.getModel()).reload(myRoot); }