diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveNewKeywordFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveNewKeywordFix.java index 35188f450c3c..5085163074fb 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveNewKeywordFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RemoveNewKeywordFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.analysis; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiJavaCodeReferenceElement; import com.intellij.psi.PsiNewExpression; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingDeconstructionComponentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingDeconstructionComponentsFix.java index 414e4695c0a4..2b69beb61a18 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingDeconstructionComponentsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingDeconstructionComponentsFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import one.util.streamex.StreamEx; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt index cfdadaa4a58d..82108118dd7f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddModuleDirectiveFix.kt @@ -2,10 +2,10 @@ package com.intellij.codeInsight.daemon.impl.quickfix import com.intellij.codeInsight.daemon.QuickFixBundle -import com.intellij.codeInspection.PsiUpdateModCommandAction import com.intellij.codeInspection.util.IntentionName import com.intellij.modcommand.ModCommandAction import com.intellij.modcommand.ModPsiUpdater +import com.intellij.modcommand.PsiUpdateModCommandAction import com.intellij.openapi.project.Project import com.intellij.psi.PsiElementFactory import com.intellij.psi.PsiJavaModule diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java index ed657c68372e..b4501c7c2027 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java @@ -3,9 +3,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java index d1e9d8a35e44..2355280169ca 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java @@ -6,9 +6,9 @@ import com.intellij.codeInsight.daemon.QuickFixActionRegistrar; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.guess.GuessManager; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AdjustFunctionContextFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AdjustFunctionContextFix.java index cadfb446ac13..e7a1564cea0e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AdjustFunctionContextFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AdjustFunctionContextFix.java @@ -4,8 +4,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java index 78e563f9ccee..4143401a5447 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java @@ -3,9 +3,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.RemoveRedundantTypeArgumentsUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.UnfairTextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java index 8a77ba7e3a4e..d63364756536 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java @@ -4,8 +4,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java index 7b12000e9076..21c813c71456 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java @@ -4,9 +4,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java index c32239245a55..221806042c9b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java index 4a9669a80f1c..a537662a4cf7 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeReceiverParameterFirstFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeReceiverParameterFirstFix.java index 6688d36eaf1d..4418991404e1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeReceiverParameterFirstFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeReceiverParameterFirstFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeModuleStatementsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeModuleStatementsFix.java index d96d0ed2398d..482be30ca7c1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeModuleStatementsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeModuleStatementsFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java index 0f019fc4da4b..86fa28f9886c 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java index 965109d37773..85ff5be86637 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils; import com.intellij.codeInsight.javadoc.JavaDocUtil; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.find.findUsages.JavaFindUsagesHelper; import com.intellij.find.findUsages.JavaMethodFindUsagesOptions; import com.intellij.java.analysis.JavaAnalysisBundle; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationOnStaticMemberQualifyingTypeFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationOnStaticMemberQualifyingTypeFix.java index 79f7323ac96d..baafcd7dfb0d 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationOnStaticMemberQualifyingTypeFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationOnStaticMemberQualifyingTypeFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.JavaErrorBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationToPackageInfoFileFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationToPackageInfoFileFix.java index 5f30f1c13dac..543c01b50af2 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationToPackageInfoFileFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveAnnotationToPackageInfoFileFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveParenthesisFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveParenthesisFix.java index ccccbe43b168..b1eed510fc56 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveParenthesisFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveParenthesisFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NormalizeBracketsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NormalizeBracketsFix.java index a1686056eeb1..181e85943b76 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NormalizeBracketsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NormalizeBracketsFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiVariable; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java index 665d5cd9261d..99fdd7c0bc2f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyMethodCallFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyMethodCallFix.java index 3fab25cd8fbe..5c13167dc421 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyMethodCallFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyMethodCallFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiMethodCallExpression; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java index df4489ea0902..a13165ede07b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java index 0ecf0f7a3b8f..e4d9fd1a24f2 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiClass; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantArgumentsFix.java index 5fb6e0dd9811..16eb9363fba3 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantArgumentsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantArgumentsFix.java @@ -5,8 +5,8 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRepeatingCallFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRepeatingCallFix.java index 25d057c5211a..bfbd8cf67516 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRepeatingCallFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRepeatingCallFix.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.PsiEquivalenceUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiMethodCallExpression; import com.siyeh.ig.psiutils.MethodCallUtils; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceExpressionAction.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceExpressionAction.java index 36ef15a0a5e6..8e9f9aec9bfd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceExpressionAction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceExpressionAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiExpression; import com.siyeh.ig.psiutils.CommentTracker; import org.jetbrains.annotations.NotNull; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java index 452e716f74b4..e105f633220f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java @@ -4,9 +4,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTypesUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceVarWithExplicitTypeFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceVarWithExplicitTypeFix.java index 11a3ee25d358..9e34af0502e2 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceVarWithExplicitTypeFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceVarWithExplicitTypeFix.java @@ -1,10 +1,10 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.VariableTypeCanBeExplicitInspection; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.PsiTypesUtil; import com.intellij.util.containers.ContainerUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithQualifierFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithQualifierFix.java index 32196d259e57..8d59df9890d9 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithQualifierFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithQualifierFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiMethodCallExpression; import com.siyeh.ig.psiutils.CommentTracker; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithYieldFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithYieldFix.java index b8a2ae30e053..8e5718256947 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithYieldFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithYieldFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.editor.Document; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiExpression; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java index 8b11e289ff2c..e5f051626ef5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; import com.intellij.openapi.project.Project; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java index 31fa87ab7711..2dd67d0a5063 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java index a734a32773f0..ff5d4ae92168 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapObjectWithOptionalOfNullableFix.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddTypeAnnotationFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddTypeAnnotationFix.java index 7c494f8f905d..1c7f73ce03c7 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddTypeAnnotationFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddTypeAnnotationFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiAnnotation; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java index 7ac563ac63c6..646f02d1cb8c 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousHasLambdaAlternativeInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousHasLambdaAlternativeInspection.java index e6c805ad6536..4268f34ae9df 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousHasLambdaAlternativeInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousHasLambdaAlternativeInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java index 2d59bfc3dbb7..1b748cf45554 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java @@ -5,6 +5,7 @@ import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.lang.Commenter; import com.intellij.lang.LanguageCommenters; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.patterns.ElementPattern; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/ClassGetClassInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/ClassGetClassInspection.java index 8bf208b32bd1..345f90f52598 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/ClassGetClassInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/ClassGetClassInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/ConditionalBreakInInfiniteLoopInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/ConditionalBreakInInfiniteLoopInspection.java index 7085fe2494d9..84195f637453 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/ConditionalBreakInInfiniteLoopInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/ConditionalBreakInInfiniteLoopInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java index 2c8b1bf60425..798ef9059ffc 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/ExplicitTypeCanBeDiamondInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java index 344507a8cf61..a1bdd54d7a84 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/InvalidComparatorMethodReferenceInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java index 23b9e3919307..dcff556c9bb6 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveSuppressWarningAction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveSuppressWarningAction.java index e7d8653a1984..8a0a5319b4aa 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveSuppressWarningAction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveSuppressWarningAction.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/StringTokenizerDelimiterInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/StringTokenizerDelimiterInspection.java index 363a05b5ea4e..8aefebf94240 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/StringTokenizerDelimiterInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/StringTokenizerDelimiterInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import org.jetbrains.annotations.NonNls; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/SuspiciousReturnByteInputStreamInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/SuspiciousReturnByteInputStreamInspection.java index ed1ab88f5ea0..db57fc814590 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/SuspiciousReturnByteInputStreamInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/SuspiciousReturnByteInputStreamInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/UseCompareMethodInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/UseCompareMethodInspection.java index 39dd5eb02722..ec4ae25e1bb8 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/UseCompareMethodInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/UseCompareMethodInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.PsiEquivalenceUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.pom.java.LanguageLevel; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java index 8a31f0f8716f..300f9645a241 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.reference.*; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java index 14b8f2466d8b..2435ed82ed61 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/JavacQuirksInspectionVisitor.java @@ -12,6 +12,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.miscGenerics.RedundantTypeArgsInspection; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdkVersion; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java index 6826a0133eba..81fc76819a48 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java @@ -3,7 +3,7 @@ package com.intellij.codeInspection.dataFlow; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.jvm.SpecialField; import com.intellij.codeInspection.dataFlow.types.DfType; import com.intellij.codeInspection.dataFlow.types.DfTypes; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/RedundantInstanceofFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/RedundantInstanceofFix.java index 80dce0d3ecac..1e0cf9251a00 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/RedundantInstanceofFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/RedundantInstanceofFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.dataFlow.fix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.util.PsiUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithArgumentFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithArgumentFix.java index b1b3204be71c..15a0e6162f2d 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithArgumentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithArgumentFix.java @@ -2,10 +2,10 @@ package com.intellij.codeInspection.dataFlow.fix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithBooleanEqualsFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithBooleanEqualsFix.java index 6d70ae6dc2d1..c3942d94e9b6 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithBooleanEqualsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithBooleanEqualsFix.java @@ -2,9 +2,9 @@ package com.intellij.codeInspection.dataFlow.fix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiElement; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithConstantValueFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithConstantValueFix.java index ecd45586de29..ce0d4603d8b9 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithConstantValueFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithConstantValueFix.java @@ -3,11 +3,11 @@ package com.intellij.codeInspection.dataFlow.fix; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModChooseAction; import com.intellij.modcommand.ModCommand; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.psi.*; import com.intellij.refactoring.extractMethod.ExtractMethodUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithObjectsEqualsFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithObjectsEqualsFix.java index 184a3cf67469..96c878f4979b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithObjectsEqualsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/ReplaceWithObjectsEqualsFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInspection.dataFlow.fix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SimplifyToAssignmentFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SimplifyToAssignmentFix.java index a68e67a0e234..0a162969023f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SimplifyToAssignmentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SimplifyToAssignmentFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.dataFlow.fix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SurroundWithRequireNonNullFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SurroundWithRequireNonNullFix.java index 0eccfe938878..6dffa90457c6 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SurroundWithRequireNonNullFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/fix/SurroundWithRequireNonNullFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.dataFlow.fix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt b/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt index f154fec64707..ce4866709259 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.deprecation -import com.intellij.codeInspection.PsiUpdateModCommandAction +import com.intellij.modcommand.PsiUpdateModCommandAction import com.intellij.modcommand.ModCommandAction import com.intellij.modcommand.ModCommandAction.Presentation import com.intellij.modcommand.ModPsiUpdater @@ -27,7 +27,7 @@ private fun generateQualifierText(expr: PsiReferenceExpression, } } -internal class ReplaceMethodCallFix(expr: PsiMethodCallExpression, replacementMethod: PsiMethod) : +internal class ReplaceMethodCallFix(expr: PsiMethodCallExpression, replacementMethod: PsiMethod) : PsiUpdateModCommandAction(expr) { private val myReplacementMethodPointer = SmartPointerManager.getInstance(replacementMethod.project).createSmartPsiElementPointer(replacementMethod) @@ -56,7 +56,7 @@ internal class ReplaceMethodCallFix(expr: PsiMethodCallExpression, replacementMe } } -internal class ReplaceFieldReferenceFix(expr: PsiReferenceExpression, replacementMember: PsiMember) : +internal class ReplaceFieldReferenceFix(expr: PsiReferenceExpression, replacementMember: PsiMember) : PsiUpdateModCommandAction(expr) { private val myReplacementMemberPointer = SmartPointerManager.getInstance(replacementMember.project).createSmartPsiElementPointer(replacementMember) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ListSortInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ListSortInspection.java index 392955dd91c7..0d016e5a8948 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ListSortInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8ListSortInspection.java @@ -4,7 +4,7 @@ package com.intellij.codeInspection.java18api; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.pom.java.JavaFeature; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9RedundantRequiresStatementInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9RedundantRequiresStatementInspection.java index 1bfde5d9c0a4..83d66bcf7d11 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9RedundantRequiresStatementInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9RedundantRequiresStatementInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.reference.*; import com.intellij.concurrency.ConcurrentCollectionFactory; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.module.LanguageLevelUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java b/java/java-analysis-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java index 6467f3014ad0..c0920310f73e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java @@ -5,6 +5,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java index 0c612f651726..ee29a4023d6b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.compiler.JavacQuirksInspectionVisitor; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/MoveAnnotationToArrayFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/MoveAnnotationToArrayFix.java index 36301deb5f3a..585d38e21add 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/MoveAnnotationToArrayFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/MoveAnnotationToArrayFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.nullable; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java index 917a335dd0bb..a16b21cd4736 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.miscGenerics.SuspiciousMethodCallUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiExpressionTrimRenderer; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationLocalInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationLocalInspection.java index c7814d465a37..a1dcdbc9a8f4 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationLocalInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationLocalInspection.java @@ -9,13 +9,13 @@ import com.intellij.codeInsight.javadoc.JavaDocUtil; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.deadCode.UnusedDeclarationInspectionBase; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.lang.jvm.JvmModifier; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Attachment; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java index 019d26a67d71..4134bc090af5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java @@ -14,6 +14,7 @@ import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java index b7c89e06f484..950d18b13754 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java @@ -2,10 +2,10 @@ package com.intellij.codeInspection.wrongPackageStatement; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandQuickFix; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.SingleFileSourcesTracker; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/BulkFileAttributesReadInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/BulkFileAttributesReadInspection.java index ff161e8fcfd6..4c0f98eafb88 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/BulkFileAttributesReadInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/BulkFileAttributesReadInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/CastCanBeReplacedWithVariableInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/CastCanBeReplacedWithVariableInspection.java index bf8ee69c10ba..dadfe1ba2ca4 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/CastCanBeReplacedWithVariableInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/CastCanBeReplacedWithVariableInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/CharsetObjectCanBeUsedInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/CharsetObjectCanBeUsedInspection.java index a7a711023113..e279c92a30bb 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/CharsetObjectCanBeUsedInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/CharsetObjectCanBeUsedInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.DeleteCatchFix; import com.intellij.codeInsight.daemon.impl.quickfix.DeleteMultiCatchFix; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.module.LanguageLevelUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java index 07e9951bbb18..ce334a805c8c 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.dataFlow.TypeConstraints; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.options.OptionController; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java index df5dd377f0a4..419e25206335 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.intention.impl.RemoveRedundantParameterTypesFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java index f538d959d2b6..f9d7daed2d5d 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ConditionalCanBeOptionalInspection.java @@ -9,6 +9,7 @@ import com.intellij.codeInspection.util.OptionalRefactoringUtil; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/DeconstructionCanBeUsedInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/DeconstructionCanBeUsedInspection.java index 3a211030b97e..3a3669f77762 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/DeconstructionCanBeUsedInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/DeconstructionCanBeUsedInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/DefaultAnnotationParamInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/DefaultAnnotationParamInspection.java index 78b046eefbe7..f51e7256deec 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/DefaultAnnotationParamInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/DefaultAnnotationParamInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/DuplicateBranchesInSwitchInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/DuplicateBranchesInSwitchInspection.java index 8c5a08d5232d..ac6b55d6b3a0 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/DuplicateBranchesInSwitchInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/DuplicateBranchesInSwitchInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java index 3ce0b1fc47b3..fdc681ae6a00 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/EnhancedSwitchBackwardMigrationInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.BlockUtils; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java index c3479ffdf091..c6a1054cba8d 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ExplicitArrayFillingInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ForEachWithRecordPatternCanBeUsedInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ForEachWithRecordPatternCanBeUsedInspection.java index 69dfa4128f93..be2a658f0ac5 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ForEachWithRecordPatternCanBeUsedInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ForEachWithRecordPatternCanBeUsedInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.VariableKind; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/IOStreamConstructorInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/IOStreamConstructorInspection.java index dc6342dd24f2..2561c3e5b5f6 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/IOStreamConstructorInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/IOStreamConstructorInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/InconsistentTextBlockIndentInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/InconsistentTextBlockIndentInspection.java index 4bbeadabeb59..a41bc6cc73eb 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/InconsistentTextBlockIndentInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/InconsistentTextBlockIndentInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.ide.highlighter.JavaFileType; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.JavaElementVisitor; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ManualMinMaxCalculationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ManualMinMaxCalculationInspection.java index 4b543736b2ff..62e70006b274 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ManualMinMaxCalculationInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ManualMinMaxCalculationInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/MoveFieldAssignmentToInitializerInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/MoveFieldAssignmentToInitializerInspection.java index ae8d12211732..449cf541a0f4 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/MoveFieldAssignmentToInitializerInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/MoveFieldAssignmentToInitializerInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.ExceptionUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ObviousNullCheckInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ObviousNullCheckInspection.java index b6625bb4ab5d..bdcefb8e94f0 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ObviousNullCheckInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ObviousNullCheckInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.dataFlow.*; import com.intellij.codeInspection.dataFlow.ContractReturnValue.ParameterReturnValue; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalAssignedToNullInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalAssignedToNullInspection.java index ee8f0117569c..e33111ca3960 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalAssignedToNullInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalAssignedToNullInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalIsPresentInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalIsPresentInspection.java index 54d57a04ba1f..52f62060ae89 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalIsPresentInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/OptionalIsPresentInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.util.OptionalRefactoringUtil; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/OverwrittenKeyInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/OverwrittenKeyInspection.java index c78dcca74fab..a4aa6886a4b8 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/OverwrittenKeyInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/OverwrittenKeyInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandQuickFix; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariableCanBeUsedInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariableCanBeUsedInspection.java index c16abe8fd8d1..5f52fb2fd5c7 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariableCanBeUsedInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariableCanBeUsedInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInsight.intention.FileModifier; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleSettings; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariablesCanBeReplacedWithCastInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariablesCanBeReplacedWithCastInspection.java index 0e2170aa8331..ca59a44881eb 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariablesCanBeReplacedWithCastInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/PatternVariablesCanBeReplacedWithCastInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ReadWriteStringCanBeUsedInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ReadWriteStringCanBeUsedInspection.java index 548b3a25b489..d292b445d566 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ReadWriteStringCanBeUsedInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ReadWriteStringCanBeUsedInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantFileCreationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantFileCreationInspection.java index 4291f714b795..856403f22468 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantFileCreationInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantFileCreationInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantRecordConstructorInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantRecordConstructorInspection.java index 904d60edc0eb..54c8536d93a8 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantRecordConstructorInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantRecordConstructorInspection.java @@ -9,6 +9,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.DeleteElementFix; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.JavaElementKind; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java index b26a160a4b5f..3ab1d23ab795 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantUnmodifiableInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantUnmodifiableInspection.java index 373266d7b5a7..a364865b5d6c 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantUnmodifiableInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/RedundantUnmodifiableInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.dataFlow.Mutability; import com.intellij.codeInspection.dataFlow.types.DfType; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java index 875921fc51d3..763382417925 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.redundantCast.RemoveRedundantCastUtil; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceNullCheckInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceNullCheckInspection.java index 29f6165684bb..fd3a8a797d1c 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceNullCheckInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/ReplaceNullCheckInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyCollectorInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyCollectorInspection.java index 10a8d2804cc4..89e016747362 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyCollectorInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyCollectorInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java index a41b7716725c..567e38739644 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.dataFlow.types.DfTypes; import com.intellij.codeInspection.util.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java index 0b9ddbcfbffa..be3cd74b5162 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java @@ -12,6 +12,7 @@ import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SlowAbstractSetRemoveAllInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SlowAbstractSetRemoveAllInspection.java index cd3a4a77a066..43c257d73cae 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SlowAbstractSetRemoveAllInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SlowAbstractSetRemoveAllInspection.java @@ -9,6 +9,7 @@ import com.intellij.codeInspection.dataFlow.types.DfIntegralType; import com.intellij.codeInspection.dataFlow.types.DfType; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SlowListContainsAllInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SlowListContainsAllInspection.java index 02a90a5e0342..bb5be0881ce5 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SlowListContainsAllInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SlowListContainsAllInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/StringRepeatCanBeUsedInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/StringRepeatCanBeUsedInspection.java index f4cc305f5818..751bb8534e7f 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/StringRepeatCanBeUsedInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/StringRepeatCanBeUsedInspection.java @@ -9,6 +9,7 @@ import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/SuspiciousTernaryOperatorInVarargsCallInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/SuspiciousTernaryOperatorInVarargsCallInspection.java index 5bdd122fb56c..0647bad71d48 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/SuspiciousTernaryOperatorInVarargsCallInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/SuspiciousTernaryOperatorInVarargsCallInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockBackwardMigrationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockBackwardMigrationInspection.java index 72df8f8428a3..76316d5e3c58 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockBackwardMigrationInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockBackwardMigrationInspection.java @@ -5,6 +5,7 @@ import com.intellij.application.options.CodeStyle; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockMigrationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockMigrationInspection.java index 0aeeff220287..891de1af22b8 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockMigrationInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/TextBlockMigrationInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/TrailingWhitespacesInTextBlockInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/TrailingWhitespacesInTextBlockInspection.java index 0f90a928d3a6..1a5162dc9c0f 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/TrailingWhitespacesInTextBlockInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/TrailingWhitespacesInTextBlockInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/WrapperTypeMayBePrimitiveInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/WrapperTypeMayBePrimitiveInspection.java index 6513b170c533..88bd840a660f 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/WrapperTypeMayBePrimitiveInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/WrapperTypeMayBePrimitiveInspection.java @@ -7,6 +7,7 @@ import com.intellij.java.JavaBundle; import com.intellij.lang.jvm.JvmModifier; import com.intellij.lang.jvm.types.JvmPrimitiveTypeKind; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.LocalSearchScope; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/RedundantLabeledSwitchRuleCodeBlockInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/RedundantLabeledSwitchRuleCodeBlockInspection.java index 9b64b312001d..0a1b0f400848 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/RedundantLabeledSwitchRuleCodeBlockInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/RedundantLabeledSwitchRuleCodeBlockInspection.java @@ -4,8 +4,8 @@ package com.intellij.codeInspection.enhancedSwitch; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java index 6cfa14b63fe6..ababfa96e8e0 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java @@ -4,8 +4,8 @@ package com.intellij.codeInspection.enhancedSwitch; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/intermediaryVariable/ReturnSeparatedFromComputationInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/intermediaryVariable/ReturnSeparatedFromComputationInspection.java index adb225f27def..1a8fe31860f1 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/intermediaryVariable/ReturnSeparatedFromComputationInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/intermediaryVariable/ReturnSeparatedFromComputationInspection.java @@ -4,9 +4,9 @@ package com.intellij.codeInspection.intermediaryVariable; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java index 04f59488c993..9df448d04f13 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8CollectionRemoveIfInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.ForEachCollectionTraversal; import com.intellij.codeInspection.util.IterableTraversal; import com.intellij.codeInspection.util.IteratorDeclaration; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8ListReplaceAllInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8ListReplaceAllInspection.java index f86e126fe985..9fd50de86582 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8ListReplaceAllInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8ListReplaceAllInspection.java @@ -7,7 +7,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IteratorDeclaration; import com.intellij.codeInspection.util.LambdaGenerationUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java index 740214d64c0e..29b7982e8e7f 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapApiInspection.java @@ -10,6 +10,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java index 5d46e736e954..5331c22b997f 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/Java8MapForEachInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.java.JavaBundle; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.pom.java.JavaFeature; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/OptionalGetWithoutIsPresentInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/OptionalGetWithoutIsPresentInspection.java index 739202f39c64..281ccdb3e828 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/OptionalGetWithoutIsPresentInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java18api/OptionalGetWithoutIsPresentInspection.java @@ -15,6 +15,7 @@ import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.VariableKind; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspection.java index 5dbf237e0080..bf1c39e55529 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/java19api/Java9CollectionFactoryInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExcessiveLambdaUsageInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExcessiveLambdaUsageInspection.java index 44dc8accf23d..97c27dc3e91d 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExcessiveLambdaUsageInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExcessiveLambdaUsageInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection.lambdaToExplicit; import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java index f0984d670ed0..92c97d50404d 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection.lambdaToExplicit; import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.java.PsiEmptyExpressionImpl; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/IterableUsedAsVarargInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/IterableUsedAsVarargInspection.java index 945572131404..35cf0bb39e17 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/IterableUsedAsVarargInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/IterableUsedAsVarargInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection.miscGenerics; import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RawUseOfParameterizedTypeInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RawUseOfParameterizedTypeInspection.java index a993bd790ab2..f0366de3922a 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RawUseOfParameterizedTypeInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RawUseOfParameterizedTypeInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Predicates; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java index 072205756b77..d865d539dc2e 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection.miscGenerics; import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/numeric/ConvertNumericLiteralQuickFix.java b/java/java-impl-inspections/src/com/intellij/codeInspection/numeric/ConvertNumericLiteralQuickFix.java index 78173bb1aafa..33037452eeb3 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/numeric/ConvertNumericLiteralQuickFix.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/numeric/ConvertNumericLiteralQuickFix.java @@ -1,10 +1,10 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.numeric; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiElement; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/optionalToIf/OptionalToIfInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/optionalToIf/OptionalToIfInspection.java index 1072cc65adea..22c0795a5e0a 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/optionalToIf/OptionalToIfInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/optionalToIf/OptionalToIfInspection.java @@ -3,7 +3,7 @@ package com.intellij.codeInspection.optionalToIf; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.streamToLoop.ChainVariable; import com.intellij.codeInspection.util.OptionalUtil; import com.intellij.java.JavaBundle; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaLangInvokeHandleSignatureInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaLangInvokeHandleSignatureInspection.java index 30baee8c87d3..b266e3eed56b 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaLangInvokeHandleSignatureInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaLangInvokeHandleSignatureInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInsight.lookup.*; import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.editor.Editor; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaReflectionMemberAccessInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaReflectionMemberAccessInspection.java index 954b188d1a46..bd1f8931e8f6 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaReflectionMemberAccessInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/reflectiveAccess/JavaReflectionMemberAccessInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java index f828f42ef278..66f8aba385e3 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java @@ -4,9 +4,9 @@ package com.intellij.codeInspection.sillyAssignment; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FoldExpressionIntoStreamInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FoldExpressionIntoStreamInspection.java index 6aaa0fecea6e..16399bf10eb9 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FoldExpressionIntoStreamInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FoldExpressionIntoStreamInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.util.LambdaGenerationUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FuseStreamOperationsInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FuseStreamOperationsInspection.java index a0cc806747ac..e646533b428e 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FuseStreamOperationsInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/FuseStreamOperationsInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.streamMigration.CollectMigration.CollectTermi import com.intellij.ide.nls.NlsMessages; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/MigrateToStreamFix.java b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/MigrateToStreamFix.java index f5cabd70720d..5ea8663d95b9 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/MigrateToStreamFix.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/MigrateToStreamFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInspection.streamMigration; import com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.RemoveRedundantTypeArgumentsUtil; import com.intellij.codeInspection.SimplifyStreamApiCallChainsInspection; import com.intellij.codeInspection.streamMigration.StreamApiMigrationInspection.StreamSource; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java index ff1151eaae2d..72ad90a7cc95 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java @@ -6,6 +6,8 @@ import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java index f76cb7d8258c..6c3da917e88c 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java @@ -1,13 +1,17 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.streamToLoop; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; +import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.codeInspection.RemoveRedundantTypeArgumentsUtil; +import com.intellij.codeInspection.TrivialFunctionalExpressionUsageInspection; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.redundantCast.RemoveRedundantCastUtil; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Attachment; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java index f4f13c600c64..70a61b3587a4 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java @@ -11,6 +11,7 @@ import com.intellij.codeInspection.util.IntentionName; import com.intellij.codeInspection.util.SpecialAnnotationsUtilBase; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.JDOMExternalizableStringList; diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineLocalHandler.java b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineLocalHandler.java index 4fe035d94f3e..b571dd28caab 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineLocalHandler.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/inline/InlineLocalHandler.java @@ -2,7 +2,7 @@ package com.intellij.refactoring.inline; import com.intellij.codeInsight.ExceptionUtil; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.java.refactoring.JavaRefactoringBundle; import com.intellij.modcommand.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java index b06199fdfac9..3fa439d22924 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java @@ -5,11 +5,11 @@ import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightMessageUtil; import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModChooseAction; import com.intellij.modcommand.ModCommand; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationAttributeNameFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationAttributeNameFix.java index b266467c2e36..9f9214614810 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationAttributeNameFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationAttributeNameFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nls; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationTargetFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationTargetFix.java index 5849abfe9d02..3f02d03bc44c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationTargetFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddAnnotationTargetFix.java @@ -3,8 +3,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.ModCommands; import com.intellij.modcommand.ModCommand; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddEmptyRecordHeaderFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddEmptyRecordHeaderFix.java index 61e1a0ed7c68..6401038de8a3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddEmptyRecordHeaderFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddEmptyRecordHeaderFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiRecordHeader; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionFromFieldInitializerToConstructorThrowsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionFromFieldInitializerToConstructorThrowsFix.java index 9d014a880b57..4f64aa9ebc5d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionFromFieldInitializerToConstructorThrowsFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionFromFieldInitializerToConstructorThrowsFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java index aed9e3570bda..5e34eb6c31ee 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java @@ -4,10 +4,10 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.generation.surroundWith.SurroundWithUtil; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.ModCommands; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; +import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java index ba05517ad31b..9bb0d84f7c82 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java @@ -3,12 +3,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.util.IntentionName; -import com.intellij.modcommand.ModChooseAction; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandAction; -import com.intellij.modcommand.PsiBasedModCommandAction; +import com.intellij.modcommand.*; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddFinallyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddFinallyFix.java index b9e028082783..66ca54f11838 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddFinallyFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddFinallyFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java index 4b3cd5f32518..297cab44ef6c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiCodeBlock; import com.intellij.psi.PsiMethod; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java index 04e65dd42340..778d9ad63e75 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.generation.GenerateMembersUtil; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java index 339519a18b88..a9cdb240d60f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java @@ -3,11 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils; -import com.intellij.codeInspection.ModCommands; -import com.intellij.modcommand.ModChooseAction; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandAction; -import com.intellij.modcommand.PsiBasedModCommandAction; +import com.intellij.modcommand.*; import com.intellij.psi.*; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingRequiredAnnotationParametersFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingRequiredAnnotationParametersFix.java index e04106141704..63f72c2822c6 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingRequiredAnnotationParametersFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMissingRequiredAnnotationParametersFix.java @@ -3,9 +3,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.template.impl.TextExpression; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.modcommand.ModTemplateBuilder; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java index af3c90745a12..5eebefae9489 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddParameterListFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddParameterListFix.java index 01376fe900c0..5972fd5ae77f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddParameterListFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddParameterListFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiIdentifier; import com.intellij.psi.PsiMethod; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java index 81ba0b8d21b1..29ef0844e5cf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTypesUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java index 8d8d034ba177..994245413564 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java @@ -5,10 +5,10 @@ import com.intellij.codeInsight.lookup.ExpressionLookupItem; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.template.PsiElementResult; import com.intellij.codeInsight.template.impl.ConstantNode; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.modcommand.ModTemplateBuilder; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.util.PsiTypesUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java index 75062a809918..49433620cadd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java @@ -5,10 +5,10 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java index abc56a129ea6..e16a54944cf5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java @@ -3,9 +3,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.ChangeToAppendUtil; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.InheritanceUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java index f8facbf40083..58c20392ba92 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.TypeUtils; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertExpressionToReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertExpressionToReturnFix.java index d0fa67dfba88..3cb103005545 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertExpressionToReturnFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertExpressionToReturnFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiKeyword; import com.siyeh.ig.psiutils.CommentTracker; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertInterfaceToClassIntention.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertInterfaceToClassIntention.java index 613a37b02174..7162a4929856 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertInterfaceToClassIntention.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertInterfaceToClassIntention.java @@ -4,12 +4,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.util.IntentionFamilyName; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.modcommand.ModShowConflicts; -import com.intellij.modcommand.PsiBasedModCommandAction; +import com.intellij.modcommand.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsContexts; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java index e5aebc0cc9ab..b799eb9508cd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java @@ -4,9 +4,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.Nullability; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertToStringLiteralAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertToStringLiteralAction.java index 109edb5b415d..792dc1bff92c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertToStringLiteralAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertToStringLiteralAction.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java index 5d0b11c99f58..f21020a50427 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.CodeInsightUtilCore; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java index ad636b77c56e..64acefbec731 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java index 2a2d451d9f8d..8878817bcf31 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.generation.RecordConstructorMember; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInsight.intention.impl.ParameterClassMember; import com.intellij.codeInsight.template.impl.TextExpression; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.icons.AllIcons; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java index 09eabc2167d3..b3ff742ec452 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteElementFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteElementFix.java index 018e6026c094..555759fa5b90 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteElementFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteElementFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.ModCommands; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.ModCommands; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; import com.intellij.modcommand.ModPsiUpdater; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java index 575f36166e5b..40cda9f6f3fb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiCodeBlock; import com.intellij.psi.PsiMethod; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMultiCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMultiCatchFix.java index 40f1880ffe4a..4745e6d80d58 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMultiCatchFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMultiCatchFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiElement; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteReturnFix.java index 963c069a8ac1..8647e843699e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteReturnFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteReturnFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.siyeh.ig.psiutils.*; import org.jetbrains.annotations.Nls; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteSideEffectsAwareFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteSideEffectsAwareFix.java index 6ee1ea1fff33..91471f5893c8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteSideEffectsAwareFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteSideEffectsAwareFix.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImplementOrExtendFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImplementOrExtendFix.java index 6da1a4ebadf2..055e03b1e10b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImplementOrExtendFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImplementOrExtendFix.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModCommandAction; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java index 766e9c19c0ba..aed09d97ef56 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.generation.PsiMethodMember; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.template.PsiElementResult; import com.intellij.codeInsight.template.impl.ConstantNode; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertConstructorCallFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertConstructorCallFix.java index ec34ac0347fc..47dec6c5b2b4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertConstructorCallFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertConstructorCallFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import com.intellij.psi.util.PsiMatcherImpl; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMethodCallFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMethodCallFix.java index ccd5e8aa6911..b0adb53c020a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMethodCallFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMethodCallFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import org.jetbrains.annotations.Nls; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMissingTokenFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMissingTokenFix.java index 891ae1796c50..06ade52a162a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMissingTokenFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMissingTokenFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.ide.IdeBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java index f0b3d2da9049..b36829148b4a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import com.siyeh.ig.psiutils.CommentTracker; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java index adef3863bc91..440ba88989ca 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java index 9465930043b2..85f1f6c90429 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiVariable; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java index 7df1f02d8d58..14f9bcad4582 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeDuplicateAttributesFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.Strings; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java index 9d97167f37d6..de2e9defdf9a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java index a2168b63ed37..2dcba561f098 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; import com.intellij.psi.PsiCatchSection; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java index 3edb5820c4d4..5ae856bb9462 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.JavaDirectoryService; import com.intellij.psi.PsiClass; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveMemberIntoClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveMemberIntoClassFix.java index 3873e257fbfb..728c158186d1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveMemberIntoClassFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveMemberIntoClassFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.impl.analysis.MemberModel; import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.lang.jvm.JvmModifier; import com.intellij.modcommand.ModPsiUpdater; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveSwitchBranchUpFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveSwitchBranchUpFix.java index 86325cea7fdf..38f37a3d7abc 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveSwitchBranchUpFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveSwitchBranchUpFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import com.intellij.psi.impl.PsiImplUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToAlreadyDeclaredVariableFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToAlreadyDeclaredVariableFix.java index 841d0e6a4d22..cb4bf3b17222 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToAlreadyDeclaredVariableFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToAlreadyDeclaredVariableFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.psi.PsiElement; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToDuplicateElementFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToDuplicateElementFix.java index 5af53da01e22..870c1894d696 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToDuplicateElementFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NavigateToDuplicateElementFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.PsiBasedModCommandAction; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java index fd46bff4b37f..765a52ab928c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import com.intellij.psi.util.TypeConversionUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java index 7da74b2bac4c..80470cbceed6 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReceiverParameterNameFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiReceiverParameter; import com.siyeh.ig.psiutils.CommentTracker; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java index 8766b8bf3f8e..7eb123f68b75 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiJavaCodeReferenceElement; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveParameterListFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveParameterListFix.java index 63f2e631069c..4948751b9abb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveParameterListFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveParameterListFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiMethod; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java index d7a6d6cc2840..1401927de3c4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiReferenceExpression; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java index 2693079c4867..e91f8f534388 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java @@ -3,13 +3,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.RemoveInitializerFix; import com.intellij.java.JavaBundle; -import com.intellij.modcommand.ModChooseAction; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.modcommand.PsiBasedModCommandAction; +import com.intellij.modcommand.*; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.util.JavaElementKind; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java index c7ad52609cdf..70d95f5e2aaf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java @@ -3,8 +3,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.projectRoots.JavaSdk; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceInaccessibleFieldWithGetterSetterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceInaccessibleFieldWithGetterSetterFix.java index 3f41788674f8..fb95ed4384cf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceInaccessibleFieldWithGetterSetterFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceInaccessibleFieldWithGetterSetterFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceIteratorForEachLoopWithIteratorForLoopFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceIteratorForEachLoopWithIteratorForLoopFix.java index d05f586cfc4a..18474b202fe0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceIteratorForEachLoopWithIteratorForLoopFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceIteratorForEachLoopWithIteratorForLoopFix.java @@ -3,8 +3,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.application.options.CodeStyle; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplacePrimitiveWithBoxedTypeAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplacePrimitiveWithBoxedTypeAction.java index de14278c714b..e52e4313b157 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplacePrimitiveWithBoxedTypeAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplacePrimitiveWithBoxedTypeAction.java @@ -3,8 +3,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java index fb19b98ad453..33c2e0e3a047 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java @@ -2,8 +2,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithTypePatternFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithTypePatternFix.java index 4293f41de4c0..2524286c8f41 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithTypePatternFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithTypePatternFix.java @@ -4,8 +4,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java index dcecac8bdf5e..fdde56a1d8e4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.Comparing; import com.intellij.psi.*; import com.intellij.psi.scope.processor.VariablesNotProcessor; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetVariableTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetVariableTypeFix.java index 995a6f088efd..5d8e2d33d743 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetVariableTypeFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetVariableTypeFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.JavaSharedImplUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java index f04bbf72b44e..744ed672ec88 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java @@ -7,12 +7,12 @@ import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInsight.intention.impl.SplitConditionUtil; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.dataFlow.NullabilityProblemKind; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Attachment; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java index 81f8b12fddde..c57d424c01c4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java @@ -4,9 +4,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.TargetElementUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.ModCommands; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java index aacd109d631c..0a24b921d955 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java @@ -3,8 +3,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixActionRegistrar; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java index c06beebc0834..24405daf599c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java @@ -3,10 +3,10 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.generation.surroundWith.JavaWithTryCatchSurrounder; -import com.intellij.codeInspection.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/UnwrapSwitchLabelFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/UnwrapSwitchLabelFix.java index 3b93b30b8515..b01f6cb9d5f1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/UnwrapSwitchLabelFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/UnwrapSwitchLabelFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.fix.DeleteSwitchLabelFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java index ca848a810f2f..0ce80400f49d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapSwitchRuleStatementsIntoBlockFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapSwitchRuleStatementsIntoBlockFix.java index 84b87e753d51..a0114668a6f8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapSwitchRuleStatementsIntoBlockFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapSwitchRuleStatementsIntoBlockFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/makefinal/MakeVarEffectivelyFinalFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/makefinal/MakeVarEffectivelyFinalFix.java index 6f122b26c762..6250bde4a0e0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/makefinal/MakeVarEffectivelyFinalFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/makefinal/MakeVarEffectivelyFinalFix.java @@ -4,7 +4,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix.makefinal; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.psi.PsiLocalVariable; import com.intellij.psi.PsiVariable; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/ReplaceConstructorWithFactoryAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/ReplaceConstructorWithFactoryAction.java index 317d21115122..8da9d46f9c09 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/ReplaceConstructorWithFactoryAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/ReplaceConstructorWithFactoryAction.java @@ -1,15 +1,11 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention; -import com.intellij.codeInspection.ModCommands; import com.intellij.icons.AllIcons; import com.intellij.java.JavaBundle; import com.intellij.java.refactoring.JavaRefactoringBundle; import com.intellij.lang.java.JavaLanguage; -import com.intellij.modcommand.ModChooseAction; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandAction; -import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsContexts; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java index f47127998f06..d6e95691b88f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.highlighting.HighlightManager; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java index 12b2f127c029..0dcd7f09d067 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddToPermitsListFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddToPermitsListFix.java index 65ec516abb49..1d6158c673bb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddToPermitsListFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddToPermitsListFix.java @@ -1,10 +1,10 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiReferenceList; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java index b1336782b6a0..2d1e9142a3c3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java @@ -2,11 +2,11 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiNavigator; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseMoveInitializerToMethodAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseMoveInitializerToMethodAction.java index f970dbe0d80d..90abe8786914 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseMoveInitializerToMethodAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseMoveInitializerToMethodAction.java @@ -2,10 +2,10 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.lang.java.JavaLanguage; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocComment; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java index 36eea01f0bde..5a40a174e15c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java @@ -2,12 +2,12 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModChooseMember; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BreakStringOnLineBreaksIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BreakStringOnLineBreaksIntentionAction.java index 35114ef48fb4..79f3e14c8968 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BreakStringOnLineBreaksIntentionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BreakStringOnLineBreaksIntentionAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.JavaTokenType; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ChangeUIDAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ChangeUIDAction.java index 3f524e7a3b32..5652b387c763 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ChangeUIDAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ChangeUIDAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java index 4e97638760c1..634625bc1c7c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java @@ -3,10 +3,10 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.QuickFixFactory; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.java.analysis.JavaAnalysisBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; import com.intellij.util.ArrayUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseIntoLoopAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseIntoLoopAction.java index dd011dd242a1..8fe6fb9ad34b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseIntoLoopAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseIntoLoopAction.java @@ -2,11 +2,11 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.CodeInsightUtil; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ComposeFunctionChainAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ComposeFunctionChainAction.java index d751d08a804c..5f5c938b1b61 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ComposeFunctionChainAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ComposeFunctionChainAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.ExceptionUtil; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java index be1b499c26c4..8c0097cda820 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.AnnotationUtil; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertColorRepresentationIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertColorRepresentationIntentionAction.java index 8a3a87a1b71d..42297f81d162 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertColorRepresentationIntentionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertColorRepresentationIntentionAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.impl.JavaConstantExpressionEvaluator; import com.intellij.psi.util.ConstantEvaluationOverflowException; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompactConstructorToCanonicalAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompactConstructorToCanonicalAction.java index 3a5cf75d362d..b26c298dd0ac 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompactConstructorToCanonicalAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompactConstructorToCanonicalAction.java @@ -3,9 +3,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInsight.generation.RecordConstructorMember; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.JavaPsiRecordUtil; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompareToToEqualsIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompareToToEqualsIntention.java index 03850c6b3505..f23ea7e73d15 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompareToToEqualsIntention.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertCompareToToEqualsIntention.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSwitchIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSwitchIntention.java index 1339eb94d4a3..4dd49f95a2d9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSwitchIntention.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSwitchIntention.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.intention.PriorityAction; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java index fb94eb977a4d..cb983a562526 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModChooseAction; import com.intellij.modcommand.ModCommand; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractChainedMapAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractChainedMapAction.java index 5947b280deb0..0cf231c7eba2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractChainedMapAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractChainedMapAction.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java index 1a39a44e00fe..17f93042599a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractIfConditionAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java index f0f060a0dcea..99ae14c4d9cd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.PsiEquivalenceUtil; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.RemoveRedundantTypeArgumentsUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModChooseAction; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/FillPermitsListFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/FillPermitsListFix.java index f13f623ddcd4..d6e6a51f1ad7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/FillPermitsListFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/FillPermitsListFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java index 106c0ca48395..bea3fef0be98 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InlineStreamMapAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java index e8d98aa292b1..ae7796889375 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; -import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; +import com.intellij.java.JavaBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MergeFilterChainAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MergeFilterChainAction.java index dd6ffb28486e..9634aa8db212 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MergeFilterChainAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MergeFilterChainAction.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveIntoIfBranchesAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveIntoIfBranchesAction.java index 710e6fc3a646..ff7ae12c2c76 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveIntoIfBranchesAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveIntoIfBranchesAction.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.CodeInsightUtil; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/RemoveRedundantParameterTypesFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/RemoveRedundantParameterTypesFix.java index a501675a0fa2..b2aec06ad563 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/RemoveRedundantParameterTypesFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/RemoveRedundantParameterTypesFix.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInspection.AnonymousCanBeLambdaInspection; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ReplaceAssignmentWithComparisonFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ReplaceAssignmentWithComparisonFix.java index ceec07ca57f9..7cb39d371fa5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ReplaceAssignmentWithComparisonFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ReplaceAssignmentWithComparisonFix.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiAssignmentExpression; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassAction.java index 13e01546530b..64e0240a86ce 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassAction.java @@ -3,10 +3,10 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassFromPermitsListAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassFromPermitsListAction.java index 902e21adb321..bd206f2a7606 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassFromPermitsListAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SealClassFromPermitsListAction.java @@ -2,9 +2,9 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.QuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiModifier; import com.intellij.psi.search.searches.DirectClassInheritorsSearch; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java index 359bd4ce10a4..1fae5b9f24ca 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java @@ -3,8 +3,8 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.impl.quickfix.SimplifyBooleanExpressionFix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import com.intellij.psi.impl.JavaConstantExpressionEvaluator; import org.jetbrains.annotations.NotNull; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java index b3b2090b26d9..e5099ea0841b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java @@ -2,10 +2,10 @@ package com.intellij.codeInsight.intention.impl; import com.google.common.collect.Comparators; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.ide.highlighter.JavaFileType; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocComment; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java index fec2f9998723..92ad0fb8e561 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitFilterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitFilterAction.java index 9695673d755a..2684f78b93cd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitFilterAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitFilterAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.util.JavaPsiPatternUtil; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java index 2dec3a41aeba..d9ad9518bd67 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java index b9bed2b53816..6f0cd1130932 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitSwitchBranchWithSeveralCaseValuesAction.java @@ -1,10 +1,10 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java index 0033c38d5493..8ce7c4af453b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java @@ -3,7 +3,6 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.CodeInsightUtilCore; import com.intellij.codeInsight.template.impl.ConstantNode; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.lang.surroundWith.SurroundDescriptor; @@ -11,6 +10,7 @@ import com.intellij.lang.surroundWith.Surrounder; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandExecutor; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java index c624d3dd5312..925a782035b4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java index 52eff4bfdfbb..b2306465c6c4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.jvm.SpecialField; import com.intellij.codeInspection.dataFlow.types.DfType; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java index 12f322fd2546..a9146320107f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapArrayInitializerMemberValueAction.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.intention.impl; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiAnnotationMemberValue; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java index c6244b3ff9b1..e8faa0bea947 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnwrapElseBranchAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.diagnostic.Logger; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/WrapWithUnmodifiableAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/WrapWithUnmodifiableAction.java index 14ebe55ed03d..d7369374dfed 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/WrapWithUnmodifiableAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/WrapWithUnmodifiableAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.Mutability; import com.intellij.codeInspection.dataFlow.types.DfType; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/singlereturn/ConvertToSingleReturnAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/singlereturn/ConvertToSingleReturnAction.java index 04524be8faad..bce65138a522 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/singlereturn/ConvertToSingleReturnAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/singlereturn/ConvertToSingleReturnAction.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInsight.intention.impl.singlereturn; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; diff --git a/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java index 3bfc21a7edeb..2005ae0b7764 100644 --- a/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java index e1d86dce11be..2745e7856d4e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInspection/ConvertRecordToClassFix.java b/java/java-impl/src/com/intellij/codeInspection/ConvertRecordToClassFix.java index 1170eecfd669..cce894711228 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ConvertRecordToClassFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/ConvertRecordToClassFix.java @@ -12,6 +12,7 @@ import com.intellij.lang.java.JavaLanguage; import com.intellij.lang.java.parser.DeclarationParser; import com.intellij.lang.java.parser.JavaParser; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInspection/EnhancedSwitchMigrationInspection.java b/java/java-impl/src/com/intellij/codeInspection/EnhancedSwitchMigrationInspection.java index d98ce8bf6988..a5a1099e14ed 100644 --- a/java/java-impl/src/com/intellij/codeInspection/EnhancedSwitchMigrationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/EnhancedSwitchMigrationInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingMode import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; diff --git a/java/java-impl/src/com/intellij/codeInspection/RemoveAssignmentFix.java b/java/java-impl/src/com/intellij/codeInspection/RemoveAssignmentFix.java index e80f8d6424d5..4973384aafda 100644 --- a/java/java-impl/src/com/intellij/codeInspection/RemoveAssignmentFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/RemoveAssignmentFix.java @@ -4,10 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.daemon.impl.quickfix.DeleteElementFix; import com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler; import com.intellij.java.JavaBundle; -import com.intellij.modcommand.ModChooseAction; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandAction; -import com.intellij.modcommand.ModCommandQuickFix; +import com.intellij.modcommand.*; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/java/java-impl/src/com/intellij/codeInspection/ReplaceComputeWithComputeIfPresentFix.java b/java/java-impl/src/com/intellij/codeInspection/ReplaceComputeWithComputeIfPresentFix.java index 1dfc652b6150..57d5129ab4e2 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ReplaceComputeWithComputeIfPresentFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/ReplaceComputeWithComputeIfPresentFix.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInspection/ReplaceTypeInCastFix.java b/java/java-impl/src/com/intellij/codeInspection/ReplaceTypeInCastFix.java index a0c66c6baba8..23e741c6042d 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ReplaceTypeInCastFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/ReplaceTypeInCastFix.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.ObjectUtils; diff --git a/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTernaryOperatorFix.java b/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTernaryOperatorFix.java index b77ebd7c9f7e..9afe0c2bab14 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTernaryOperatorFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTernaryOperatorFix.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTrivialLambdaFix.java b/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTrivialLambdaFix.java index 31bbb004c8a0..04819ffb4417 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTrivialLambdaFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/ReplaceWithTrivialLambdaFix.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiElement; diff --git a/java/java-impl/src/com/intellij/codeInspection/StreamFilterNotNullFix.java b/java/java-impl/src/com/intellij/codeInspection/StreamFilterNotNullFix.java index 3a6ce715ee82..65ec3ebdd6ba 100644 --- a/java/java-impl/src/com/intellij/codeInspection/StreamFilterNotNullFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/StreamFilterNotNullFix.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.VariableKind; diff --git a/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java b/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java index a52d0d77d89d..9954a4a94261 100644 --- a/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.generation.surroundWith.JavaWithIfSurrounder; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java b/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java index 3b4116b3c485..c1cded810a55 100644 --- a/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/WrapWithMutableCollectionFix.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java b/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java index e2bd59a3a7df..ada6a96b8c3f 100644 --- a/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java +++ b/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.actions; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInspection/bulkOperation/UseBulkOperationInspection.java b/java/java-impl/src/com/intellij/codeInspection/bulkOperation/UseBulkOperationInspection.java index 0b19ac6cdbb4..37d761c950a3 100644 --- a/java/java-impl/src/com/intellij/codeInspection/bulkOperation/UseBulkOperationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/bulkOperation/UseBulkOperationInspection.java @@ -3,7 +3,7 @@ package com.intellij.codeInspection.bulkOperation; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IteratorDeclaration; import com.intellij.java.JavaBundle; diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/BoxPrimitiveInTernaryFix.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/BoxPrimitiveInTernaryFix.java index 1c4bd50ea1b0..67d7f1767f66 100644 --- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/BoxPrimitiveInTernaryFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/BoxPrimitiveInTernaryFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.dataFlow.fix; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java index 69b90fa1535f..6ddcf79c29d5 100644 --- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/fix/DeleteSwitchLabelFix.java @@ -2,7 +2,7 @@ package com.intellij.codeInspection.dataFlow.fix; import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/codeInspection/duplicateExpressions/DuplicateExpressionsInspection.java b/java/java-impl/src/com/intellij/codeInspection/duplicateExpressions/DuplicateExpressionsInspection.java index f8589b17573e..b315e2a95ae5 100644 --- a/java/java-impl/src/com/intellij/codeInspection/duplicateExpressions/DuplicateExpressionsInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/duplicateExpressions/DuplicateExpressionsInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; diff --git a/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java index 6a5ed4ae0d5f..f9f98a228aca 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java @@ -3,9 +3,9 @@ package com.intellij.codeInspection.java18StreamApi; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocFixes.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocFixes.java index cb1d60d4986f..935046fe7a68 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocFixes.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocFixes.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; import com.intellij.codeInspection.*; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.ProjectInspectionProfileManager; import com.intellij.psi.*; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java index b31e10a32d90..130cc5c599b4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java @@ -18,6 +18,7 @@ import com.intellij.ide.DataManager; import com.intellij.ide.util.FQNameCellRenderer; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.model.Symbol; import com.intellij.model.psi.PsiSymbolReference; import com.intellij.openapi.actionSystem.CommonDataKeys; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java index bbe366a3d010..778ab51ad1cf 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocBlankLinesInspection.java @@ -4,7 +4,7 @@ package com.intellij.codeInspection.javaDoc; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.openapi.editor.Document; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocDeclarationInspection.java index 40c3a9d4be06..ee66829c7e4a 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocDeclarationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavadocDeclarationInspection.java @@ -10,6 +10,7 @@ import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.lang.ASTNode; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/RemoveTagFix.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/RemoveTagFix.java index 0569fc7a8470..50f0f821de0b 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/RemoveTagFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/RemoveTagFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.javaDoc; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.javadoc.PsiDocTag; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/ReplaceWithJavadocInspection.kt b/java/java-impl/src/com/intellij/codeInspection/javaDoc/ReplaceWithJavadocInspection.kt index bdef92a30e7f..41259c2198fe 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/ReplaceWithJavadocInspection.kt +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/ReplaceWithJavadocInspection.kt @@ -4,9 +4,9 @@ package com.intellij.codeInspection.javaDoc import com.intellij.codeInspection.LocalInspectionTool import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemsHolder -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix import com.intellij.java.JavaBundle import com.intellij.modcommand.ModPsiUpdater +import com.intellij.modcommand.PsiUpdateModCommandQuickFix import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.project.Project import com.intellij.openapi.util.text.StringUtil diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/UrlToHtmlFix.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/UrlToHtmlFix.java index 8c9edad166b0..15f29d390ad2 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/UrlToHtmlFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/UrlToHtmlFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection.javaDoc; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.util.TextRange; diff --git a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java index e97645f7e005..fc81ecf36565 100644 --- a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java @@ -9,6 +9,7 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.java.JavaBundle; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ReadAction; diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SealClassActionFailingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SealClassActionFailingTest.java index faf2b9d04c7f..2d36f7e29f21 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SealClassActionFailingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SealClassActionFailingTest.java @@ -3,10 +3,10 @@ package com.intellij.java.codeInsight.intention; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.intention.impl.SealClassAction; -import com.intellij.codeInspection.ModCommands; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction.ActionContext; +import com.intellij.modcommand.ModCommands; import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; diff --git a/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java b/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java index 5c6c19fc36d7..ccb651d4561c 100644 --- a/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java +++ b/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java @@ -26,6 +26,7 @@ package org.jetbrains.lang.manifest.highlighting; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; diff --git a/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MisspelledHeaderInspection.java b/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MisspelledHeaderInspection.java index 129668076ad3..805d36a37ea3 100644 --- a/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MisspelledHeaderInspection.java +++ b/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MisspelledHeaderInspection.java @@ -28,6 +28,7 @@ import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.ProjectInspectionProfileManager; import com.intellij.psi.PsiElement; diff --git a/platform/lang-api/src/com/intellij/codeInspection/ModCommands.java b/platform/analysis-api/src/com/intellij/modcommand/ModCommands.java similarity index 95% rename from platform/lang-api/src/com/intellij/codeInspection/ModCommands.java rename to platform/analysis-api/src/com/intellij/modcommand/ModCommands.java index c1b4dc5a353d..f90074ec6411 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ModCommands.java +++ b/platform/analysis-api/src/com/intellij/modcommand/ModCommands.java @@ -1,10 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.codeInspection; +package com.intellij.modcommand; import com.intellij.codeInspection.util.IntentionName; import com.intellij.injected.editor.DocumentWindow; import com.intellij.lang.injection.InjectedLanguageManager; -import com.intellij.modcommand.*; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.editor.colors.TextAttributesKey; @@ -179,13 +178,13 @@ public final class ModCommands { @NotNull Function<@NotNull T, @NotNull TextRange> range) { return new PsiUpdateModCommandAction(element) { @Override - protected void invoke(@NotNull ActionContext context, @NotNull T element, @NotNull ModPsiUpdater updater) { + protected void invoke(@NotNull ModCommandAction.ActionContext context, @NotNull T element, @NotNull ModPsiUpdater updater) { action.accept(element, updater); } @Override - protected @NotNull Presentation getPresentation(@NotNull ActionContext context, @NotNull T section) { - return Presentation.of(getFamilyName()).withHighlighting(range.apply(section)); + protected @NotNull ModCommandAction.Presentation getPresentation(@NotNull ModCommandAction.ActionContext context, @NotNull T section) { + return ModCommandAction.Presentation.of(getFamilyName()).withHighlighting(range.apply(section)); } @Override diff --git a/platform/analysis-api/src/com/intellij/modcommand/ModPsiUpdater.java b/platform/analysis-api/src/com/intellij/modcommand/ModPsiUpdater.java index 3d8345877e41..10146a3d88fc 100644 --- a/platform/analysis-api/src/com/intellij/modcommand/ModPsiUpdater.java +++ b/platform/analysis-api/src/com/intellij/modcommand/ModPsiUpdater.java @@ -18,7 +18,7 @@ import java.util.function.BiConsumer; /** * A helper to perform editor command when building the {@link ModCommand} * - * @see com.intellij.codeInspection.ModCommands#psiUpdate(PsiElement, BiConsumer) + * @see ModCommands#psiUpdate(PsiElement, BiConsumer) */ @ApiStatus.Experimental public interface ModPsiUpdater extends ModPsiNavigator { diff --git a/platform/lang-api/src/com/intellij/codeInspection/PsiUpdateModCommandAction.java b/platform/analysis-api/src/com/intellij/modcommand/PsiUpdateModCommandAction.java similarity index 89% rename from platform/lang-api/src/com/intellij/codeInspection/PsiUpdateModCommandAction.java rename to platform/analysis-api/src/com/intellij/modcommand/PsiUpdateModCommandAction.java index bb0ed5232e21..38cb4a04da52 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/PsiUpdateModCommandAction.java +++ b/platform/analysis-api/src/com/intellij/modcommand/PsiUpdateModCommandAction.java @@ -1,10 +1,6 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.codeInspection; +package com.intellij.modcommand; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandAction; -import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/platform/lang-api/src/com/intellij/codeInspection/PsiUpdateModCommandQuickFix.java b/platform/analysis-api/src/com/intellij/modcommand/PsiUpdateModCommandQuickFix.java similarity index 81% rename from platform/lang-api/src/com/intellij/codeInspection/PsiUpdateModCommandQuickFix.java rename to platform/analysis-api/src/com/intellij/modcommand/PsiUpdateModCommandQuickFix.java index 512bde7acafc..37aac7a401e8 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/PsiUpdateModCommandQuickFix.java +++ b/platform/analysis-api/src/com/intellij/modcommand/PsiUpdateModCommandQuickFix.java @@ -1,9 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.codeInspection; +package com.intellij.modcommand; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandQuickFix; -import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.ApiStatus; diff --git a/platform/lang-api/src/com/intellij/codeInsight/intention/numeric/AbstractNumberConversionIntention.java b/platform/lang-api/src/com/intellij/codeInsight/intention/numeric/AbstractNumberConversionIntention.java index aa76b312510c..9af68d8a8d46 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/intention/numeric/AbstractNumberConversionIntention.java +++ b/platform/lang-api/src/com/intellij/codeInsight/intention/numeric/AbstractNumberConversionIntention.java @@ -3,12 +3,12 @@ package com.intellij.codeInsight.intention.numeric; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.lang.LangBundle; import com.intellij.modcommand.ModChooseAction; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; diff --git a/platform/lang-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java b/platform/lang-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java index 0fa16514ccaf..fb7a49e73e2c 100644 --- a/platform/lang-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java +++ b/platform/lang-impl/src/com/intellij/lang/impl/modcommand/PsiUpdateImpl.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.template.Expression; import com.intellij.codeInsight.template.ExpressionContext; import com.intellij.codeInsight.template.Result; import com.intellij.codeInsight.template.TextResult; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.lang.Language; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.lang.injection.InjectionEditService; @@ -34,8 +34,8 @@ import java.util.*; import java.util.function.Consumer; import java.util.stream.Stream; -import static com.intellij.codeInspection.ModCommands.error; -import static com.intellij.codeInspection.ModCommands.nop; +import static com.intellij.modcommand.ModCommands.error; +import static com.intellij.modcommand.ModCommands.nop; final class PsiUpdateImpl { static @NotNull ModCommand psiUpdate(@NotNull ModCommandAction.ActionContext context, diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java index b0654637edfa..e591656df617 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.abstraction; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java index 3c17ef452348..46597d10a64e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.abstraction; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java index bacf20bd46be..b4312580aba9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.assignment; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java index 8b6911e16675..c6a707e5a550 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.assignment; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java index 357a44f89fa6..65c93d1cf133 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java @@ -18,10 +18,10 @@ package com.siyeh.ig.assignment; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/NegativeIntConstantInLongContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/NegativeIntConstantInLongContextInspection.java index b88523667c3e..a697e6db109c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/NegativeIntConstantInLongContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/NegativeIntConstantInLongContextInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.bitwise; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java index 729b507fd443..61b50188b8b4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.bitwise; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.lang.java.parser.ExpressionParser; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java index d493e63d572d..f1ef6d8f6f84 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java @@ -17,11 +17,11 @@ package com.siyeh.ig.bitwise; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.lang.java.parser.ExpressionParser; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java index fd0f0b312f75..06f355d99d51 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualityInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java index 1c3ef0c423ef..d2057f550a26 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.HardcodedMethodConstants; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java index b9f53fdf90e4..3b8b02f65a30 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java index 0bcb26e7460e..919af8f55c7b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ArrayObjectsEqualsInspection.java @@ -3,9 +3,9 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.HardcodedMethodConstants; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java index e4d52ee0431d..ea89b8728d78 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java @@ -16,10 +16,10 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.TypeConstraint; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java index d91da899659e..cf6459c03012 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java @@ -4,8 +4,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java index bb33653e0ef3..d1f6c8a2d7af 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java @@ -2,8 +2,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java index ca8761511b91..f1854ae87c83 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClassInitializer; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsOnSuspiciousObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsOnSuspiciousObjectInspection.java index d39bf9ba2849..d4d01a138ab1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsOnSuspiciousObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/EqualsOnSuspiciousObjectInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInsight.Nullability; import com.intellij.codeInsight.NullableNotNullManager; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java index a2392bf6f18f..17e0388e62ac 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java index 8c6ee0ed3957..dda1702f88c5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/InnerClassReferencedViaSubclassInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java index 8d2b4acdf102..6136cb825066 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRoundingWithIntArgumentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRoundingWithIntArgumentInspection.java index ee6602faf8ee..9bd8b2a1b444 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRoundingWithIntArgumentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MathRoundingWithIntArgumentInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.redundantCast.RemoveRedundantCastUtil; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java index d6c16893609e..4cf515294440 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java index 89fe6c486524..4c6b6adc8a26 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java index 5359d6ebf4ca..e9959a7aa563 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ReplaceAllDotInspection.java @@ -16,8 +16,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java index d1f38603f086..51eaa267576f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.ObjectUtils; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java index 611685125e48..3ca9df96703f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.ObjectUtils; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java index 3b65480399cf..93e94a6006f1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java @@ -2,8 +2,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java index aa4c67609515..d6daf79795dc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/StringEqualsCharSequenceInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousDateFormatInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousDateFormatInspection.java index 722e0c399e62..c9560b24629d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousDateFormatInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousDateFormatInspection.java @@ -4,10 +4,10 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.ChronoUtil; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.TextRange; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java index abec2dca0ad2..dde32bb32d2d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java @@ -2,12 +2,12 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java index c2a3f5b8997a..904ad513afeb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousToArrayCallInspection.java @@ -4,8 +4,8 @@ package com.siyeh.ig.bugs; import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java index 4a6924efe6d4..98c0f2913e05 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.JavaMethodContractUtil; import com.intellij.codeInspection.dataFlow.StandardMethodContract; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java index ecd899865178..1733cb548289 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/UseOfPropertiesAsHashtableInspection.java @@ -17,6 +17,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java index 390c07684d85..41ae13676174 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java index a9fb7c5ed3ba..532adf9ebad5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java index 56abcacc8f34..9966081d1d18 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassCanBeEnumInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.LocalSearchScope; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java index 2b54d3de56f7..74f6a6cdf06b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.classlayout; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java index 150f94ff0e6d..825e1ff4e226 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.cloneable; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.PsiClass; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java index 7679079467b6..90aa76415e77 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneReturnsClassTypeInspection.java @@ -2,8 +2,8 @@ package com.siyeh.ig.cloneable; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java index e8c202d20458..76ac5ccec8f5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/BooleanExpressionMayBeConditionalInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.JavaTokenType; import com.intellij.psi.PsiBinaryExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java index b3e1a4135b00..677b17350b01 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalCanBePushedInsideExpressionInspection.java @@ -3,9 +3,9 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java index 8375427f4966..815e946a311f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiConditionalExpression; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java index 96d1c6f40a6c..7d2b526e1388 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java @@ -17,9 +17,9 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java index 8fa9720ab73e..cb34b3a85ea6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java @@ -17,9 +17,9 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.redundantCast.RemoveRedundantCastUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiPrecedenceUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java index 25cc65c6e463..3e3175b20051 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java index af16f10bc76e..1daa36f3c666 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ExpressionMayBeFactorizedInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiBinaryExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java index 7b8a840874c1..9bcbafe2cf94 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.JavaSuppressionUtil; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java index f6402029c708..d66c7f6ba2b6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java @@ -19,6 +19,7 @@ import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java index 24e2d5b011f4..97c53757bce4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java @@ -22,6 +22,7 @@ import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java index 9a624f0fdbe9..2d4d1a3db439 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java index 3ae2945bf691..5a372d6d7855 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalExpressionInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalInspection.java index 044f99a994bc..d959f8690e55 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedConditionalInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java index d3968aa18f8e..bfe3dffa8f5e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedEqualityExpressionInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java index df99a6909334..788403bdfcc2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/NegatedIfElseInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java index 1f938d9c5c00..9c6a4fa9da87 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableBooleanExpressionInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java index 2e940be60aa5..9d71d88933d2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.ObjectUtils; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java index b8cebc0d2f4e..5767caf570e6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SimplifiableEqualsExpressionInspection.java @@ -4,11 +4,11 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.types.DfTypes; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchExpressionCanBePushedDownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchExpressionCanBePushedDownInspection.java index 1dedc8b23966..21a4b038a980 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchExpressionCanBePushedDownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/SwitchExpressionCanBePushedDownInspection.java @@ -4,8 +4,8 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java index 42e978a633e9..dab3f2586bf0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java @@ -19,6 +19,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptCheckbox; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java index a0194001b732..0e7e2e432b7b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java index 3bee3099f119..fcea2b35c454 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java index b2af3469f0a7..b5d162002d4a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java @@ -4,8 +4,8 @@ package com.siyeh.ig.dataflow; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java index 8e36ec5fb22b..6e7bcd2ee063 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NullThrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NullThrownInspection.java index d944a3a747ce..563eec615d65 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NullThrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/NullThrownInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java index 85af321cad25..b5fe0f2b1b5b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.finalization; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java index b04c65e3705b..60da51cd0b12 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java @@ -16,8 +16,8 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.intention.AddAnnotationPsiFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddThisQualifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddThisQualifierFix.java index c74eb89afa70..f0810dc205c5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddThisQualifierFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddThisQualifierFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeAnnotationParameterQuickFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeAnnotationParameterQuickFix.java index 8a99e6f8cd20..f54c0ba9399c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeAnnotationParameterQuickFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeAnnotationParameterQuickFix.java @@ -2,9 +2,9 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.AnnotationUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiElementFactory; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeModifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeModifierFix.java index 6314f6f145ff..65b2937171cf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeModifierFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeModifierFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiModifier; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java index d60b0efc96b9..63e5976ae569 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.searches.ReferencesSearch; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java index 71585d168a1c..00719a341eb1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteCatchSectionFix.java @@ -3,7 +3,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiCatchSection; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteImportFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteImportFix.java index 58a24c247c32..e0e251eaa10c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteImportFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteImportFix.java @@ -15,7 +15,7 @@ */ package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java index c69361c3d50a..b11a52dcbe18 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java index 315bc284d460..30a2ffb6d5a6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.Nullability; import com.intellij.codeInsight.NullableNotNullManager; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java index 079669d0bef5..0e66900a9b39 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToSafeEqualsFix.java @@ -17,7 +17,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.Nullability; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualsToEqualityFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualsToEqualityFix.java index 4c4c5cb73a31..030fd905a9b3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualsToEqualityFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualsToEqualityFix.java @@ -2,7 +2,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeDefaultLastCaseFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeDefaultLastCaseFix.java index 9790f4733e6b..17df31997f9a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeDefaultLastCaseFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeDefaultLastCaseFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.psi.PsiCodeBlock; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java index 17218938aa19..51b1b02491fc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java @@ -2,7 +2,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java index e9d6a3a4fa6a..68cde9e438db 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java @@ -16,7 +16,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java index e143dfdaa9cc..ec438cad2cef 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java @@ -15,7 +15,7 @@ */ package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java index 55d714027b07..6b519b696c3c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeMethodFinalFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java index 259187ce2360..581200cd6ed5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java @@ -16,7 +16,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.BlockUtils; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java index 0fdf5ebf1f3d..d5912add7e4d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java @@ -15,9 +15,9 @@ */ package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.lang.ASTNode; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveRedundantPolyadicOperandFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveRedundantPolyadicOperandFix.java index 6b23b84703fa..908ba978f422 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveRedundantPolyadicOperandFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveRedundantPolyadicOperandFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java index b0e450254235..0aece6e74bf0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/ParameterTypePreventsOverridingInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java index bf1cb9a27b71..d19060e4a3a6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java @@ -3,9 +3,9 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java index acd6199eebfc..6bd4957a1f34 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java @@ -3,12 +3,8 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.QuickFixFactory; -import com.intellij.codeInspection.ModCommands; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandAction; -import com.intellij.modcommand.ModCommandQuickFix; -import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.*; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.impl.DebugUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java index b424291671be..3fa126675184 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/TypeParameterExtendsFinalClassInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java index cc34fe7c0897..2f9425031291 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.initialization; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java index 53b27d8fe3d8..0c4f2b62dffa 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.internationalization; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/UnnecessaryUnicodeEscapeInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/UnnecessaryUnicodeEscapeInspection.java index a15e7cf281f5..9718aa0b89b8 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/UnnecessaryUnicodeEscapeInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/UnnecessaryUnicodeEscapeInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.internationalization; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.editor.Document; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java index 425feb5a6e62..12392ab8ffad 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.j2me; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java index f94c8ef24dd0..9ab5df1caf99 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/PrivateMemberAccessBetweenOuterAndInnerClassInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.j2me; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java index a98acb7a5cb1..a297700d86ef 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java @@ -16,8 +16,8 @@ package com.siyeh.ig.j2me; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.HardcodedMethodConstants; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java index d561622fd35d..b5f974631224 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java @@ -16,8 +16,8 @@ package com.siyeh.ig.javabeans; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java index 06c7fc7a05fd..3081ffbad3cd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/DanglingJavadocInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInsight.javadoc.JavaDocUtil; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/HtmlTagCanBeJavadocTagInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/HtmlTagCanBeJavadocTagInspection.java index 08f3d190a75a..a487e96ac206 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/HtmlTagCanBeJavadocTagInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/HtmlTagCanBeJavadocTagInspection.java @@ -4,6 +4,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandQuickFix; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/MissingDeprecatedAnnotationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/MissingDeprecatedAnnotationInspection.java index f1cb1db3223b..589e1b7bac69 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/MissingDeprecatedAnnotationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/MissingDeprecatedAnnotationInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java index 9104187a9861..6af2482e4381 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/PackageInfoWithoutPackageInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java index ab53e765ea94..df8808f8e69d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java index 8c3e6150f6c0..12864abdc5d1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javadoc/UnnecessaryJavaDocLinkInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java index 38640a34acc5..adac68980c56 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoBoxingInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.jdk; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java index 233766799d0e..5794cc7db247 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java @@ -18,8 +18,8 @@ package com.siyeh.ig.jdk; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.daemon.impl.quickfix.AddTypeArgumentsFix; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.LocalSearchScope; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java index d2c7b624510b..322576aad038 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/ForeachStatementInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.jdk; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java index bccbd39f43a2..f28807842343 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.jdk; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java index 9ba4494895bb..e963c57f2010 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.junit; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java index 392f380789fb..9294a66fc217 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UseOfObsoleteAssertInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.junit; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/ReplaceEmptyArrayToConstantFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/ReplaceEmptyArrayToConstantFix.java index 0d9d3964a2de..ac5d2e4283da 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/ReplaceEmptyArrayToConstantFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/ReplaceEmptyArrayToConstantFix.java @@ -2,9 +2,9 @@ package com.siyeh.ig.memory; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/BigDecimalLegacyMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/BigDecimalLegacyMethodInspection.java index 398506477cab..058a21a5c253 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/BigDecimalLegacyMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/BigDecimalLegacyMethodInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java index 32d9679e17aa..de27c12ae74b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java @@ -4,8 +4,8 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java index 2ce5220465d3..120c1fbdcefc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java @@ -4,6 +4,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java index 95a772974bba..96bc4f9885bb 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java index 38fe76b55f8e..33106f05bea0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java index 472ee6fae778..1782c4f9b164 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java index 3958b42b38cc..7f4de91a94cf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/TryWithIdenticalCatchesInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java index 13c89d3c8598..64977018c99a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java index a7b3e1aba13e..7543bd80d312 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java index 3ce2767fdd9b..0326af4bdfd4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java @@ -19,9 +19,9 @@ import com.intellij.codeInsight.Nullability; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java index 5d791ca0c6a7..e308a5ac2c5b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java @@ -18,9 +18,9 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java index 7d426af52055..5c46ba6d4316 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CastedLiteralMaybeJustLiteralInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java index 5e0e2ce6d1ef..2b431e687208 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java @@ -2,8 +2,8 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java index bb363aa5b823..b433c54d50f1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java index 244a6269d18c..056a322aa5f0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java @@ -17,9 +17,9 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java index 12ba428170a8..ea7472dc19da 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.ConstantExpressionUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java index 05b161222955..83ee533c5da4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.numeric; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLiteralExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java index 9cdb1b38973c..9c2c716c7747 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ConvertOctalLiteralsToDecimalsFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.numeric; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiArrayInitializerExpression; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java index 6ea52c799c88..46956f5b84d7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/DivideByZeroInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.types.DfType; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java index c73dfcce7ea9..89136631c2f0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java index 53d6aa1e80f8..f24e0358de77 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java index a03eceb5ea9e..d81c9f2cf972 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/IntegerMultiplicationImplicitCastToLongInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.codeInspection.dataFlow.types.DfLongType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java index 3c95102d838f..77535b54aaf5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java index 69c275813af1..8292b5c56330 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java index b4f6fe2615f0..c5abeb87906a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java index a7ece88d2d4e..57cd79ce07ee 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.numeric; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLiteralExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java index ec5f354c0174..c32f324e3e3c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/RemoveLeadingZeroesFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.numeric; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiArrayInitializerExpression; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java index bdc7c07c0d0d..ab12d4d85e83 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java index c480f5817e81..a3b3e98cca03 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryExplicitNumericCastInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.lang.java.parser.ExpressionParser; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java index c299c20580cb..97d0dd8a1fa2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java index ac72d734fe75..7a679fb3e86d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java index daa77345080f..ac9d972c77f9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java @@ -5,9 +5,9 @@ import com.intellij.codeInsight.Nullability; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java index c724d6f5262c..02213dbb0fe5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BooleanConstructorInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java index c9d8b372550b..054875ee5474 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java index 78fabe28d1d2..12f9a809368e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java index cd1c9a7da2ce..5f4029542008 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java index 2264d31e7780..5c4cea0ffda0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java index 085fc082b892..2343f3846ed7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java index 6098d9aac2d8..ccee4eb4c225 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java index 755ec7709d5f..350f4ccc1871 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayCopyInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.DfaUtil; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java index ce71fb42d66a..c1273c09e9f0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java index 898b33079558..e12b33150a95 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java index 4b8582498414..7493eeb87e3d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/RedundantStringFormatCallInspection.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.*; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ReplaceExpressionWithTextFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ReplaceExpressionWithTextFix.java index 64fd482a4f29..05070838f7f8 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ReplaceExpressionWithTextFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/ReplaceExpressionWithTextFix.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.performance; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.RemoveRedundantTypeArgumentsUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNewExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java index 86d393e185d4..94eea9d57dc0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.HardcodedMethodConstants; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java index 8dfce5057e0b..acbe5708d699 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java @@ -20,10 +20,10 @@ import com.intellij.codeInsight.Nullability; import com.intellij.codeInsight.NullableNotNullManager; import com.intellij.codeInsight.PsiEquivalenceUtil; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.codeInspection.util.ChangeToAppendUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java index 18933fb369d1..839fe17830a2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.ChangeToAppendUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java index 57b41822a4e2..5b2a52013176 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java @@ -18,11 +18,11 @@ package com.siyeh.ig.performance; import com.intellij.codeInsight.Nullability; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.SetInspectionOptionFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java index 6c99be6bf758..1d051c1ee73a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java index dad2453bb5ed..3bd35d054c5c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java index 9b763427039b..56e2110c375d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java index caf81975b058..64c55b615556 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/redundancy/UnusedLabelInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.redundancy; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java index 5938a91df293..54d6c2bf0245 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java @@ -16,8 +16,8 @@ package com.siyeh.ig.serialization; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.HardcodedMethodConstants; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java index bc3c29f03e1a..27d7f339aa8a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java index 9128140260f9..dde1785dc69a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantExpressionInspection.java @@ -4,9 +4,9 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java index 213af7e29291..e21394ffeb19 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java @@ -3,10 +3,10 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiBinaryExpression; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java index dc442ba553db..c4a6847b5d5e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java @@ -18,8 +18,8 @@ package com.siyeh.ig.style; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/EscapedSpaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/EscapedSpaceInspection.java index 808f4b90f05f..c4afe0858ff2 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/EscapedSpaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/EscapedSpaceInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ExtendsObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ExtendsObjectInspection.java index 5d8921ffe8be..1126e2c336c4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ExtendsObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ExtendsObjectInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java index 4875bf56f565..907f9e0f605d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java index c679bf6edabf..cea16a21a1b9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java index 8cbc3ae2a945..bb804da88e93 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java index 946f307c91fc..c02c4f1aa1b4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/MissortedModifiersInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.style; import com.intellij.codeInsight.AnnotationTargetUtil; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ObjectsEqualsCanBeSimplifiedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ObjectsEqualsCanBeSimplifiedInspection.java index ea855c5e3056..7537657b49b4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ObjectsEqualsCanBeSimplifiedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ObjectsEqualsCanBeSimplifiedInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.Nullability; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java index 8b5e93ee0b9f..c437193e7357 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantEscapeInRegexReplacementInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java index 6b2f2899e82f..2e9e492bf14a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java index 78ca10697b75..5fefe79a93ad 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantImplementsInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java index 5d78e66807c7..f377bf4a43ea 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java @@ -4,8 +4,8 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableIfStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableIfStatementInspection.java index b4c6ec8a4510..480aeb03edc7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableIfStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SimplifiableIfStatementInspection.java @@ -1,9 +1,13 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.style; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; +import com.intellij.codeInspection.CleanupLocalInspectionTool; +import com.intellij.codeInspection.ProblemHighlightType; +import com.intellij.codeInspection.ProblemsHolder; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java index 829180257f1c..0b4bb06ba3a4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SingleStatementInBlockInspection.java @@ -5,8 +5,8 @@ import com.intellij.codeInsight.intention.CustomizableIntentionAction; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java index 84f6984da952..418e83c4b0fe 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java index 868a1aac17f4..6ece4537ad53 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnclearBinaryExpressionInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java index e0a1bea47471..45720882bd9d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java index 5bd939e11918..42cbddef6972 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java index d4e226b6a2ab..03745c0e35ba 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java index 0e1ce6bf8304..5e3acdd1944f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.style; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java index cfd20ab39f83..9c3d71f4e74b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.graphInference.PsiPolyExpressionUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java index 078c233c503e..f11347e99681 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java index b2b911bbebc9..11e1a5eb1676 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java @@ -16,7 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java index 015da55d85cc..4c891bf6ce67 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java index a2dccfdd7862..d7a67071733f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java index ee6a4eb42e38..665ada6553b4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.lang.LanguageUtil; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java index 492bc8f3e243..a2cee3d3db30 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java index 08c9d3062804..423566749505 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java index 432690da46f4..1df9c7b2dd1e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryThisInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.style; import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java index 91cb1ad36abb..d904d2a1b9da 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.Nullability; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.analysis.JavaAnalysisBundle; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java index cc5f39482896..a8d67ffc2d7f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/AssertWithoutMessageInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/AssertWithoutMessageInspection.java index ef545a56f322..08accd1769b0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/AssertWithoutMessageInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/AssertWithoutMessageInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.testFrameworks; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java index f24a0bb73fa8..87755b68e42e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/MisorderedAssertEqualsArgumentsInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.testFrameworks; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java index 0cfbb33b8515..59022da1c70a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/testFrameworks/SimplifiableAssertionInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.testFrameworks; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AbstractReplaceWithAnotherMethodCallFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AbstractReplaceWithAnotherMethodCallFix.java index fabc034ab3d6..b2c18276087d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AbstractReplaceWithAnotherMethodCallFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/AbstractReplaceWithAnotherMethodCallFix.java @@ -2,8 +2,8 @@ package com.siyeh.ig.threading; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java index edf4ed306a96..117850f95069 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.threading; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedMethodInspection.java index 6b8d7fb50915..c64b913299f3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SynchronizedMethodInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.threading; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadLocalSetWithNullInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadLocalSetWithNullInspection.java index 4903d279cdcb..4c07f94abb3f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadLocalSetWithNullInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadLocalSetWithNullInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.threading; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java index 624021ec9969..4999bf43e350 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WhileLoopSpinsOnFieldInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.threading; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModCommand; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java index d6033b2726d4..99ae2f6b9762 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java @@ -2,10 +2,10 @@ package com.siyeh.ig.visibility; import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; -import com.intellij.codeInspection.*; -import com.intellij.modcommand.ModCommand; -import com.intellij.modcommand.ModCommandQuickFix; -import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.codeInspection.CleanupLocalInspectionTool; +import com.intellij.codeInspection.LocalQuickFix; +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.modcommand.*; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.ObjectUtils; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java index cc38690b004d..1e4d226a7061 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java @@ -3,8 +3,8 @@ package com.siyeh.ig.visibility; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.containers.ContainerUtil; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java index 7414e78e2101..5eef0392001f 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorResultComparisonInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.codeInspection.dataFlow.value.RelationType; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.controlFlow.DefUseUtil; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/FunctionalExpressionCanBeFoldedInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/FunctionalExpressionCanBeFoldedInspection.java index a962dd6129cd..a32ecc837499 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/FunctionalExpressionCanBeFoldedInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/FunctionalExpressionCanBeFoldedInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.MethodSignatureUtil; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java index 72fadbfa3f6d..0005a3c4e8dd 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodCallInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java index d51cdc5aeec6..3b3254cca113 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInspection.compiler.JavacQuirksInspectionVisitor; import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Attachment; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantComparatorComparingInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantComparatorComparingInspection.java index 6b1fb522e984..d7cf3e8c759e 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantComparatorComparingInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantComparatorComparingInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareCallInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareCallInspection.java index 1e50b1c05ff1..a56fafec5ad5 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareCallInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareCallInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.dataFlow.DfaPsiUtil; import com.intellij.codeInspection.dataFlow.value.RelationType; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareToJavaTimeInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareToJavaTimeInspection.java index eadb1ee5b50f..00199fca0a2f 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareToJavaTimeInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantCompareToJavaTimeInspection.java @@ -4,6 +4,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.dataFlow.DfaPsiUtil; import com.intellij.codeInspection.dataFlow.value.RelationType; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantExplicitVariableTypeInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantExplicitVariableTypeInspection.java index a7079a88111b..3858b0936ec3 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantExplicitVariableTypeInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/RedundantExplicitVariableTypeInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.AnnotationTargetUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java index 5db689df3137..9f84a04102d1 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.BlockUtils; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/redundantCast/CastCanBeRemovedNarrowingVariableTypeInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/redundantCast/CastCanBeRemovedNarrowingVariableTypeInspection.java index d579b850679b..9b4e9b2c13e8 100644 --- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/redundantCast/CastCanBeRemovedNarrowingVariableTypeInspection.java +++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/redundantCast/CastCanBeRemovedNarrowingVariableTypeInspection.java @@ -3,10 +3,10 @@ package com.intellij.codeInspection.redundantCast; import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.JavaBundle; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java index 240219c9336b..078f9551946c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java @@ -8,7 +8,7 @@ import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo; import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.SetInspectionOptionFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/annotation/SingleElementAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/annotation/SingleElementAnnotationInspection.java index 1c6a519b13ba..1a5f033b0f85 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/annotation/SingleElementAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/annotation/SingleElementAnnotationInspection.java @@ -3,9 +3,9 @@ package com.siyeh.ig.annotation; import com.intellij.codeInsight.daemon.impl.quickfix.AddAnnotationAttributeNameFix; import com.intellij.codeInsight.daemon.impl.quickfix.CreateAnnotationMethodFromUsageFix; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/AssertionCanBeIfInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/AssertionCanBeIfInspection.java index 55ceea825840..857b911b5104 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/AssertionCanBeIfInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/AssertionCanBeIfInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.asserttoif; import com.intellij.codeInsight.BlockUtils; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java index a8eea7e5f1af..492c5ea1eec6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/asserttoif/IfCanBeAssertionInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.asserttoif; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java index 0911a260cd24..013000417e75 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ReturnNullInspection.java @@ -9,12 +9,12 @@ import com.intellij.codeInsight.intention.AddAnnotationPsiFix; import com.intellij.codeInsight.options.JavaInspectionButtons; import com.intellij.codeInsight.options.JavaInspectionControls; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.DfaPsiUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.OptionalUtil; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.controlFlow.DefUseUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java index 99fd722c97fa..f7a086cd2461 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java @@ -18,10 +18,10 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.codeInsight.daemon.impl.quickfix.AddDefaultConstructorFix; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java index 7a38fe7e42fa..db167f538405 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java index 0f243ddac881..c50674cc82f3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java index 491961fdcc71..f691a2796842 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java @@ -18,7 +18,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java index 071136a6a1e1..b2832765f375 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneableImplementsCloneInspection.java @@ -16,11 +16,11 @@ package com.siyeh.ig.cloneable; import com.intellij.codeInsight.generation.GenerateMembersUtil; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleSettings; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java index 3200742539b4..ea2977a3affc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java @@ -16,9 +16,11 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInsight.BlockUtils; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.LocalQuickFix; +import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java index f1b655701b0a..138ac7053149 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java @@ -10,6 +10,7 @@ import com.intellij.codeInspection.dataFlow.types.DfLongType; import com.intellij.codeInspection.dataFlow.value.RelationType; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandQuickFix; +import com.intellij.modcommand.ModCommands; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java index fef42cd3ee13..dda09c2425eb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.DfaPsiUtil; import com.intellij.codeInspection.dataFlow.TrackingRunner; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java index a50ede4a2d1b..97462c6d722c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java index 42bc3cc02bf3..f9ec0ef6f6ed 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java @@ -16,9 +16,12 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInsight.daemon.impl.quickfix.ConvertSwitchToIfIntention; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.CommonQuickFixBundle; +import com.intellij.codeInspection.LocalQuickFix; +import com.intellij.codeInspection.SetInspectionOptionFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java index 89fd7e0aa9fc..f88f83999103 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingMode import com.intellij.codeInsight.daemon.impl.analysis.SwitchBlockHighlightingModel.PatternsInSwitchBlockHighlightingModel.CompletenessResult; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.dataFlow.fix.DeleteSwitchLabelFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java index a0fc9e7bb601..2095c3c79eea 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java @@ -17,8 +17,8 @@ package com.siyeh.ig.dataflow; import com.intellij.codeInsight.BlockUtils; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java index 5eabb09c78cf..685f8641aab1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil; import com.intellij.codeInsight.generation.GenerateMembersUtil; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java index 35d2469fb6e2..9c31b3f288a0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReplaceWithCloneFix.java @@ -3,7 +3,7 @@ package com.siyeh.ig.encapsulation; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiArrayType; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java index 8d4b366eecd8..04cd8b182413 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldFix.java @@ -2,8 +2,8 @@ package com.siyeh.ig.encapsulation; import com.intellij.codeInspection.CommonQuickFixBundle; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java index 39e56f347828..95923538e5dc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java @@ -3,7 +3,9 @@ package com.siyeh.ig.errorhandling; import com.intellij.codeInsight.Nullability; import com.intellij.codeInsight.intention.LowPriorityAction; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; +import com.intellij.codeInspection.LocalQuickFix; +import com.intellij.codeInspection.ProblemsHolder; import com.intellij.codeInspection.dataFlow.interpreter.RunnerResult; import com.intellij.codeInspection.dataFlow.interpreter.StandardDataFlowInterpreter; import com.intellij.codeInspection.dataFlow.java.ControlFlowAnalyzer; @@ -28,6 +30,7 @@ import com.intellij.ide.fileTemplates.FileTemplate; import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.JavaTemplateUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowableSupplierOnlyThrowExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowableSupplierOnlyThrowExceptionInspection.java index 729f0c253510..b7ecf87771e2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowableSupplierOnlyThrowExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowableSupplierOnlyThrowExceptionInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.codeInsight.ExceptionUtil; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java index e41b67ec75b2..2f16f823b112 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowsRuntimeExceptionInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.lang.LanguageDocumentation; import com.intellij.lang.documentation.CodeDocumentationProvider; import com.intellij.lang.documentation.CompositeDocumentationProvider; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java index 4e354830c014..00d42df154f0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.generation.surroundWith.SurroundWithUtil; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java index 867ea7899036..773cda28def3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java index fee5c3a1debd..4bcec011aea9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnnecessaryInitCauseInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.errorhandling; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java index 3ef2c8af232e..1c684f4f812a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/MultiCatchCanBeSplitInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.exceptions; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java index bb5f3b8ad5e2..4b35ef4856fb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/exceptions/TryStatementWithMultipleResourcesInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.exceptions; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddArgumentFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddArgumentFix.java index e5179000f88e..87935f62d198 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddArgumentFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddArgumentFix.java @@ -2,7 +2,7 @@ package com.siyeh.ig.fixes; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/BaseSwitchFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/BaseSwitchFix.java index 77c8d9cb106a..d9146514fd8b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/BaseSwitchFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/BaseSwitchFix.java @@ -1,8 +1,8 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.codeInspection.util.IntentionName; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiSwitchBlock; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java index e96c0824a6de..f8476df6879f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java @@ -16,7 +16,7 @@ package com.siyeh.ig.fixes; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java index 09bc23aed728..8963ccd85abd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java @@ -16,7 +16,7 @@ package com.siyeh.ig.fixes; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.searches.ReferencesSearch; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java index 664f41395854..06096b67b16b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceHolderFix.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeClassFinalFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeClassFinalFix.java index b05b33305e6f..ebdc64f7df51 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeClassFinalFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeClassFinalFix.java @@ -2,7 +2,7 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandQuickFix; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java index 2f0c8a4849cf..c35d5bb65fb9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveCloneableFix.java @@ -2,7 +2,7 @@ package com.siyeh.ig.fixes; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java index 7626162d0702..288d494bed46 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/StaticImportInspection.java @@ -16,10 +16,10 @@ package com.siyeh.ig.imports; import com.intellij.codeInsight.options.JavaClassValidator; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java index f4dbab9491ab..8a7b9fdafa36 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java @@ -4,9 +4,9 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/ImplicitDefaultCharsetUsageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/ImplicitDefaultCharsetUsageInspection.java index 9073544abd84..c4a66a86e52f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/ImplicitDefaultCharsetUsageInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/ImplicitDefaultCharsetUsageInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.intention.FileModifier.SafeTypeForPreview; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.module.LanguageLevelUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java index 4998c7f13f63..8ea7c88a76e5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.javadoc; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.PackageIndex; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java index 2eeb54a177f4..c5b993cd67f1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.intention.QuickFixFactory; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java index a623af01d59f..6bcc8a2f598d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.codeInsight.options.JavaIdentifierValidator; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java index 5c400364754c..ca529dd9b14e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LoggerInitializedWithForeignClassInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.options.JavaIdentifierValidator; import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java index 7569b467745d..498924448a17 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/StringConcatenationArgumentToLogCallInspection.java @@ -2,11 +2,11 @@ package com.siyeh.ig.logging; import com.intellij.codeInspection.CleanupLocalInspectionTool; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptDropdown; import com.intellij.codeInspection.options.OptPane; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java index c7ed1a117903..ac7c5127a31d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/CommentedOutCodeInspection.java @@ -1,12 +1,14 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.maturity; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.LocalQuickFix; +import com.intellij.codeInspection.SetInspectionOptionFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.core.JavaPsiBundle; import com.intellij.ide.highlighter.JavaFileType; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java index bc1550799c44..4d991c79fdfb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.java.JavaBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.HtmlChunk; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java index 8f9db674bba2..a4d1e086b7ab 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java @@ -19,7 +19,7 @@ import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModCommand; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java index 8e05441a47ae..e4793eb1ae93 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java @@ -3,6 +3,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java index 5ea43a061c24..dd23570e86d5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java @@ -4,6 +4,7 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleSettings; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java index a1e70029ff26..dec6eba6d885 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java @@ -9,6 +9,7 @@ import com.intellij.codeInspection.dataFlow.NullabilityUtil; import com.intellij.codeInspection.options.OptPane; import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.WriteExternalException; import com.intellij.pom.java.LanguageLevel; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java index cf23b9161504..00b79cfd92da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.migration; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleSettings; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java index 7f0cebbc642d..ade8b58b3f0d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.naming; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.MethodSignature; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java index 5d4c3dc8589e..18c82a7ea59f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.naming; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java index 48f02a59c9ba..a4ec6ceffec7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ListRemoveInLoopInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ListRemoveInLoopInspection.java index 054ba6ce0da1..40c900dafee1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ListRemoveInLoopInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ListRemoveInLoopInspection.java @@ -7,6 +7,7 @@ import com.intellij.codeInspection.dataFlow.DfaPsiUtil; import com.intellij.codeInspection.dataFlow.DfaUtil; import com.intellij.codeInspection.dataFlow.value.RelationType; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Pair; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java index 7000e676fc18..a827b84bf2e0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CleanupLocalInspectionTool; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java index 214681e28916..fbe37ac4da6f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java @@ -2,7 +2,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/OnlyOneElementUsedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/OnlyOneElementUsedInspection.java index 064858e39173..e6bf0dc8c54e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/OnlyOneElementUsedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/OnlyOneElementUsedInspection.java @@ -3,6 +3,7 @@ package com.siyeh.ig.redundancy; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantClassCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantClassCallInspection.java index 2b9232b507a7..1c8bf83215cc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantClassCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantClassCallInspection.java @@ -3,6 +3,7 @@ package com.siyeh.ig.redundancy; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java index 87260be248a4..a9eb1f4c9e6e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.util.InspectionMessage; import com.intellij.codeInspection.util.IntentionName; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantExplicitChronoFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantExplicitChronoFieldInspection.java index d4c6db2c7945..b88b41549985 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantExplicitChronoFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantExplicitChronoFieldInspection.java @@ -4,6 +4,7 @@ package com.siyeh.ig.redundancy; import com.intellij.codeInspection.*; import com.intellij.codeInspection.util.ChronoUtil; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java index 23e8a4993ae3..537bde056193 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java @@ -10,6 +10,7 @@ import com.intellij.codeInspection.util.IntentionFamilyName; import com.intellij.codeInspection.util.IntentionName; import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ReplaceOnLiteralHasNoEffectInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ReplaceOnLiteralHasNoEffectInspection.java index c8eee1940b4a..d7480fe8d026 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ReplaceOnLiteralHasNoEffectInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ReplaceOnLiteralHasNoEffectInspection.java @@ -1,8 +1,12 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.redundancy; -import com.intellij.codeInspection.*; +import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; +import com.intellij.codeInspection.LocalQuickFix; +import com.intellij.codeInspection.ProblemHighlightType; +import com.intellij.codeInspection.ProblemsHolder; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java index 2b3d2b1d5830..01f57d71c616 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/UnnecessaryStringEscapeInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil; import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java index 42b075749687..1a7971bbbd2c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.security; import com.intellij.codeInsight.generation.GenerateMembersUtil; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleSettings; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/SerializableDeserializableClassInSecureContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/SerializableDeserializableClassInSecureContextInspection.java index c64a5c47752b..be67f3524b7f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/SerializableDeserializableClassInSecureContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/SerializableDeserializableClassInSecureContextInspection.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.security; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java index f78c84df419f..6d415e593977 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java @@ -4,7 +4,7 @@ package com.siyeh.ig.serialization; import com.intellij.codeInsight.daemon.impl.quickfix.AddDefaultConstructorFix; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCanBeReplacedWithEnumValuesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCanBeReplacedWithEnumValuesInspection.java index 9824789d1594..a9803d0ec24b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCanBeReplacedWithEnumValuesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCanBeReplacedWithEnumValuesInspection.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.style; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java index a8bf131af68a..130f1fa868c2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ArrayCreationWithoutNewKeywordInspection.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.style; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.TypeConversionUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/DiamondCanBeReplacedWithExplicitTypeArgumentsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/DiamondCanBeReplacedWithExplicitTypeArgumentsInspection.java index e114bf5ee359..d4db2fb75693 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/DiamondCanBeReplacedWithExplicitTypeArgumentsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/DiamondCanBeReplacedWithExplicitTypeArgumentsInspection.java @@ -3,6 +3,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.impl.PsiDiamondTypeUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaBodyCanBeCodeBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaBodyCanBeCodeBlockInspection.java index 4a883037d2e1..70236220f08d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaBodyCanBeCodeBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaBodyCanBeCodeBlockInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.style; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java index 69b90c123b80..f3ba7155b3fe 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaCanBeReplacedWithAnonymousInspection.java @@ -6,6 +6,7 @@ import com.intellij.codeInsight.generation.OverrideImplementUtil; import com.intellij.codeInsight.generation.PsiGenerationInfo; import com.intellij.codeInspection.*; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaParameterTypeCanBeSpecifiedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaParameterTypeCanBeSpecifiedInspection.java index d397ff449dec..e7bbcd1f4ab8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaParameterTypeCanBeSpecifiedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LambdaParameterTypeCanBeSpecifiedInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.style; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java index 3595a06a95ba..87f8759be3a7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java @@ -4,9 +4,9 @@ package com.siyeh.ig.style; import com.intellij.codeInsight.options.JavaClassValidator; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.module.LanguageLevelUtil; import com.intellij.openapi.project.Project; import com.intellij.pom.java.LanguageLevel; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java index 9cf636cf6a61..f56d8d8ace5c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java @@ -5,10 +5,10 @@ import com.intellij.application.options.CodeStyle; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.lang.ASTNode; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java index 716efcf1b9df..c326191440c6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryFullyQualifiedNameInspection.java @@ -20,6 +20,7 @@ import com.intellij.codeInspection.*; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandQuickFix; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java index 75a4671df132..61ea714baa99 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java @@ -3,7 +3,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.editor.Document; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java index 1ed506394170..981ddefaa200 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java @@ -17,7 +17,7 @@ package com.siyeh.ig.threading; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.LocalQuickFix; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/base/MCIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/base/MCIntention.java index 547410a759ea..c1eb179da164 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/base/MCIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/base/MCIntention.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ipp.base; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.codeInspection.util.IntentionName; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModCommand; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithMutableCollectionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithMutableCollectionIntention.java index 8313408a08a7..688f723fae85 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithMutableCollectionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/collections/ReplaceWithMutableCollectionIntention.java @@ -1,9 +1,9 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ipp.collections; -import com.intellij.codeInspection.PsiUpdateModCommandAction; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiLambdaExpression; import com.intellij.psi.PsiMethodCallExpression; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java index ca602aa9d95f..46ea4e310035 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ipp.concatenation; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.psi.*; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java index 9f1680f18b01..5c2d5efc1baf 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/datetime/ShowDateTimeExampleOutputIntention.java @@ -2,8 +2,8 @@ package com.siyeh.ipp.datetime; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.ModCommands; import com.intellij.modcommand.ModCommand; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.PsiBasedModCommandAction; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateParenthesesIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateParenthesesIntention.java index 2811885c7ca6..5ba647de68ee 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateParenthesesIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/expression/eliminate/EliminateParenthesesIntention.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ipp.expression.eliminate; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.modcommand.ModChooseAction; import com.intellij.modcommand.ModCommand; import com.intellij.modcommand.ModCommandAction; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java index d5e5a7e62701..45d5c0327181 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java @@ -2,7 +2,7 @@ package com.siyeh.ipp.junit; import com.intellij.codeInsight.AnnotationUtil; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.modcommand.ModPsiUpdater; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java index 014e5698d21a..bf9ccbae3ac7 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java @@ -2,7 +2,7 @@ package com.siyeh.ipp.switchbranches; import com.intellij.codeInsight.daemon.impl.analysis.HighlightingFeature; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; import com.intellij.codeInspection.dataFlow.types.DfIntType; diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java index 5014c020cb15..4171c419e0a9 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/duplicateStringLiteral/DuplicateStringLiteralInspection.java @@ -11,6 +11,7 @@ import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter; import com.intellij.java.i18n.JavaI18nBundle; import com.intellij.lang.java.JavaLanguage; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java index 1fcfa17fb8c9..a811d95abe40 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java @@ -2,11 +2,11 @@ package com.intellij.codeInspection.i18n; import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool; -import com.intellij.modcommand.ModPsiUpdater; import com.intellij.codeInspection.ProblemsHolder; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; import com.intellij.java.i18n.JavaI18nBundle; import com.intellij.javaee.ExternalResourceManager; +import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VfsUtil; diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java index e1e65f66e6a4..da3ba621c74c 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/TitleCapitalizationInspection.java @@ -8,6 +8,7 @@ import com.intellij.codeInspection.restriction.StringFlowUtil; import com.intellij.java.i18n.JavaI18nBundle; import com.intellij.lang.properties.psi.Property; import com.intellij.modcommand.ModPsiUpdater; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/TrailingSpacesInPropertyInspection.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/TrailingSpacesInPropertyInspection.java index 868d5ae4508a..f6ecbf5b05b0 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/TrailingSpacesInPropertyInspection.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/codeInspection/TrailingSpacesInPropertyInspection.java @@ -4,7 +4,7 @@ package com.intellij.lang.properties.codeInspection; import com.intellij.codeInspection.InspectionManager; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.PsiUpdateModCommandQuickFix; +import com.intellij.modcommand.PsiUpdateModCommandQuickFix; import com.intellij.codeInspection.options.OptPane; import com.intellij.lang.ASTNode; import com.intellij.lang.properties.IProperty; diff --git a/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyKeyToClipboardIntention.java b/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyKeyToClipboardIntention.java index 4366599932ea..7f4c979bf463 100644 --- a/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyKeyToClipboardIntention.java +++ b/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyKeyToClipboardIntention.java @@ -2,7 +2,7 @@ package com.intellij.lang.properties.actions; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.lang.properties.PropertiesBundle; import com.intellij.lang.properties.PropertiesLanguage; import com.intellij.lang.properties.psi.Property; diff --git a/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyValueToClipboardIntention.java b/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyValueToClipboardIntention.java index 685b01572827..7b6fe1bf08bd 100644 --- a/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyValueToClipboardIntention.java +++ b/plugins/properties/src/com/intellij/lang/properties/actions/CopyPropertyValueToClipboardIntention.java @@ -2,7 +2,7 @@ package com.intellij.lang.properties.actions; import com.intellij.codeInsight.intention.PriorityAction; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.lang.properties.PropertiesBundle; import com.intellij.lang.properties.PropertiesLanguage; import com.intellij.lang.properties.psi.Property; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ChangeBoundFieldTypeFix.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ChangeBoundFieldTypeFix.java index 2c9dde791450..f29886c27554 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ChangeBoundFieldTypeFix.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ChangeBoundFieldTypeFix.java @@ -3,7 +3,7 @@ package com.intellij.uiDesigner.binding; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.modcommand.ModPsiUpdater; -import com.intellij.codeInspection.PsiUpdateModCommandAction; +import com.intellij.modcommand.PsiUpdateModCommandAction; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiField; import com.intellij.psi.PsiType; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java index 8759bd85c1ed..eb8b541e3373 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java @@ -1,7 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.uiDesigner.binding; -import com.intellij.codeInspection.ModCommands; +import com.intellij.modcommand.ModCommands; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.lang.properties.references.PropertyReferenceBase;