From d3f5af9da9b33760b6eeb8448d3cd71f0ec1c384 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 9 Feb 2022 18:05:55 +0100
Subject: [PATCH] EA-420710 (plugin) - IAE: ModalityState.$$$reportNull$$$0

GitOrigin-RevId: 38b3ce7521bbf26f9f090fc706bf9865ba6583b5
---
 .../MoveClassesOrPackagesDialog.java                     | 9 ++++++---
 .../com/intellij/refactoring/ui/RefactoringDialog.java   | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
index 6810f87a02cf..438f8518aae0 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.refactoring.move.moveClassesOrPackages;
 
 import com.intellij.CommonBundle;
@@ -28,7 +28,10 @@ import com.intellij.psi.search.ProjectScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.refactoring.*;
-import com.intellij.refactoring.move.*;
+import com.intellij.refactoring.move.MoveCallback;
+import com.intellij.refactoring.move.MoveClassesOrPackagesCallback;
+import com.intellij.refactoring.move.MoveDialogBase;
+import com.intellij.refactoring.move.MoveHandler;
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil;
 import com.intellij.refactoring.ui.ClassNameReferenceEditor;
 import com.intellij.refactoring.ui.PackageNameReferenceEditorCombo;
@@ -327,7 +330,7 @@ public class MoveClassesOrPackagesDialog extends MoveDialogBase {
 
   @Override
   protected void validateButtons() {
-    validateButtonsAsync();
+    validateButtonsAsync(ModalityState.stateForComponent(myMainPanel));
   }
 
   @Nullable
diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java
index acb1c11bed17..ccefa4912c17 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java
@@ -177,8 +177,12 @@ public abstract class RefactoringDialog extends DialogWrapper {
     getPreviewAction().setEnabled(enabled);
     getRefactorAction().setEnabled(enabled);
   }
-  
+
   protected void validateButtonsAsync() {
+    validateButtonsAsync(ModalityState.stateForComponent(getContentPanel()));
+  }
+
+  protected void validateButtonsAsync(@NotNull ModalityState modalityState) {
     setErrorText(null);
     ReadAction.nonBlocking(() -> {
         try {
@@ -188,7 +192,7 @@ public abstract class RefactoringDialog extends DialogWrapper {
         catch (ConfigurationException e) {
           return e;
         }
-      }).finishOnUiThread(ModalityState.stateForComponent(getContentPanel()), e -> {
+      }).finishOnUiThread(modalityState, e -> {
         if (e != null) {
           setErrorText(e.getMessage());
         }