From df9e6aa2aa9ac635def65eb6993c7dd64fb9a578 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 3 Apr 2014 15:15:32 +0200 Subject: [PATCH] safe delete should not start callback when "safe" checkbox is not on --- .../refactoring/safeDelete/SafeDeleteDialog.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java index b72358702668..9086841fa211 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java @@ -197,7 +197,7 @@ public class SafeDeleteDialog extends DialogWrapper { @Override protected void doOKAction() { - if (myCallback != null) { + if (myCallback != null && isSafeDelete()) { myCallback.run(this); } else { super.doOKAction(); @@ -220,4 +220,11 @@ public class SafeDeleteDialog extends DialogWrapper { } } } + + private boolean isSafeDelete() { + if (isDelete()) { + return myCbSafeDelete.isSelected(); + } + return true; + } }