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] better text for not found / not matched commit

Browse Source
This commit is contained in:
Julia Beliaeva
2018-07-06 16:36:51 +03:00
parent a2c8593389
commit cf1a125d1d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java
+2 -2
View File
@@ -226,7 +226,7 @@ public class FileHistoryUi extends AbstractVcsLogUi {
String mainText = "Commit " + commitId.toString() + " does not exist in history for " + myPath.getName();
if (getFilterUi().getFilters().get(VcsLogFilterCollection.BRANCH_FILTER) != null) {
showWarningWithLink(mainText + " in current branch.", "Show all branches and search again.", () -> {
showWarningWithLink(mainText + " in current branch", "View and Show All Branches", () -> {
myUiProperties.set(FileHistoryUiProperties.SHOW_ALL_BRANCHES, true);
invokeOnChange(() -> jumpTo(commitId, rowGetter, SettableFuture.create()));
});
@@ -234,7 +234,7 @@ public class FileHistoryUi extends AbstractVcsLogUi {
else {
VcsLogUiImpl mainLogUi = VcsProjectLog.getInstance(myProject).getMainLogUi();
if (mainLogUi != null) {
showWarningWithLink(mainText + ".", "Search in Log.", () -> {
showWarningWithLink(mainText, "View in Log", () -> {
if (VcsLogContentUtil.selectLogUi(myProject, mainLogUi)) {
if (commitId instanceof Hash) {
mainLogUi.jumpToCommit((Hash)commitId,
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/AbstractVcsLogUi.java
+1 -1
View File
@@ -211,7 +211,7 @@ public abstract class AbstractVcsLogUi implements VcsLogUi, Disposable {
@NotNull
protected static <T> String getCommitNotFoundMessage(@NotNull T commitId, boolean exists) {
return exists ? "Commit " + commitId.toString() + " does not match active filters" : "Commit " + commitId.toString() + " not found";
return exists ? "Commit " + commitId.toString() + " doesn't match the filters" : "Commit " + commitId.toString() + " not found";
}
protected void showWarningWithLink(@NotNull String mainText, @NotNull String linkText, @NotNull Runnable onClick) {
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
+2 -2
View File
@@ -108,7 +108,7 @@ public class VcsLogUiImpl extends AbstractVcsLogUi {
}
List<NamedRunnable> runnables = ContainerUtil.newArrayList();
runnables.add(new NamedRunnable("Reset filters and search again.") {
runnables.add(new NamedRunnable("View and Reset Filters") {
@Override
public void run() {
getFilterUi().setFilter(null);
@@ -117,7 +117,7 @@ public class VcsLogUiImpl extends AbstractVcsLogUi {
}
});
if (VcsLogProjectTabsProperties.MAIN_LOG_ID.equals(getId())) {
runnables.add(new NamedRunnable("Search in new tab.") {
runnables.add(new NamedRunnable("View in New Tab") {
@Override
public void run() {
VcsProjectLog projectLog = VcsProjectLog.getInstance(myProject);