From 93a9ce8e8a00afcf48344c5808323d3b151cdeb2 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 26 May 2016 18:19:39 +0300 Subject: [PATCH] remove the useless "dont ask again" checkbox it is not checked anywhere => the dialog will appear no matter if the checkbox was selected. --- .../src/com/intellij/dvcs/branch/DvcsTaskHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java index 8ea268184d94..5df8a961fe7b 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java @@ -19,7 +19,6 @@ import com.intellij.dvcs.repo.AbstractRepositoryManager; import com.intellij.dvcs.repo.Repository; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.text.StringUtil; @@ -69,7 +68,7 @@ public abstract class DvcsTaskHandler extends VcsTaskHandl StringUtil.join(problems, "
") + ".
" + "Do you want to checkout existing " + myBranchType + "?", StringUtil.capitalize(myBranchType) + " Already Exists", new String[]{Messages.YES_BUTTON, Messages.NO_BUTTON}, 0, - Messages.getWarningIcon(), new DialogWrapper.PropertyDoNotAskOption("git.checkout.existing.branch")) == 0) { + Messages.getWarningIcon()) == 0) { checkout(taskName, problems, null); map.addAll(problems); }