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

According to IDEA-227118 change title and cancel text of modal indexing dialog

Browse Source 
GitOrigin-RevId: 6a9749219ac6d4623d5ad886e398c4b68f6fe58b
This commit is contained in:
Elena Shaverdova
2019-12-27 15:40:08 +00:00
committed by intellij-monorepo-bot
parent 46fde143fe
commit bf3ec41dd3
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java
+16 -17
View File
@@ -440,7 +440,7 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica
return true;
}
if (myDialogRequested) {
//here should be an assert that it does not happen, but now we have two dispatches of one InputEvent, see IDEA-227444
//here should be an assertion that it does not happen, but now we have two dispatches of one InputEvent, see IDEA-227444
return false;
}
UIEventLogger.logUIEvent(UIEventId.DumbModeDialogRequested, new FeatureUsageData().addProject(myProject));
@@ -483,7 +483,6 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica
}
}
};
task.setCancelText(createCancelButtonText(actionNames));
ProgressManager.getInstance().run(task);
myDialogIndicator = null;
myDialogRequested = false;
@@ -499,23 +498,23 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica
return "Action";
}
else if (actionNames.size() == 1) {
return "'" + actionNames.get(0) + "' Action";
return StringUtil.trimEnd(actionNames.get(0), "...");
}
else {
return "Actions: " + StringUtil.join(actionNames, ", ");
}
}
@NotNull
private static String createCancelButtonText(@NotNull List<String> actionNames) {
if (actionNames.isEmpty()) {
return "Discard action";
}
else if (actionNames.size() == 1) {
return "Discard '" + actionNames.get(0) + "'";
}
else {
return "Discard actions";
StringBuilder result = new StringBuilder();
boolean isFirst = true;
for (String actionName : actionNames) {
if (actionName != null) {
if (isFirst) {
isFirst = false;
}
else {
result.append(", ");
}
result.append(StringUtil.trimEnd(actionName, "..."));
}
}
return result.toString();
}
}