User: joe
Date: 18 Mar 23 21:13
Revision: a83d58a696f23a6c005fce36b10451c971d700aa
Summary:
Fix AsyncProgressIcon ClassCastException on 2022.1


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8380&personal=false

Index: src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt
===================================================================
--- src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision c280208cc82d0cf4f1667381e6e39007c9b3665c)
+++ src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt	(revision a83d58a696f23a6c005fce36b10451c971d700aa)
@@ -21,8 +21,9 @@
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.JavaSdkVersion
 import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.ui.validation.AFTER_GRAPH_PROPAGATION
-import com.intellij.openapi.ui.validation.validationErrorFor
+import com.intellij.openapi.ui.validation.DialogValidation
 import com.intellij.ui.JBColor
 import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.Placeholder
@@ -64,8 +65,8 @@
                 cell(JPanel())
                     .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
                     .validation(
-                        validationErrorFor<JPanel> {
-                            finalizers.mapFirstNotNull(ProjectSetupFinalizer::validate)
+                        DialogValidation {
+                            finalizers.mapFirstNotNull(ProjectSetupFinalizer::validate)?.let(::ValidationInfo)
                         },
                     )
             }
Index: src/main/kotlin/creator/step/AbstractLatentStep.kt
===================================================================
--- src/main/kotlin/creator/step/AbstractLatentStep.kt	(revision c280208cc82d0cf4f1667381e6e39007c9b3665c)
+++ src/main/kotlin/creator/step/AbstractLatentStep.kt	(revision a83d58a696f23a6c005fce36b10451c971d700aa)
@@ -20,15 +20,15 @@
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.ui.validation.AFTER_GRAPH_PROPAGATION
-import com.intellij.openapi.ui.validation.validationErrorFor
+import com.intellij.openapi.ui.validation.DialogValidation
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.JBColor
 import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.Placeholder
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.ui.AsyncProcessIcon
-import javax.swing.JLabel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -96,7 +96,7 @@
                         row {
                             val label = label("Unable to $description")
                                 .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
-                                .validation(validationErrorFor<JLabel> { "Unable to $description" })
+                                .validation(DialogValidation { ValidationInfo("Unable to $description") })
                             label.component.foreground = JBColor.RED
                         }
                     }
@@ -142,11 +142,7 @@
                     },
                 )
                     .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
-                    .validation(
-                        validationErrorFor<AsyncProcessIcon> {
-                            "Haven't finished $description"
-                        },
-                    )
+                    .validation(DialogValidation { ValidationInfo("Haven't finished $description") })
             }
         }
     }