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: Refactored "ChangeBrowserSettings", "BrowseChangesAction"

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2016-11-09 23:53:59 +03:00
parent abf18eac89
commit d61bde8206
2 changed files with 80 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/versionBrowser/ChangeBrowserSettings.java
+29 -73
View File
@@ -24,12 +24,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import static com.intellij.openapi.util.text.StringUtil.isEmpty;
import static com.intellij.util.containers.ContainerUtil.packNullables;
import static com.intellij.util.containers.ContainerUtil.retainAll;
public class ChangeBrowserSettings implements JDOMExternalizable {
@@ -129,86 +129,39 @@ public class ChangeBrowserSettings implements JDOMExternalizable {
@NotNull
protected List<Filter> createFilters() {
final ArrayList<Filter> result = new ArrayList<>();
addDateFilter(USE_DATE_BEFORE_FILTER, getDateBefore(), result, true);
addDateFilter(USE_DATE_AFTER_FILTER, getDateAfter(), result, false);
if (USE_CHANGE_BEFORE_FILTER) {
try {
final long numBefore = Long.parseLong(CHANGE_BEFORE);
result.add(new Filter() {
public boolean accepts(CommittedChangeList change) {
return change.getNumber() <= numBefore;
}
});
}
catch (NumberFormatException e) {
//ignore
LOG.info(e);
}
}
if (USE_CHANGE_AFTER_FILTER) {
try {
final long numAfter = Long.parseLong(CHANGE_AFTER);
result.add(new Filter() {
public boolean accepts(CommittedChangeList change) {
return change.getNumber() >= numAfter;
}
});
}
catch (NumberFormatException e) {
//ignore
LOG.info(e);
}
}
if (USE_USER_FILTER) {
result.add(new Filter() {
public boolean accepts(CommittedChangeList change) {
return Comparing.equal(change.getCommitterName(), USER, false);
}
});
}
return result;
return packNullables(
createDateFilter(getDateBeforeFilter(), true),
createDateFilter(getDateAfterFilter(), false),
createChangeFilter(getChangeBeforeFilter(), true),
createChangeFilter(getChangeAfterFilter(), false),
USE_USER_FILTER ? (Filter)changeList -> Comparing.equal(changeList.getCommitterName(), USER, false) : null
);
}
private static void addDateFilter(final boolean useFilter, final Date date, final ArrayList<Filter> result, final boolean before) {
if (useFilter) {
assert date != null;
result.add(new Filter() {
public boolean accepts(CommittedChangeList change) {
final Date changeDate = change.getCommitDate();
if (changeDate == null) return false;
@Nullable
private static Filter createDateFilter(@Nullable Date date, boolean before) {
return date == null ? null : changeList -> {
Date commitDate = changeList.getCommitDate();
return before ? changeDate.before(date) : changeDate.after(date);
}
});
}
return commitDate != null && (before ? commitDate.before(date) : commitDate.after(date));
};
}
@Nullable
private static Filter createChangeFilter(@Nullable Long number, boolean before) {
return number == null ? null : changeList ->
before ? changeList.getNumber() <= number : changeList.getNumber() >= number;
}
@NotNull
public Filter createFilter() {
final List<Filter> filters = createFilters();
return new Filter() {
public boolean accepts(CommittedChangeList change) {
for (Filter filter : filters) {
if (!filter.accepts(change)) return false;
}
return true;
}
};
List<Filter> filters = createFilters();
return changeList -> filters.stream().allMatch(filter -> filter.accepts(changeList));
}
public void filterChanges(@NotNull List<? extends CommittedChangeList> changeListInfos) {
public void filterChanges(@NotNull List<? extends CommittedChangeList> changeLists) {
Filter filter = createFilter();
for (Iterator<? extends CommittedChangeList> iterator = changeListInfos.iterator(); iterator.hasNext();) {
CommittedChangeList changeListInfo = iterator.next();
if (!filter.accepts(changeListInfo)) {
iterator.remove();
}
}
retainAll(changeLists, filter::accepts);
}
@Nullable
@@ -217,7 +170,10 @@ public class ChangeBrowserSettings implements JDOMExternalizable {
}
public boolean isAnyFilterSpecified() {
return USE_CHANGE_AFTER_FILTER || USE_CHANGE_BEFORE_FILTER || USE_DATE_AFTER_FILTER || USE_DATE_BEFORE_FILTER ||
return USE_CHANGE_AFTER_FILTER ||
USE_CHANGE_BEFORE_FILTER ||
USE_DATE_AFTER_FILTER ||
USE_DATE_BEFORE_FILTER ||
isNonDateFilterSpecified();
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/BrowseChangesAction.java
+51 -54
View File
@@ -16,75 +16,72 @@
package com.intellij.openapi.vcs.changes.actions;
import com.intellij.CommonBundle;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.actions.VcsContextFactory;
import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.AbstractVcsHelper;
import com.intellij.openapi.vcs.CommittedChangesProvider;
import com.intellij.openapi.vcs.changes.committed.CommittedChangesFilterDialog;
import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import static com.intellij.CommonBundle.getCancelButtonText;
import static com.intellij.openapi.ui.Messages.*;
import static com.intellij.openapi.vcs.AbstractVcs.fileInVcsByFileStatus;
import static com.intellij.openapi.vcs.VcsBundle.message;
import static com.intellij.openapi.vcs.changes.ChangesUtil.getVcsForFile;
import static com.intellij.util.ObjectUtils.notNull;
/**
* @author yole
*/
public class BrowseChangesAction extends AnAction implements DumbAware {
public void actionPerformed(AnActionEvent e) {
final Project project = e.getData(CommonDataKeys.PROJECT);
VirtualFile vFile = e.getData(CommonDataKeys.VIRTUAL_FILE);
assert vFile != null;
AbstractVcs vcs = ProjectLevelVcsManager.getInstance(project).getVcsFor(vFile);
assert vcs != null;
final CommittedChangesProvider provider = vcs.getCommittedChangesProvider();
assert provider != null;
final VcsConfiguration vcsConfiguration = VcsConfiguration.getInstance(project);
ChangeBrowserSettings settings = vcsConfiguration.CHANGE_BROWSER_SETTINGS.get(vcs.getName());
if (settings == null) {
settings = provider.createDefaultSettings();
vcsConfiguration.CHANGE_BROWSER_SETTINGS.put(vcs.getName(), settings);
}
CommittedChangesFilterDialog dlg = new CommittedChangesFilterDialog(project, provider.createFilterUI(true), settings);
if (!dlg.showAndGet()) {
return;
}
public void actionPerformed(@NotNull AnActionEvent e) {
Project project = e.getRequiredData(CommonDataKeys.PROJECT);
VirtualFile file = e.getRequiredData(CommonDataKeys.VIRTUAL_FILE);
AbstractVcs vcs = notNull(getVcsForFile(file, project));
CommittedChangesProvider provider = notNull(vcs.getCommittedChangesProvider());
ChangeBrowserSettings settings =
vcs.getConfiguration().CHANGE_BROWSER_SETTINGS.computeIfAbsent(vcs.getName(), key -> provider.createDefaultSettings());
CommittedChangesFilterDialog dialog = new CommittedChangesFilterDialog(project, provider.createFilterUI(true), settings);
int maxCount = 0;
if (!settings.isAnyFilterSpecified()) {
int rc = Messages
.showYesNoCancelDialog(project, VcsBundle.message("browse.changes.no.filter.prompt"), VcsBundle.message("browse.changes.title"),
VcsBundle.message("browse.changes.show.recent.button"),
VcsBundle.message("browse.changes.show.all.button"),
CommonBundle.getCancelButtonText(),
Messages.getQuestionIcon());
if (rc == Messages.CANCEL) {
return;
}
if (rc == Messages.YES) {
maxCount = 50;
}
if (dialog.showAndGet()) {
showChanges(vcs, file, settings);
}
AbstractVcsHelper.getInstance(project).openCommittedChangesTab(vcs, vFile, settings, maxCount, null);
}
public void update(AnActionEvent e) {
e.getPresentation().setEnabled(isActionEnabled(e));
}
private static boolean isActionEnabled(final AnActionEvent e) {
public void update(@NotNull AnActionEvent e) {
Project project = e.getData(CommonDataKeys.PROJECT);
if (project == null) return false;
VirtualFile vFile = e.getData(CommonDataKeys.VIRTUAL_FILE);
if (vFile == null) return false;
AbstractVcs vcs = ProjectLevelVcsManager.getInstance(project).getVcsFor(vFile);
if (vcs == null || vcs.getCommittedChangesProvider() == null || !vcs.allowsRemoteCalls(vFile)) {
return false;
VirtualFile file = e.getData(CommonDataKeys.VIRTUAL_FILE);
e.getPresentation().setEnabled(project != null && file != null && isEnabled(project, file));
}
private static boolean isEnabled(@NotNull Project project, @NotNull VirtualFile file) {
AbstractVcs vcs = getVcsForFile(file, project);
return vcs != null && vcs.getCommittedChangesProvider() != null && vcs.allowsRemoteCalls(file) && fileInVcsByFileStatus(project, file);
}
private static void showChanges(@NotNull AbstractVcs vcs, @NotNull VirtualFile file, @NotNull ChangeBrowserSettings settings) {
int maxCount = !settings.isAnyFilterSpecified() ? askMaxCount(vcs.getProject()) : 0;
if (maxCount >= 0) {
AbstractVcsHelper.getInstance(vcs.getProject()).openCommittedChangesTab(vcs, file, settings, maxCount, null);
}
}
private static int askMaxCount(@NotNull Project project) {
switch (showYesNoCancelDialog(project, message("browse.changes.no.filter.prompt"), message("browse.changes.title"),
message("browse.changes.show.recent.button"), message("browse.changes.show.all.button"),
getCancelButtonText(), getQuestionIcon())) {
case CANCEL:
return -1;
case YES:
return 50;
default:
return 0;
}
FilePath filePath = VcsContextFactory.SERVICE.getInstance().createFilePathOn(vFile);
return AbstractVcs.fileInVcsByFileStatus(project, filePath);
}
}