From 75376c7551e0fc1651528524ef6aafd84fb64dda Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 29 Nov 2016 11:10:13 +0100 Subject: [PATCH] don't clear read-only status after it was cleared by BaseRefactoringProcessor before writeAction --- .../MoveClassToInnerProcessor.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java index db9648d03c7d..637340a7b018 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiElementFilter; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilCore; import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.PackageWrapper; import com.intellij.refactoring.RefactoringBundle; @@ -39,9 +38,7 @@ import com.intellij.refactoring.rename.RenameUtil; import com.intellij.refactoring.util.*; import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; -import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.Processor; import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; @@ -124,8 +121,6 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor { } protected void performRefactoring(@NotNull UsageInfo[] usages) { - if (!prepareWritable(usages)) return; - MoveClassToInnerHandler[] handlers = MoveClassToInnerHandler.EP_NAME.getExtensions(); ArrayList usageList = new ArrayList<>(Arrays.asList(usages)); @@ -184,22 +179,6 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor { } } - private boolean prepareWritable(final UsageInfo[] usages) { - Set elementsToMakeWritable = new HashSet<>(); - Collections.addAll(elementsToMakeWritable, myClassesToMove); - elementsToMakeWritable.add(myTargetClass); - for(UsageInfo usage: usages) { - PsiElement element = usage.getElement(); - if (element != null) { - elementsToMakeWritable.add(element); - } - } - if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, PsiUtilCore.toPsiElementArray(elementsToMakeWritable))) { - return false; - } - return true; - } - private void saveNonCodeUsages(final UsageInfo[] usages) { for (PsiClass classToMove : myClassesToMove) { for(UsageInfo usageInfo: usages) {