From 8c9d0f03c84a8fed44b8ac5360a8ef191d727793 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 26 Jan 2012 16:34:03 +0400 Subject: [PATCH] todo navigation: respect order (IDEA-51997) --- .../lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java | 2 ++ .../src/com/intellij/ide/util/treeView/AbstractTreeUi.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java index a0c783cfaf65..156ee77bd161 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java @@ -539,6 +539,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { return null; } Object[] children = getTreeStructure().getChildElements(parent); + Arrays.sort(children, getUi().getNodeDescriptorComparator()); int idx = -1; for (int i = 0; i < children.length; i++) { if (obj.equals(children[i])) { @@ -584,6 +585,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { return null; } Object[] children = getTreeStructure().getChildElements(parent); + Arrays.sort(children, getUi().getNodeDescriptorComparator()); int idx = -1; for (int i = 0; i < children.length; i++) { if (obj.equals(children[i])) { 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 6997d30dbed7..ced3ab62d05d 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 @@ -3570,6 +3570,10 @@ public class AbstractTreeUi { } } + public Comparator getNodeDescriptorComparator() { + return myNodeDescriptorComparator; + } + private void disposeNode(DefaultMutableTreeNode node) { TreeNode parent = node.getParent(); if (parent instanceof DefaultMutableTreeNode) { -- 2.23.3