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] extract helper methods to get filtered roots and files

Browse Source
This commit is contained in:
Julia Beliaeva
2019-02-05 22:24:12 +03:00
parent f405cfee6c
commit 3b948c9ce9
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
+26 -16
View File
@@ -66,13 +66,25 @@ class StructureFilterPopupComponent extends FilterPopupComponent<FilterPair<VcsL
return filter.getFilter1();
}
@NotNull
private Collection<VirtualFile> getFilterRoots(@Nullable VcsLogRootFilter filter) {
return filter != null ? filter.getRoots() : getAllRoots();
}
@NotNull
private static Collection<FilePath> getFilterFiles(@Nullable VcsLogStructureFilter filter) {
return filter != null ? filter.getFiles() : Collections.emptySet();
}
@NotNull
@Override
protected String getText(@NotNull FilterPair<VcsLogStructureFilter, VcsLogRootFilter> filter) {
Collection<VirtualFile> roots = getRootFilter(filter) == null ? getAllRoots() : getRootFilter(filter).getRoots();
Collection<FilePath> files = getStructureFilter(filter) == null ? Collections.emptySet() : getStructureFilter(filter).getFiles();
Collection<VirtualFile> visibleRoots = VcsLogUtil.getAllVisibleRoots(getAllRoots(), getRootFilter(filter), getStructureFilter(filter));
VcsLogRootFilter rootFilter = getRootFilter(filter);
VcsLogStructureFilter structureFilter = getStructureFilter(filter);
Collection<VirtualFile> visibleRoots = VcsLogUtil.getAllVisibleRoots(getAllRoots(), rootFilter, structureFilter);
Collection<VirtualFile> roots = getFilterRoots(rootFilter);
Collection<FilePath> files = getFilterFiles(structureFilter);
if (files.isEmpty()) {
return getTextFromRoots(roots, visibleRoots.size() == getAllRoots().size());
}
@@ -118,8 +130,7 @@ class StructureFilterPopupComponent extends FilterPopupComponent<FilterPair<VcsL
@Nullable
@Override
protected String getToolTip(@NotNull FilterPair<VcsLogStructureFilter, VcsLogRootFilter> filter) {
return getToolTip(getRootFilter(filter) == null ? getAllRoots() : getRootFilter(filter).getRoots(),
getStructureFilter(filter) == null ? Collections.emptySet() : getStructureFilter(filter).getFiles());
return getToolTip(getFilterRoots(getRootFilter(filter)), getFilterFiles(getStructureFilter(filter)));
}
@NotNull
@@ -197,9 +208,9 @@ class StructureFilterPopupComponent extends FilterPopupComponent<FilterPair<VcsL
}
private boolean isVisible(@NotNull VirtualFile root) {
FilterPair<VcsLogStructureFilter, VcsLogRootFilter> filter = myFilterModel.getFilter();
if (getRootFilter(filter) != null) {
return getRootFilter(filter).getRoots().contains(root);
VcsLogRootFilter rootFilter = getRootFilter(myFilterModel.getFilter());
if (rootFilter != null) {
return rootFilter.getRoots().contains(root);
}
return true;
}
@@ -207,8 +218,7 @@ class StructureFilterPopupComponent extends FilterPopupComponent<FilterPair<VcsL
private void setVisible(@NotNull VirtualFile root, boolean visible) {
Set<VirtualFile> roots = getAllRoots();
FilterPair<VcsLogStructureFilter, VcsLogRootFilter> previousFilter = myFilterModel.getFilter();
VcsLogRootFilter rootFilter = getRootFilter(previousFilter);
VcsLogRootFilter rootFilter = getRootFilter(myFilterModel.getFilter());
Collection<VirtualFile> visibleRoots;
if (rootFilter == null) {
@@ -344,23 +354,23 @@ class StructureFilterPopupComponent extends FilterPopupComponent<FilterPair<VcsL
public void actionPerformed(@NotNull AnActionEvent e) {
Project project = e.getRequiredData(CommonDataKeys.PROJECT);
VcsLogDataPack dataPack = myFilterModel.getDataPack();
FilterPair<VcsLogStructureFilter, VcsLogRootFilter> filter = myFilterModel.getFilter();
VcsLogStructureFilter structureFilter = getStructureFilter(myFilterModel.getFilter());
Collection<VirtualFile> files;
if (getStructureFilter(filter) == null) {
if (structureFilter == null) {
files = Collections.emptySet();
}
else {
// for now, ignoring non-existing paths
files = ContainerUtil.mapNotNull(getStructureFilter(filter).getFiles(), FilePath::getVirtualFile);
files = ContainerUtil.mapNotNull(structureFilter.getFiles(), FilePath::getVirtualFile);
}
VcsStructureChooser chooser = new VcsStructureChooser(project, "Select Files or Folders to Filter by", files,
new ArrayList<>(dataPack.getLogProviders().keySet()));
if (chooser.showAndGet()) {
VcsLogStructureFilter structureFilter = VcsLogFilterObject.fromVirtualFiles(chooser.getSelectedFiles());
myFilterModel.setFilter(new FilterPair<>(structureFilter, null));
myUiProperties.addRecentlyFilteredGroup(myName, VcsLogClassicFilterUi.FileFilterModel.getFilterValues(structureFilter));
VcsLogStructureFilter newFilter = VcsLogFilterObject.fromVirtualFiles(chooser.getSelectedFiles());
myFilterModel.setFilter(new FilterPair<>(newFilter, null));
myUiProperties.addRecentlyFilteredGroup(myName, VcsLogClassicFilterUi.FileFilterModel.getFilterValues(newFilter));
}
}