diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java index c406d0f846ef..aad375f5e3b2 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java @@ -21,7 +21,6 @@ import com.intellij.codeInsight.ChangeContextUtil; import com.intellij.codeInsight.generation.GenerateMembersUtil; import com.intellij.lang.findUsages.DescriptiveNameUtil; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -459,7 +458,7 @@ public class IntroduceParameterProcessor extends BaseRefactoringProcessor implem } if (isReplaceDuplicates()) { - ApplicationManager.getApplication().invokeLater(() -> processMethodsDuplicates(), ModalityState.NON_MODAL, myProject.getDisposed()); + ApplicationManager.getApplication().invokeLater(() -> processMethodsDuplicates(), myProject.getDisposed()); } } diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java index 4f34d3f90d2e..a6bd49643082 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java @@ -24,7 +24,6 @@ import com.intellij.lang.ContextAwareActionHandler; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; -import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.diagnostic.Logger; @@ -204,7 +203,7 @@ public class MethodDuplicatesHandler implements RefactoringActionHandler, Contex if (ApplicationManager.getApplication().isUnitTestMode()) { nothingFoundRunnable.run(); } else { - ApplicationManager.getApplication().invokeLater(nothingFoundRunnable, ModalityState.NON_MODAL); + ApplicationManager.getApplication().invokeLater(nothingFoundRunnable, project.getDisposed()); } } } else { @@ -239,7 +238,7 @@ public class MethodDuplicatesHandler implements RefactoringActionHandler, Contex a.finish(); } }; - ApplicationManager.getApplication().invokeLater(replaceRunnable, ModalityState.NON_MODAL); + ApplicationManager.getApplication().invokeLater(replaceRunnable, project.getDisposed()); } public static List hasDuplicates(final PsiFile file, final PsiMember member) {