diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
| commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
| download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java')
| -rw-r--r-- | platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java index d963bb3aedaa..dc876657c428 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java @@ -11,6 +11,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBLoadingPanel; import com.intellij.ui.components.JBTextField; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.AsyncProcessIcon; import com.intellij.util.ui.UIUtil; @@ -146,7 +147,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener { @NotNull private List<VcsRef> sortRefs(@NotNull Hash hash, @NotNull VirtualFile root) { Collection<VcsRef> refs = myDataPack.getRefsModel().refsToCommit(hash); - return myLogDataHolder.getLogProvider(root).getReferenceManager().sort(refs); + return ContainerUtil.sorted(refs, myLogDataHolder.getLogProvider(root).getReferenceManager().getComparator()); } private static class DataPanel extends JEditorPane { |