From 54fb3f36a297712afd2ced74cb60559234a7cd40 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 5 Nov 2015 20:58:24 +0300 Subject: [PATCH] [vcs-log] ref group with single reference is not a singleton group --- .../com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java index ba45c1dd2b48..cec6566fcdbe 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchPopupBuilder.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.*; +import com.intellij.vcs.log.impl.SingletonRefGroup; import com.intellij.vcs.log.impl.VcsLogUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -131,8 +132,8 @@ public abstract class BranchPopupBuilder { private static void putActionsForReferences(List references, Groups actions) { for (final RefGroup refGroup : references) { - if (refGroup.getRefs().size() == 1) { - String name = refGroup.getRefs().iterator().next().getName(); + if (refGroup instanceof SingletonRefGroup) { + String name = refGroup.getName(); if (!actions.singletonGroups.contains(name)) { actions.singletonGroups.add(name); }