From fe1a54bdc4fdb8f0678d698eb91ab143df5b1881 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 31 Jan 2025 14:45:57 +0100 Subject: [PATCH] IJ-CR-153713 revert visibility to public GitOrigin-RevId: 3ffb861b24257050035ccc6076716eab4b321dd4 --- .../classCanBeRecord/ConvertToRecordProcessor.java | 2 +- .../ChangeClassSignatureProcessor.java | 2 +- .../changeSignature/ChangeSignatureProcessor.java | 2 +- .../ConvertToInstanceMethodProcessor.java | 2 +- .../EncapsulateFieldsProcessor.java | 2 +- .../extractclass/ExtractClassProcessor.java | 2 +- .../InheritanceToDelegationProcessor.java | 2 +- .../inline/InlineConstantFieldProcessor.java | 4 ++-- .../refactoring/inline/InlineMethodProcessor.java | 4 ++-- .../refactoring/inline/InlineObjectProcessor.java | 2 +- .../inline/InlineParameterExpressionProcessor.java | 2 +- .../inline/InlineToAnonymousClassProcessor.java | 4 ++-- .../InlineSuperClassRefactoringProcessor.java | 2 +- .../IntroduceParameterProcessor.java | 2 +- .../MakeMethodOrClassStaticProcessor.java | 2 +- .../refactoring/migration/MigrationProcessor.java | 2 +- .../MoveClassToInnerProcessor.java | 2 +- .../MoveClassesOrPackagesProcessor.java | 4 ++-- .../move/moveInner/MoveInnerProcessor.java | 2 +- .../MoveInstanceMethodProcessor.java | 2 +- .../move/moveMembers/MoveMembersProcessor.java | 2 +- .../ReplaceConstructorWithBuilderProcessor.java | 2 +- .../turnRefsToSuper/TurnRefsToSuperProcessor.java | 2 +- .../TurnRefsToSuperProcessorBase.java | 2 +- .../typeMigration/TypeMigrationProcessor.java | 2 +- .../java/refactoring/ChangeSignatureBaseTest.java | 2 +- platform/lang-impl/api-dump-unreviewed.txt | 14 +++++--------- .../ChangeSignatureProcessorBase.java | 2 +- .../IntroduceParameterObjectProcessor.java | 2 +- .../invertBoolean/InvertBooleanProcessor.java | 2 +- .../memberPushDown/PushDownProcessor.java | 2 +- .../MoveDirectoryWithClassesProcessor.java | 2 +- .../MoveFilesOrDirectoriesProcessor.java | 2 +- .../refactoring/rename/RenameProcessor.java | 2 +- .../safeDelete/SafeDeleteProcessor.java | 4 ++-- .../GrChangeSignatureProcessor.java | 2 +- .../ExtractClosureFromClosureProcessor.java | 2 +- .../closure/ExtractClosureFromMethodProcessor.java | 2 +- .../inline/GroovyInlineLocalProcessor.java | 4 ++-- .../GrIntroduceClosureParameterProcessor.java | 2 +- .../parameter/GrIntroduceParameterProcessor.java | 2 +- .../codeInspection/JUnit5ConverterQuickFix.kt | 4 ++-- .../KotlinChangeSignatureProcessor.kt | 4 ++-- .../KotlinAwareMoveFilesOrDirectoriesProcessor.kt | 4 ++-- .../refactoring/move/MoveToKotlinFileProcessor.kt | 4 ++-- .../MoveKotlinDeclarationsProcessor.kt | 2 +- .../move/moveMethod/MoveKotlinMethodProcessor.kt | 4 ++-- .../pushDown/KotlinPushDownProcessor.kt | 4 ++-- ...bstractKotlinInlineNamedDeclarationProcessor.kt | 4 ++-- .../KotlinChangeSignatureProcessor.kt | 2 +- .../K2ChangePackageRefactoringProcessor.kt | 4 ++-- .../K2MoveDeclarationsRefactoringProcessor.kt | 4 ++-- .../removemiddleman/RemoveMiddlemanProcessor.java | 2 +- .../wrapreturnvalue/WrapReturnValueProcessor.java | 2 +- .../inline/PyInlineFunctionProcessor.kt | 2 +- 55 files changed, 74 insertions(+), 78 deletions(-) diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java index 217642c81ad6..bda4c1ebf037 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/classCanBeRecord/ConvertToRecordProcessor.java @@ -191,7 +191,7 @@ final class ConvertToRecordProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final UsageInfo[] usages = refUsages.get(); MultiMap conflicts = new MultiMap<>(); RenameUtil.addConflictDescriptions(usages, conflicts); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java index 07c5e09f4caa..6949dc141ef2 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java @@ -56,7 +56,7 @@ public class ChangeClassSignatureProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); final PsiTypeParameter[] parameters = myClass.getTypeParameters(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java index 0c4e4a65e6d0..3cdcb7ff7c61 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java @@ -99,7 +99,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { for (ChangeSignatureUsageProcessor processor : ChangeSignatureUsageProcessor.EP_NAME.getExtensions()) { if (!processor.setupDefaultValues(myChangeInfo, refUsages, myProject)) return false; } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java index ae61dc05df67..e3dd3ff4cca7 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java @@ -151,7 +151,7 @@ public final class ConvertToInstanceMethodProcessor extends BaseRefactoringProce } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); final Set methods = Collections.singleton(myMethod); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java index 12a9579f69ab..439f4557c2e7 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java @@ -98,7 +98,7 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); checkExistingMethods(conflicts, true); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java index 6f48c13d6604..c2002a71b4c8 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java @@ -140,7 +140,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); myExtractEnumProcessor.findEnumConstantConflicts(refUsages); if (!DestinationFolderComboBox.isAccessible(myProject, sourceClass.getContainingFile().getVirtualFile(), diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java index 6c55ae2b0abf..b54e67adfe69 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java @@ -170,7 +170,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final UsageInfo[] usagesIn = refUsages.get(); ArrayList oldUsages = new ArrayList<>(); Collections.addAll(oldUsages, usagesIn); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java index 0f497fbcdd1d..aadd4bb16144 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java @@ -71,7 +71,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { if (super.isPreviewUsages(usages)) return true; for (UsageInfo info : usages) { if (info instanceof NonCodeUsageInfo) return true; @@ -212,7 +212,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineMethodProcessor.java index a90b507dc362..d626e58904d4 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineMethodProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineMethodProcessor.java @@ -192,7 +192,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { for (UsageInfo usage : usages) { if (usage instanceof NonCodeUsageInfo) return true; } @@ -215,7 +215,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { if (!myInlineThisOnly && checkReadOnly()) { if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, myMethod)) return false; } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineObjectProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineObjectProcessor.java index 947f0405614c..c21b083017ea 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineObjectProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineObjectProcessor.java @@ -240,7 +240,7 @@ public final class InlineObjectProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final UsageInfo[] usagesIn = refUsages.get(); final MultiMap conflicts = new MultiMap<>(); final ReferencedElementsCollector collector = new ReferencedElementsCollector(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java index 8a3e19bbb9bf..c7d180c30a35 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java @@ -180,7 +180,7 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); JavaSafeDeleteProcessor.collectMethodConflicts(conflicts, myMethod, myParameter); final UsageInfo[] usages = refUsages.get(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java index 3035048f8e27..9d89cf799df5 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java @@ -103,7 +103,7 @@ public class InlineToAnonymousClassProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { if (super.isPreviewUsages(usages)) return true; for(UsageInfo usage: usages) { if (isForcePreview(usage)) { @@ -127,7 +127,7 @@ public class InlineToAnonymousClassProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { MultiMap conflicts = getConflicts(refUsages.get()); if (!conflicts.isEmpty()) { return showConflicts(conflicts, refUsages.get()); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java index 4060d55ff8f9..71bda8878561 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java @@ -224,7 +224,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); if (!ProgressManager.getInstance() .runProcessWithProgressSynchronously(() -> ReadAction.run(() -> collectConflicts(conflicts)), diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java index 30f2daffe235..150bc6a8dfce 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java @@ -236,7 +236,7 @@ public class IntroduceParameterProcessor extends BaseRefactoringProcessor implem } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java index 8df2557bffd7..0fe542dabb48 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java @@ -73,7 +73,7 @@ public abstract class MakeMethodOrClassStaticProcessor refUsages) { + protected final boolean preprocessUsages(final @NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); if (ApplicationManager.getApplication().isUnitTestMode() && !BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore()) { MultiMap conflictDescriptions = getConflictDescriptions(usagesIn); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationProcessor.java index 55b3cb5eb62b..a1d29e6ba368 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationProcessor.java @@ -117,7 +117,7 @@ public class MigrationProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { if (refUsages.get().length == 0) { Messages.showInfoMessage(myProject, JavaRefactoringBundle.message("migration.no.usages.found.in.the.project"), getRefactoringName()); return false; diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java index e0017d5f46cc..9eb3cc1d71bb 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java @@ -90,7 +90,7 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { final UsageInfo[] usages = refUsages.get(); return showConflicts(getConflicts(usages), usages); } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java index cc8a4285442a..640269c2d84d 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java @@ -262,7 +262,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final UsageInfo[] usages = refUsages.get(); return showConflicts(myConflicts, usages); } @@ -473,7 +473,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { if (UsageViewUtil.reportNonRegularUsages(usages, myProject)) { return true; } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java index 6f14edb37311..58e94a16472a 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java @@ -348,7 +348,7 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); final HashMap> reported = new HashMap<>(); class Visitor extends JavaRecursiveElementWalkingVisitor { diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java index ceccf1e05d97..ae1a7df0da84 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java @@ -90,7 +90,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{ } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final UsageInfo[] usages = refUsages.get(); MultiMap conflicts = new MultiMap<>(); final Set members = new HashSet<>(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java index ea5f27240d3d..86554a340a25 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java @@ -291,7 +291,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); final UsageInfo[] usages = refUsages.get(); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java index f96ff6394d78..249af7ccc508 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java @@ -312,7 +312,7 @@ public class ReplaceConstructorWithBuilderProcessor extends FixableUsagesRefacto } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); if (myMoveDestination != null && myCreateNewBuilderClass) { myMoveDestination.analyzeModuleConflicts(Collections.emptyList(), conflicts, refUsages.get()); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java index 4ab1542ecd5e..19550f7eaa2d 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java @@ -73,7 +73,7 @@ public class TurnRefsToSuperProcessor extends TurnRefsToSuperProcessorBase { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { if (!ApplicationManager.getApplication().isUnitTestMode() && refUsages.get().length == 0) { String message = JavaRefactoringBundle.message("no.usages.can.be.replaced", myClass.getQualifiedName(), mySuper.getQualifiedName()); Messages.showInfoMessage(myProject, message, TurnRefsToSuperHandler.getRefactoringName()); diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java b/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java index c6a195932bb7..7ec8a3bbbdb9 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java @@ -47,7 +47,7 @@ public abstract class TurnRefsToSuperProcessorBase extends BaseRefactoringProces private final List myVariablesUsages = new ArrayList<>(); @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usages = refUsages.get(); List filtered = new ArrayList<>(); for (UsageInfo usage : usages) { diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java index a6baa146d2e2..a548e0693459 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/typeMigration/TypeMigrationProcessor.java @@ -130,7 +130,7 @@ public class TypeMigrationProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { if (hasFailedConversions()) { if (ApplicationManager.getApplication().isUnitTestMode()) { if (ourSkipFailedConversionInTestMode) { diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ChangeSignatureBaseTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/ChangeSignatureBaseTest.java index 8864b20e8f0c..18d9e8fea9d9 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/ChangeSignatureBaseTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ChangeSignatureBaseTest.java @@ -117,7 +117,7 @@ public abstract class ChangeSignatureBaseTest extends LightRefactoringTestCase { newName != null ? newName : method.getName(), newType, genParams.genParams(method), genExceptions.genExceptions(method)) { @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { try { return super.preprocessUsages(refUsages); } diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index dc16cec08ddc..3b81afc4595c 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -15739,7 +15739,7 @@ a:com.intellij.refactoring.changeSignature.ChangeSignatureProcessorBase - getChangeInfo():com.intellij.refactoring.changeSignature.ChangeInfo - p:getCommandName():java.lang.String - p:getRefactoringId():java.lang.String -- isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z +- p:isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z - p:performRefactoring(com.intellij.usageView.UsageInfo[]):V f:com.intellij.refactoring.changeSignature.DefaultValueChooser - com.intellij.openapi.ui.DialogWrapper @@ -16313,7 +16313,6 @@ a:com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectDele f:com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectProcessor - com.intellij.refactoring.util.FixableUsagesRefactoringProcessor - (com.intellij.psi.PsiNamedElement,com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectClassDescriptor,java.util.List,Z):V -- preprocessUsages(com.intellij.openapi.util.Ref):Z f:com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectProcessor$ChangeSignatureUsageWrapper - com.intellij.refactoring.util.FixableUsageInfo - (com.intellij.usageView.UsageInfo):V @@ -16344,7 +16343,6 @@ f:com.intellij.refactoring.invertBoolean.InvertBooleanProcessor - com.intellij.refactoring.BaseRefactoringProcessor - (com.intellij.psi.PsiElement,java.lang.String):V - findUsages():com.intellij.usageView.UsageInfo[] -- preprocessUsages(com.intellij.openapi.util.Ref):Z c:com.intellij.refactoring.lang.ExtractIncludeDialog - com.intellij.openapi.ui.DialogWrapper - pf:myExtension:java.lang.String @@ -16450,7 +16448,7 @@ c:com.intellij.refactoring.memberPushDown.PushDownProcessor - p:getElementsToWrite(com.intellij.usageView.UsageViewDescriptor):java.util.Collection - p:getRefactoringId():java.lang.String - p:performRefactoring(com.intellij.usageView.UsageInfo[]):V -- preprocessUsages(com.intellij.openapi.util.Ref):Z +- p:preprocessUsages(com.intellij.openapi.util.Ref):Z - pushDownToClasses(com.intellij.usageView.UsageInfo[]):V - p:refreshElements(com.intellij.psi.PsiElement[]):V f:com.intellij.refactoring.memberPushDown.PushDownUsageViewDescriptor @@ -16551,7 +16549,7 @@ c:com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesPr - p:getTargetName():java.lang.String - p:performPsiSpoilingRefactoring():V - performRefactoring(com.intellij.usageView.UsageInfo[]):V -- preprocessUsages(com.intellij.openapi.util.Ref):Z +- p:preprocessUsages(com.intellij.openapi.util.Ref):Z f:com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesProcessor$TargetDirectoryWrapper - (com.intellij.psi.PsiDirectory):V - (com.intellij.psi.PsiDirectory,java.lang.String):V @@ -16615,7 +16613,7 @@ c:com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesPro - p:getRefactoringId():java.lang.String - p:performPsiSpoilingRefactoring():V - p:performRefactoring(com.intellij.usageView.UsageInfo[]):V -- preprocessUsages(com.intellij.openapi.util.Ref):Z +- p:preprocessUsages(com.intellij.openapi.util.Ref):Z - p:refreshElements(com.intellij.psi.PsiElement[]):V - p:retargetUsages(com.intellij.usageView.UsageInfo[],java.util.Map):V - p:shouldDisableAccessChecks():Z @@ -16772,7 +16770,7 @@ c:com.intellij.refactoring.rename.RenameProcessor - getNewNames():java.util.Collection - p:getRefactoringId():java.lang.String - hasNonCodeUsages():Z -- isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z +- p:isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z - isSearchInComments():Z - isSearchTextOccurrences():Z - p:performPsiSpoilingRefactoring():V @@ -17053,10 +17051,8 @@ f:com.intellij.refactoring.safeDelete.SafeDeleteProcessor - s:getDefaultInsideDeletedCondition(com.intellij.psi.PsiElement[]):com.intellij.openapi.util.Condition - getElements():com.intellij.psi.PsiElement[] - s:isInside(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z -- isPreviewUsages(com.intellij.usageView.UsageInfo[]):Z - isSearchInCommentsAndStrings():Z - isSearchNonJava():Z -- preprocessUsages(com.intellij.openapi.util.Ref):Z - setAfterRefactoringCallback(java.lang.Runnable):V - setSearchInCommentsAndStrings(Z):V - setSearchNonJava(Z):V diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java index 25e2d8175e3b..041355f5177a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java @@ -118,7 +118,7 @@ public abstract class ChangeSignatureProcessorBase extends BaseRefactoringProces @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { for (ChangeSignatureUsageProcessor processor : ChangeSignatureUsageProcessor.EP_NAME.getExtensions()) { if (processor.shouldPreviewUsages(myChangeInfo, usages)) return true; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java index 5f24bff2708a..e91e8628c94e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java @@ -108,7 +108,7 @@ public final class IntroduceParameterObjectProcessor refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final UsageInfo[] usageInfos = refUsages.get(); MultiMap conflicts = new MultiMap<>(); myDelegate.collectConflicts(conflicts, usageInfos, myMethod, myClassDescriptor); diff --git a/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java index efd0fd723ad7..0583b146bfdc 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java @@ -63,7 +63,7 @@ public final class InvertBooleanProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); final UsageInfo[] usageInfos = refUsages.get(); myDelegate.findConflicts(usageInfos, conflicts); diff --git a/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java index 7320a04612ea..2cf82447dc6e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java @@ -90,7 +90,7 @@ public class PushDownProcessor, } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); myDelegate.checkSourceClassConflicts(myPushDownData, conflicts); final UsageInfo[] usagesIn = refUsages.get(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java index cba548a8ab2c..455efc300770 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java @@ -123,7 +123,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); if (!ProgressManager.getInstance() .runProcessWithProgressSynchronously(() -> ReadAction.run(() -> collectConflicts(conflicts, refUsages)), RefactoringBundle.message("detecting.possible.conflicts"), true, myProject)) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java index 0dbc87b9822c..158092973bc8 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java @@ -269,7 +269,7 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { MultiMap conflicts = new MultiMap<>(); UsageInfo[] usages = refUsages.get(); if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> ReadAction.run(() -> MoveFileHandler.detectConflicts(myElementsToMove, usages, myNewParent, conflicts)), diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java index 7a1f5b93104e..2545df48bf88 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java @@ -346,7 +346,7 @@ public class RenameProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { return myForceShowPreview || super.isPreviewUsages(usages) || UsageViewUtil.reportNonRegularUsages(usages, myProject); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java index 9647cf07a54c..a6b8125812f8 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java @@ -162,7 +162,7 @@ public final class SafeDeleteProcessor extends BaseRefactoringProcessor { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usages = refUsages.get(); List conflicts = new ArrayList<>(); @@ -340,7 +340,7 @@ public final class SafeDeleteProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { if(myPreviewNonCodeUsages && UsageViewUtil.reportNonRegularUsages(usages, myProject)) { return true; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java index 549acacf02bf..b014c3127cd5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java @@ -48,7 +48,7 @@ public class GrChangeSignatureProcessor extends ChangeSignatureProcessorBase { } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { MultiMap conflictDescriptions = new MultiMap<>(); collectConflictsFromExtensions(refUsages, conflictDescriptions, myChangeInfo); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromClosureProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromClosureProcessor.java index 95b60f8535f6..f46c6db1e866 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromClosureProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromClosureProcessor.java @@ -33,7 +33,7 @@ public class ExtractClosureFromClosureProcessor extends ExtractClosureProcessorB } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromMethodProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromMethodProcessor.java index 7de3161432c9..f4fc2d8432a7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromMethodProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/closure/ExtractClosureFromMethodProcessor.java @@ -58,7 +58,7 @@ public class ExtractClosureFromMethodProcessor extends ExtractClosureProcessorBa } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); final GrStatement[] statements = myHelper.getStatements(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java index b2e4be0bfc43..7bbd884e861b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineLocalProcessor.java @@ -63,7 +63,7 @@ public class GroovyInlineLocalProcessor extends BaseRefactoringProcessor { @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); final UsageInfo[] usages = refUsages.get(); for (UsageInfo usage : usages) { @@ -74,7 +74,7 @@ public class GroovyInlineLocalProcessor extends BaseRefactoringProcessor { } @Override - public boolean isPreviewUsages(UsageInfo @NotNull [] usages) { + protected boolean isPreviewUsages(UsageInfo @NotNull [] usages) { for (UsageInfo usage : usages) { if (usage instanceof ClosureUsage) return true; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java index b89b280fda31..33cdb9d56e1e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceClosureParameterProcessor.java @@ -106,7 +106,7 @@ public class GrIntroduceClosureParameterProcessor extends BaseRefactoringProcess } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java index 4f18a7a9e0f9..d5b0b35bdb1d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java @@ -87,7 +87,7 @@ public final class GrIntroduceParameterProcessor extends BaseRefactoringProcesso } @Override - public boolean preprocessUsages(@NotNull Ref refUsages) { + protected boolean preprocessUsages(@NotNull Ref refUsages) { UsageInfo[] usagesIn = refUsages.get(); MultiMap conflicts = new MultiMap<>(); diff --git a/plugins/junit/src/com/intellij/execution/junit/codeInspection/JUnit5ConverterQuickFix.kt b/plugins/junit/src/com/intellij/execution/junit/codeInspection/JUnit5ConverterQuickFix.kt index a1d6f381e51c..e7228ed88ef0 100644 --- a/plugins/junit/src/com/intellij/execution/junit/codeInspection/JUnit5ConverterQuickFix.kt +++ b/plugins/junit/src/com/intellij/execution/junit/codeInspection/JUnit5ConverterQuickFix.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.execution.junit.codeInspection import com.intellij.codeInsight.AnnotationUtil @@ -85,7 +85,7 @@ class JUnit5ConverterQuickFix : LocalQuickFix, BatchQuickFix { return ArrayUtil.mergeArrays(usages, descriptionUsages) } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val conflicts = MultiMap() files.forEach { file -> file.classes.forEach { psiClass -> diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt index 25bd4691b135..c5d129e69082 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt @@ -119,7 +119,7 @@ class KotlinChangeSignatureProcessor( } } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val usageProcessors = ChangeSignatureUsageProcessor.EP_NAME.extensions if (!usageProcessors.all { it.setupDefaultValues(myChangeInfo, refUsages, myProject) }) return false @@ -150,7 +150,7 @@ class KotlinChangeSignatureProcessor( return showConflicts(conflictDescriptions, usageArray) } - override fun isPreviewUsages(usages: Array): Boolean = isPreviewUsages + protected override fun isPreviewUsages(usages: Array): Boolean = isPreviewUsages override fun getCommandName() = commandName diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/KotlinAwareMoveFilesOrDirectoriesProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/KotlinAwareMoveFilesOrDirectoriesProcessor.kt index 5b35c40f079d..e4f8e35f7262 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/KotlinAwareMoveFilesOrDirectoriesProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/KotlinAwareMoveFilesOrDirectoriesProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.refactoring.move @@ -48,7 +48,7 @@ class KotlinAwareMoveFilesOrDirectoriesProcessor @JvmOverloads constructor( } } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val (conflicts, usages) = MoveConflictUsages.preprocess(refUsages) return showConflicts(conflicts, usages) } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveToKotlinFileProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveToKotlinFileProcessor.kt index 9bc72c85c80d..69b705a302a0 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveToKotlinFileProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveToKotlinFileProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.refactoring.move @@ -42,7 +42,7 @@ class MoveToKotlinFileProcessor @JvmOverloads constructor( return MoveFilesWithDeclarationsViewDescriptor(arrayOf(sourceFile), targetDirectory) } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val (conflicts, usages) = MoveConflictUsages.preprocess(refUsages) return showConflicts(conflicts, usages) } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt index 48c2e8d82601..3b97faccd043 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt @@ -246,7 +246,7 @@ open class MoveKotlinDeclarationsProcessor( return UsageViewUtil.removeDuplicatedUsages(usages.toTypedArray()) } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { return showConflicts(conflicts, refUsages.get()) } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt index 5eb362d40771..ef994f32edca 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveMethod/MoveKotlinMethodProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.refactoring.move.moveMethod import com.intellij.ide.util.EditorHelper @@ -60,7 +60,7 @@ class MoveKotlinMethodProcessor( ) } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { return showConflicts(conflicts, refUsages.get()) } diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownProcessor.kt index d4e98f339321..ff98e5eb78b4 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.refactoring.pushDown @@ -94,7 +94,7 @@ class KotlinPushDownProcessor( .toTypedArray() } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val usages = refUsages.get() ?: UsageInfo.EMPTY_ARRAY if (usages.isEmpty()) { val message = KotlinBundle.message("text.0.have.no.inheritors.warning", context.sourceClassDescriptor.renderForConflicts()) diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedDeclarationProcessor.kt b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedDeclarationProcessor.kt index d2844e923c63..bb5d727b555d 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedDeclarationProcessor.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/inline/AbstractKotlinInlineNamedDeclarationProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.refactoring.inline @@ -80,7 +80,7 @@ abstract class AbstractKotlinInlineNamedDeclarationProcessor, conflicts: MultiMap) = Unit - final override fun preprocessUsages(refUsages: Ref>): Boolean { + protected final override fun preprocessUsages(refUsages: Ref>): Boolean { val usagesInfo = refUsages.get() if (inlineThisOnly) { val element = usagesInfo.singleOrNull()?.element diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt index f6edb60f4753..c911db5baf4c 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt @@ -25,7 +25,7 @@ open class KotlinChangeSignatureProcessor(project: Project, changeInfo: KotlinCh return KotlinUsagesViewDescriptor(method, RefactoringBundle.message("0.to.change.signature", UsageViewUtil.getType(method))) } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val usageProcessors = ChangeSignatureUsageProcessor.EP_NAME.extensions if (!usageProcessors.all { it.setupDefaultValues(myChangeInfo, refUsages, myProject) }) return false diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2ChangePackageRefactoringProcessor.kt b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2ChangePackageRefactoringProcessor.kt index 6d94fe39d378..9585afa758c8 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2ChangePackageRefactoringProcessor.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2ChangePackageRefactoringProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.k2.refactoring.move.processor import com.intellij.openapi.actionSystem.ex.ActionUtil @@ -29,7 +29,7 @@ class K2ChangePackageRefactoringProcessor(private val descriptor: K2ChangePackag }.toTypedArray() } - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val usages = refUsages.get() val conflicts = ActionUtil.underModalProgress( descriptor.project, diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2MoveDeclarationsRefactoringProcessor.kt b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2MoveDeclarationsRefactoringProcessor.kt index 09eef1b56369..7a1c3cfcb3a4 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2MoveDeclarationsRefactoringProcessor.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/processor/K2MoveDeclarationsRefactoringProcessor.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.k2.refactoring.move.processor import com.intellij.ide.util.EditorHelper @@ -125,7 +125,7 @@ open class K2MoveDeclarationsRefactoringProcessor( private val conflicts: MultiMap = MultiMap() - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { val usages = refUsages.get() ActionUtil.underModalProgress( operationDescriptor.project, diff --git a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java index 1369183cd682..c78b16653ecf 100644 --- a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java +++ b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java @@ -61,7 +61,7 @@ public class RemoveMiddlemanProcessor extends FixableUsagesRefactoringProcessor } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { final MultiMap conflicts = new MultiMap<>(); for (MemberInfo memberInfo : myDelegateMethodInfos) { if (memberInfo.isChecked() && memberInfo.isToAbstract()) { diff --git a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java index 6e70b70b8fa7..205f71ca0bdc 100644 --- a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java +++ b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java @@ -171,7 +171,7 @@ public class WrapReturnValueProcessor extends FixableUsagesRefactoringProcessor } @Override - public boolean preprocessUsages(final @NotNull Ref refUsages) { + protected boolean preprocessUsages(final @NotNull Ref refUsages) { MultiMap conflicts = new MultiMap<>(); PsiClass existingClass = JavaPsiFacade.getInstance(myProject).findClass(myQualifiedName, GlobalSearchScope.allScope(myProject)); if (myUseExistingClass) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineFunctionProcessor.kt b/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineFunctionProcessor.kt index b73b25b462ab..25a93c120a44 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineFunctionProcessor.kt +++ b/python/python-psi-impl/src/com/jetbrains/python/refactoring/inline/PyInlineFunctionProcessor.kt @@ -46,7 +46,7 @@ class PyInlineFunctionProcessor(project: Project, private val myGenerator = PyElementGenerator.getInstance(myProject) private var myRemoveDeclaration = !myInlineThisOnly && removeDeclaration - override fun preprocessUsages(refUsages: Ref>): Boolean { + protected override fun preprocessUsages(refUsages: Ref>): Boolean { if (refUsages.isNull) return false val conflicts = MultiMap.create() val usagesAndImports = refUsages.get()