From bfd06fe8d6b4796fded169e992c6da6618a6a81c Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Sat, 29 Nov 2014 23:37:41 +0300
Subject: [PATCH] [vcs-log] add color manager and fix new filter creation

---
 .../ui/filter/StructureFilterPopupComponent.java | 16 ++++++++++------
 .../vcs/log/ui/filter/VcsLogClassicFilterUi.java |  3 +--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
index 2b72113d2de4..168d068a236d 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
@@ -16,15 +16,18 @@
 package com.intellij.vcs.log.ui.filter;
 
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.CheckboxAction;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.vcs.log.*;
+import com.intellij.vcs.log.VcsLogDataPack;
+import com.intellij.vcs.log.VcsLogRootFilter;
+import com.intellij.vcs.log.VcsLogRootFilterImpl;
+import com.intellij.vcs.log.data.VcsLogFileFilter;
 import com.intellij.vcs.log.data.VcsLogStructureFilterImpl;
+import com.intellij.vcs.log.ui.VcsLogColorManager;
 import com.intellij.vcs.log.ui.VcsStructureChooser;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,9 +36,11 @@ import java.util.*;
 
 class StructureFilterPopupComponent extends FilterPopupComponent<VcsLogFileFilter> {
   private static final int FILTER_LABEL_LENGTH = 20;
+  @NotNull private final VcsLogColorManager myColorManager;
 
-  public StructureFilterPopupComponent(@NotNull FilterModel<VcsLogFileFilter> filterModel) {
+  public StructureFilterPopupComponent(@NotNull FilterModel<VcsLogFileFilter> filterModel, @NotNull VcsLogColorManager colorManager) {
     super("Structure", filterModel);
+    myColorManager = colorManager;
   }
 
   @NotNull
@@ -70,7 +75,6 @@ class StructureFilterPopupComponent extends FilterPopupComponent<VcsLogFileFilte
 
   @Override
   protected ActionGroup createActionGroup() {
-
     Set<VirtualFile> roots = myFilterModel.getDataPack().getLogProviders().keySet();
 
     List<AnAction> actions = new ArrayList<AnAction>();
@@ -136,7 +140,7 @@ class StructureFilterPopupComponent extends FilterPopupComponent<VcsLogFileFilte
     return tooltip;
   }
 
-  private class SelectVisibleRootAction extends CheckboxAction {
+  private class SelectVisibleRootAction extends ToggleAction {
     @NotNull private final VirtualFile myRoot;
 
     private SelectVisibleRootAction(@NotNull VirtualFile root) {
@@ -166,7 +170,7 @@ class StructureFilterPopupComponent extends FilterPopupComponent<VcsLogFileFilte
       VcsLogDataPack dataPack = myFilterModel.getDataPack();
       VcsLogFileFilter filter = myFilterModel.getFilter();
       VcsLogRootFilter rootFilter = filter == null ? null : filter.getRootFilter();
-      Collection<VirtualFile> files = filter == null ? Collections.<VirtualFile>emptySet() : getAllFiles(filter);
+      Collection<VirtualFile> files = filter == null || filter.getStructureFilter() == null ? Collections.<VirtualFile>emptySet() : filter.getStructureFilter().getFiles();
       VcsStructureChooser chooser = new VcsStructureChooser(project, "Select Files or Folders to Filter", files,
                                                             new ArrayList<VirtualFile>(dataPack.getLogProviders().keySet()));
       if (chooser.showAndGet()) {
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
index 72cdb32ce333..2e37d2a7e01f 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
@@ -31,7 +31,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.SearchTextFieldWithStoredHistory;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.containers.MultiMap;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcs.log.*;
 import com.intellij.vcs.log.data.*;
@@ -142,7 +141,7 @@ public class VcsLogClassicFilterUi implements VcsLogFilterUi {
     actionGroup.add(new FilterActionComponent(new Computable<JComponent>() {
       @Override
       public JComponent compute() {
-        return new StructureFilterPopupComponent(myStructureFilterModel);
+        return new StructureFilterPopupComponent(myStructureFilterModel, myUi.getColorManager());
       }
     }));
     return actionGroup;