From c9eb4adc5b79ab2e724d37221d6e87512d90a2f2 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 31 Jan 2017 17:37:44 +0300 Subject: [PATCH] TreeUtil: 'childrenToArray' method renamed to 'listChildren' To make name of the method consistent with its return type. --- .../ui/ExternalProjectDataSelectorDialog.java | 4 ++-- .../projectView/impl/ModuleGroupingTreeHelper.kt | 4 ++-- .../ui/PackageDependenciesNode.java | 2 +- .../ide/util/treeView/AbstractTreeUi.java | 4 ++-- .../ide/util/treeView/TreeBuilderUtil.java | 6 +++--- .../src/com/intellij/util/ui/tree/TreeUtil.java | 16 ++++++++++++---- .../ui/GradleProjectCompositeSelectorDialog.java | 2 +- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java index 69b152976bae..96461c020e32 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java @@ -181,7 +181,7 @@ public class ExternalProjectDataSelectorDialog extends DialogWrapper { final Couple rootAndPreselectedNode = createRoot(); final CheckedTreeNode rootCopy = rootAndPreselectedNode.first; - List nodes = TreeUtil.childrenToArray(rootCopy); + List nodes = TreeUtil.listChildren(rootCopy); rootNode.removeAllChildren(); TreeUtil.addChildrenTo(rootNode, nodes); treeModel.reload(); @@ -391,7 +391,7 @@ public class ExternalProjectDataSelectorDialog extends DialogWrapper { } } - List nodes = projectNode != null ? TreeUtil.childrenToArray(projectNode) : ContainerUtil.emptyList(); + List nodes = projectNode != null ? TreeUtil.listChildren(projectNode) : ContainerUtil.emptyList(); Collections.sort(nodes, (o1, o2) -> { if(o1 instanceof DataNodeCheckedTreeNode && o2 instanceof DataNodeCheckedTreeNode) { if (rootModuleComment.equals(((DataNodeCheckedTreeNode)o1).comment)) return -1; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupingTreeHelper.kt b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupingTreeHelper.kt index 552892c4b961..8616a5385c78 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupingTreeHelper.kt +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroupingTreeHelper.kt @@ -124,7 +124,7 @@ class ModuleGroupingTreeHelper private constructor( } private fun moveChildren(fromNode: N, toNode: N, model: DefaultTreeModel) { - val children = TreeUtil.childrenToArray(fromNode) + val children = TreeUtil.listChildren(fromNode) moveChildren(children, toNode, model) } @@ -192,7 +192,7 @@ class ModuleGroupingTreeHelper private constructor( val nodeAsGroup = nodeData[node]?.group removeNode(node) if (nodeAsGroup != null) { - val childrenToKeep = TreeUtil.childrenToArray(node).filter { it in nodeData } + val childrenToKeep = TreeUtil.listChildren(node).filter { it in nodeData } if (childrenToKeep.isNotEmpty()) { val newGroupNode = getOrCreateNodeForModuleGroup(nodeAsGroup, rootNode, model, false) moveChildren(childrenToKeep, newGroupNode, model) diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageDependenciesNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageDependenciesNode.java index a192e9329836..20938055a7e5 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageDependenciesNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageDependenciesNode.java @@ -225,7 +225,7 @@ public class PackageDependenciesNode extends DefaultMutableTreeNode implements N public void sortChildren() { if (isSorted()) return; - final List children = TreeUtil.childrenToArray(this); + final List children = TreeUtil.listChildren(this); Collections.sort(children, new DependencyNodeComparator()); removeAllChildren(); TreeUtil.addChildrenTo(this, children); diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index c07802084498..e826c06b0860 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -1671,7 +1671,7 @@ public class AbstractTreeUi { final boolean forceUpdate, final boolean wasExpaned, @Nullable final LoadedChildren preloaded) { - final List childNodes = TreeUtil.childrenToArray(node); + final List childNodes = TreeUtil.listChildren(node); return maybeYeild(new AsyncRunnable() { @NotNull @Override @@ -3509,7 +3509,7 @@ public class AbstractTreeUi { sortChildren(parentNode, toInsert, false, true); final List all = new ArrayList<>(toInsert.size() + parentNode.getChildCount()); all.addAll(toInsert); - all.addAll(TreeUtil.childrenToArray(parentNode)); + all.addAll(TreeUtil.listChildren(parentNode)); if (!toInsert.isEmpty()) { sortChildren(parentNode, all, true, true); diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java index 9493ea3539c9..7c6d1dc46638 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java @@ -16,15 +16,15 @@ package com.intellij.ide.util.treeView; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.tree.TreeUtil; -import com.intellij.openapi.diagnostic.Logger; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -46,7 +46,7 @@ public class TreeBuilderUtil { } private static void _storePaths(JTree tree, DefaultMutableTreeNode root, List pathsToExpand, List selectionPaths, boolean storeElementsOnly) { - ArrayList childNodes = TreeUtil.childrenToArray(root); + List childNodes = TreeUtil.listChildren(root); for (final Object childNode1 : childNodes) { DefaultMutableTreeNode childNode = (DefaultMutableTreeNode)childNode1; TreePath path = new TreePath(childNode.getPath()); diff --git a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java index 4586527144e8..518c60998a47 100644 --- a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java +++ b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java @@ -345,7 +345,7 @@ public final class TreeUtil { public static void sortChildren(@NotNull T node, @Nullable Comparator comparator) { //noinspection unchecked - final List children = (List)childrenToArray(node); + final List children = (List)listChildren(node); Collections.sort(children, comparator); for (int i = node.getChildCount() - 1; i >= 0; i--) { node.remove(i); @@ -751,11 +751,19 @@ public final class TreeUtil { selectNode(tree, treeNode); } + /** + * @deprecated use {@link #listChildren(TreeNode)} instead + */ @NotNull - public static ArrayList childrenToArray(@NotNull final TreeNode node) { + public static ArrayList childrenToArray(@NotNull TreeNode node) { + return (ArrayList)listChildren(node); + } + + @NotNull + public static List listChildren(@NotNull final TreeNode node) { //ApplicationManager.getApplication().assertIsDispatchThread(); - final int size = node.getChildCount(); - final ArrayList result = new ArrayList<>(size); + int size = node.getChildCount(); + ArrayList result = new ArrayList<>(size); for(int i = 0; i < size; i++){ TreeNode child = node.getChildAt(i); LOG.assertTrue(child != null); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java index b3602f8a010f..dbee928e0083 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectCompositeSelectorDialog.java @@ -154,7 +154,7 @@ public class GradleProjectCompositeSelectorDialog extends DialogWrapper { final Object root = treeModel.getRoot(); if (!(root instanceof CheckedTreeNode)) return; - for (TreeNode node : TreeUtil.childrenToArray((CheckedTreeNode)root)) { + for (TreeNode node : TreeUtil.listChildren((CheckedTreeNode)root)) { if (!(node instanceof CheckedTreeNode)) continue; consumer.consume(((CheckedTreeNode)node)); }