diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java index 078e99e7dcb1..0ca36d30c6cd 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java @@ -1,5 +1,7 @@ package com.intellij.vcs.log.data; +import com.intellij.openapi.util.Condition; +import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.Hash; import com.intellij.vcs.log.VcsRef; import org.jetbrains.annotations.NotNull; @@ -12,11 +14,19 @@ import java.util.*; public class RefsModel { @NotNull private final Collection myRefs; + @NotNull private final Collection myBranches; @NotNull private final Set myRefHashes; public RefsModel(@NotNull Collection allRefs) { myRefs = allRefs; + myBranches = ContainerUtil.filter(myRefs, new Condition() { + @Override + public boolean value(VcsRef ref) { + return ref.getType().isBranch(); + } + }); + myRefHashes = new HashSet(); for (VcsRef ref : myRefs) { myRefHashes.add(ref.getCommitHash()); @@ -50,4 +60,8 @@ public class RefsModel { return Collections.unmodifiableCollection(myRefs); } + @NotNull + public Collection getBranches() { + return myBranches; + } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java index 92eadfd6f128..2011f4f5560b 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java @@ -82,7 +82,7 @@ public class BranchesPanel extends JPanel { @NotNull private List getRefsToDisplayOnPanel() { - Collection allRefs = myDataHolder.getDataPack().getRefsModel().getAllRefs(); + Collection allRefs = myDataHolder.getDataPack().getRefsModel().getBranches(); List refsToShow = new ArrayList(); for (Map.Entry> entry : groupByRoot(allRefs).entrySet()) {