From 0633c42007ee506574b0b46441c7b00d2553c0d6 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sat, 29 Nov 2014 23:35:13 +0300 Subject: [PATCH] [vcs-log] move util stuff into VcsLogFileFilter --- ...eFilterUtil.java => VcsLogFileFilter.java} | 21 +++++++++- .../vcs/log/data/VisiblePackBuilder.java | 4 +- .../log/ui/filter/VcsLogClassicFilterUi.java | 2 +- .../vcs/log/ui/filter/VcsLogFileFilter.java | 41 ------------------- 4 files changed, 23 insertions(+), 45 deletions(-) rename platform/vcs-log/impl/src/com/intellij/vcs/log/data/{VcsLogFileFilterUtil.java => VcsLogFileFilter.java} (86%) delete mode 100644 platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogFileFilter.java diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilterUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java similarity index 86% rename from platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilterUtil.java rename to platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java index d73ae9c935a0..0c6ac5c84702 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilterUtil.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java @@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; +import com.intellij.vcs.log.VcsLogFilter; import com.intellij.vcs.log.VcsLogRootFilter; import com.intellij.vcs.log.VcsLogStructureFilter; import org.jetbrains.annotations.NotNull; @@ -29,7 +30,15 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Set; -public class VcsLogFileFilterUtil { +public class VcsLogFileFilter implements VcsLogFilter { + @Nullable private final VcsLogStructureFilter myStructureFilter; + @Nullable private final VcsLogRootFilter myRootFilter; + + public VcsLogFileFilter(@Nullable VcsLogStructureFilter structureFilter, @Nullable VcsLogRootFilter rootFilter) { + myStructureFilter = structureFilter; + myRootFilter = rootFilter; + } + @NotNull static Pair, MultiMap> collectRoots(@NotNull Collection files, @NotNull Set roots) { @@ -88,4 +97,14 @@ public class VcsLogFileFilterUtil { Pair, MultiMap> rootsAndFiles = collectRootsAndFiles(roots, rootFilter, structureFilter); return ContainerUtil.union(rootsAndFiles.first, rootsAndFiles.second.keySet()); } + + @Nullable + public VcsLogStructureFilter getStructureFilter() { + return myStructureFilter; + } + + @Nullable + public VcsLogRootFilter getRootFilter() { + return myRootFilter; + } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java index e2c2a9ce332d..f711aef27dd8 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VisiblePackBuilder.java @@ -188,7 +188,7 @@ class VisiblePackBuilder { private Set getMatchingHeads(@NotNull VcsLogRefs refs, @NotNull Set vcsRoots, @NotNull VcsLogStructureFilter filter) { - Pair, MultiMap> roots = VcsLogFileFilterUtil.collectRoots(filter.getFiles(), vcsRoots); + Pair, MultiMap> roots = VcsLogFileFilter.collectRoots(filter.getFiles(), vcsRoots); return getMatchingHeads(refs, ContainerUtil.union(roots.first, roots.second.keySet())); } @@ -257,7 +257,7 @@ class VisiblePackBuilder { VcsLogStructureFilter structureFilter = filterCollection.getStructureFilter(); Pair, MultiMap> selectedRootsAndFiles = - VcsLogFileFilterUtil.collectRootsAndFiles(providers.keySet(), rootFilter, structureFilter); + VcsLogFileFilter.collectRootsAndFiles(providers.keySet(), rootFilter, structureFilter); Collection> logs = ContainerUtil.newArrayList(); for (Map.Entry entry : providers.entrySet()) { 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 937ca7ff12b3..72cdb32ce333 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 @@ -287,7 +287,7 @@ public class VcsLogClassicFilterUi implements VcsLogFilterUi { if (filter == null) { myVisibleRoots = null; } else { - myVisibleRoots = VcsLogFileFilterUtil.collectRoots(roots, filter.getRootFilter(), filter.getStructureFilter()); + myVisibleRoots = VcsLogFileFilter.collectRoots(roots, filter.getRootFilter(), filter.getStructureFilter()); } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogFileFilter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogFileFilter.java deleted file mode 100644 index b4b5411c4c7c..000000000000 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogFileFilter.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.vcs.log.ui.filter; - -import com.intellij.vcs.log.VcsLogFilter; -import com.intellij.vcs.log.VcsLogRootFilter; -import com.intellij.vcs.log.VcsLogStructureFilter; -import org.jetbrains.annotations.Nullable; - -public class VcsLogFileFilter implements VcsLogFilter { - @Nullable private final VcsLogStructureFilter myStructureFilter; - @Nullable private final VcsLogRootFilter myRootFilter; - - public VcsLogFileFilter(@Nullable VcsLogStructureFilter structureFilter, @Nullable VcsLogRootFilter rootFilter) { - myStructureFilter = structureFilter; - myRootFilter = rootFilter; - } - - @Nullable - public VcsLogStructureFilter getStructureFilter() { - return myStructureFilter; - } - - @Nullable - public VcsLogRootFilter getRootFilter() { - return myRootFilter; - } -}