MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] intersect structure and root filters (seems to make more sense, since they live together in the panel and all)

Browse Source
This commit is contained in:
Julia Beliaeva
2014-12-05 18:58:04 +03:00
parent f467332b8f
commit c7980d3d88
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java
+13 -8
View File
@@ -99,17 +99,22 @@ public class VcsLogFileFilter implements VcsLogFilter {
private static Set<VirtualFile> getAllVisibleRoots(@NotNull Collection<VirtualFile> roots, @Nullable VcsLogRootFilter rootFilter, @Nullable VcsLogStructureFilter structureFilter) {
if (rootFilter == null && structureFilter == null) return new HashSet<VirtualFile>(roots);
// should not we, like, intersect here?
Set<VirtualFile> result = new HashSet<VirtualFile>();
Collection<VirtualFile> fromRootFilter;
if (rootFilter != null) {
result.addAll(rootFilter.getRoots());
}
if (structureFilter != null) {
Pair<Set<VirtualFile>, MultiMap<VirtualFile, VirtualFile>> rootsAndFiles = collectRoots(structureFilter.getFiles(), new HashSet<VirtualFile>(roots));
result.addAll(ContainerUtil.union(rootsAndFiles.first, rootsAndFiles.second.keySet()));
fromRootFilter = rootFilter.getRoots();
} else {
fromRootFilter = roots;
}
return result;
Collection<VirtualFile> fromStructureFilter;
if (structureFilter != null) {
Pair<Set<VirtualFile>, MultiMap<VirtualFile, VirtualFile>> rootsAndFiles = collectRoots(structureFilter.getFiles(), new HashSet<VirtualFile>(roots));
fromStructureFilter = ContainerUtil.union(rootsAndFiles.first, rootsAndFiles.second.keySet());
} else {
fromStructureFilter = roots;
}
return new HashSet<VirtualFile>(ContainerUtil.intersection(fromRootFilter, fromStructureFilter));
}
// for given root returns files that are selected in it