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

simplification: use generified TreeUtil.sortRecursively to avoid casts

Browse Source
This commit is contained in:
nik
2017-02-01 10:41:40 +03:00
parent 7cbab79cae
commit a72cc80610
10 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
+1 -5
View File
@@ -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);
}
java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java
+1 -1
View File
@@ -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);
}
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+3 -3
View File
@@ -414,9 +414,9 @@ class RunConfigurable extends BaseConfigurable {
private void sortTopLevelBranches() {
List<TreePath> 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());
}
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
+4 -7
View File
@@ -119,13 +119,10 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
loadComponentState();
final List<String> order = getScopesState().myOrder;
TreeUtil.sort(myRoot, new Comparator<DefaultMutableTreeNode>() {
@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()) {
platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
+2 -2
View File
@@ -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);
}
platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
+1 -1
View File
@@ -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);
}
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
+1 -1
View File
@@ -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
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
+1 -1
View File
@@ -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);
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java
+1 -1
View File
@@ -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);
plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
+1 -1
View File
@@ -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);
}