diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java index fe944fa34926..016bd6775282 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java @@ -31,6 +31,7 @@ import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.actions.CollapseAllAction; import com.intellij.ui.treeStructure.actions.ExpandAllAction; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.LinkedMultiMap; import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.messages.Topic; @@ -186,10 +187,10 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP } } - private TreeModel buildTreeModel(final List filteredChangeLists) { + private TreeModel buildTreeModel(List filteredChangeLists) { DefaultMutableTreeNode root = new DefaultMutableTreeNode(); DefaultTreeModel model = new DefaultTreeModel(root); - Collections.sort(filteredChangeLists, myGroupingStrategy.getComparator()); + filteredChangeLists = ContainerUtil.sorted(filteredChangeLists, myGroupingStrategy.getComparator()); myGroupingStrategy.beforeStart(); DefaultMutableTreeNode lastGroupNode = null; String lastGroupName = null; @@ -200,7 +201,6 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP lastGroupNode = new DefaultMutableTreeNode(lastGroupName); root.add(lastGroupNode); } - assert lastGroupNode != null; lastGroupNode.add(new DefaultMutableTreeNode(list)); } return model;