From 8ab26354e747a1785e8ec23722ea75ead354df73 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 27 May 2016 19:16:45 +0300 Subject: [PATCH] Use DoNotAskOption.Adapter --- .../GitDeleteRemoteBranchOperation.java | 38 ++++++------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java index f25d6aee15b5..1d75c917a9f2 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteRemoteBranchOperation.java @@ -213,33 +213,19 @@ class GitDeleteRemoteBranchOperation extends GitBranchOperation { } final AtomicBoolean deleteChoice = new AtomicBoolean(); - delete = MessageDialogBuilder.yesNo(title, message).project(myProject).yesText("Delete").noText("Cancel").doNotAsk(new DialogWrapper.DoNotAskOption() { - @Override - public boolean isToBeShown() { - return true; - } + delete = MessageDialogBuilder.yesNo(title, message).project(myProject).yesText("Delete").noText("Cancel").doNotAsk( + new DialogWrapper.DoNotAskOption.Adapter() { + @Override + public void rememberChoice(boolean isSelected, int exitCode) { + deleteChoice.set(isSelected); + } - @Override - public void setToBeShown(boolean value, int exitCode) { - deleteChoice.set(!value); - } - - @Override - public boolean canBeHidden() { - return true; - } - - @Override - public boolean shouldSaveOptionsOnCancel() { - return false; - } - - @NotNull - @Override - public String getDoNotShowMessage() { - return checkboxMessage; - } - }).show() == Messages.YES; + @NotNull + @Override + public String getDoNotShowMessage() { + return checkboxMessage; + } + }).show() == Messages.YES; deleteTracking = deleteChoice.get(); } return new DeleteRemoteBranchDecision(delete, deleteTracking);