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

[vcs] IDEA-116036 Pressing Escape in Commit/TODO dialog performs commit

Browse Source 
* Show dialog with Cancel button.
* Correctly handle exit codes: if OK & thereAreTodoFound => review;
  if commit option is chosen => commit; otherwise safe cancel.
This commit is contained in:
Kirill Likhodedov
2013-11-09 17:06:34 +04:00
parent 7c5ba53a0e
commit 41592cac44
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java
+6 -6
View File
@@ -184,24 +184,24 @@ public class TodoCheckinHandler extends CheckinHandler {
final String text = createMessage(worker);
final String[] buttons;
final boolean thereAreTodoFound = worker.getAddedOrEditedTodos().size() + worker.getInChangedTodos().size() > 0;
int commitOption;
if (thereAreTodoFound) {
buttons = new String[]{VcsBundle.message("todo.in.new.review.button"), commitButtonText, CommonBundle.getCancelButtonText()};
commitOption = 1;
}
else {
buttons = new String[]{commitButtonText, CommonBundle.getCancelButtonText()};
commitOption = 0;
}
final int answer = Messages.showOkCancelDialog(myCheckinProjectPanel.getComponent(), text, "TODO", buttons[0], buttons[1], UIUtil.getWarningIcon());
final int answer = Messages.showDialog(myProject, text, "TODO", null, buttons, 0, 1, UIUtil.getWarningIcon());
if (thereAreTodoFound && answer == Messages.OK) {
showTodo(worker);
return ReturnResult.CLOSE_WINDOW;
}
if (!thereAreTodoFound && answer != Messages.OK) {
return ReturnResult.CANCEL;
}
else {
if (answer == commitOption) {
return ReturnResult.COMMIT;
}
return ReturnResult.CANCEL;
}
private void showTodo(final TodoCheckinHandlerWorker worker) {