From 42f3de186fc3bcf90c935f20c84a23f1d91fe3e3 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 6 Oct 2014 11:23:17 +0200 Subject: [PATCH] invert boolean: cancel refactoring on cancel, fix read-only status change (IDEA-130836) --- .../invertBoolean/InvertBooleanHandler.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java index df8b69cb7064..70d4570a9ced 100644 --- a/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java @@ -56,13 +56,11 @@ public class InvertBooleanHandler implements RefactoringActionHandler { return; } - if (!CommonRefactoringUtil.checkReadOnlyStatus(project, var)) return; if (var instanceof PsiParameter && ((PsiParameter)var).getDeclarationScope() instanceof PsiMethod) { final PsiMethod method = (PsiMethod)((PsiParameter)var).getDeclarationScope(); final PsiMethod superMethod = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringBundle.message("to.refactor")); - if (superMethod != null) { - var = superMethod.getParameterList().getParameters()[method.getParameterList().getParameterIndex((PsiParameter)var)]; - } + if (superMethod == null) return; + var = superMethod.getParameterList().getParameters()[method.getParameterList().getParameterIndex((PsiParameter)var)]; } new InvertBooleanDialog(var).show(); @@ -87,9 +85,8 @@ public class InvertBooleanHandler implements RefactoringActionHandler { } final PsiMethod superMethod = SuperMethodWarningUtil.checkSuperMethod(method, RefactoringBundle.message("to.refactor")); - if (superMethod != null) method = superMethod; - - if (!CommonRefactoringUtil.checkReadOnlyStatus(project, method)) return; + if (superMethod == null) return; + method = superMethod; new InvertBooleanDialog(method).show(); }