Fixup new project wizard for 2023.1

Earthcomputer · Earthcomputer · commit c67a0e85d9ae · 2023-02-26T11:58:28.000Z
diff --git a/src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt b/src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt
@@ -22,8 +22,8 @@ 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.DialogValidation
+import com.intellij.openapi.ui.validation.WHEN_GRAPH_PROPAGATION_FINISHED
 import com.intellij.ui.JBColor
 import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.Placeholder
@@ -57,7 +57,7 @@ class ProjectSetupFinalizerWizardStep(parent: NewProjectWizardStep) : AbstractNe
         if (finalizers.isNotEmpty()) {
             builder.row {
                 cell(JPanel())
-                    .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                    .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .validation(
                         DialogValidation {
                             finalizers.mapFirstNotNull(ProjectSetupFinalizer::validate)?.let(::ValidationInfo)
diff --git a/src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt b/src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt
@@ -16,10 +16,10 @@ import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.NewProjectWizardBaseData
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.observable.util.bindStorage
-import com.intellij.openapi.ui.validation.AFTER_GRAPH_PROPAGATION
 import com.intellij.openapi.ui.validation.CHECK_ARTIFACT_ID
 import com.intellij.openapi.ui.validation.CHECK_GROUP_ID
 import com.intellij.openapi.ui.validation.CHECK_NON_EMPTY
+import com.intellij.openapi.ui.validation.WHEN_GRAPH_PROPAGATION_FINISHED
 import com.intellij.openapi.ui.validation.validationErrorIf
 import com.intellij.ui.dsl.builder.COLUMNS_MEDIUM
 import com.intellij.ui.dsl.builder.Panel
@@ -61,21 +61,21 @@ class BuildSystemPropertiesStep<ParentStep>(private val parent: ParentStep) : Ab
                 textField()
                     .bindText(groupIdProperty)
                     .columns(COLUMNS_MEDIUM)
-                    .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                    .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY, CHECK_GROUP_ID, nonExampleValidation)
             }
             row("Artifact ID:") {
                 textField()
                     .bindText(artifactIdProperty)
                     .columns(COLUMNS_MEDIUM)
-                    .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                    .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY, CHECK_ARTIFACT_ID)
             }
             row("Version:") {
                 textField()
                     .bindText(versionProperty)
                     .columns(COLUMNS_MEDIUM)
-                    .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                    .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .textValidation(versionValidation)
             }
         }.expanded = true
diff --git a/src/main/kotlin/creator/step/AbstractLatentStep.kt b/src/main/kotlin/creator/step/AbstractLatentStep.kt
@@ -21,8 +21,8 @@ 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.DialogValidation
+import com.intellij.openapi.ui.validation.WHEN_GRAPH_PROPAGATION_FINISHED
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.JBColor
 import com.intellij.ui.dsl.builder.Panel
@@ -95,7 +95,7 @@ abstract class AbstractLatentStep<T>(parent: NewProjectWizardStep) : AbstractNew
                     placeholder.component = panel {
                         row {
                             val label = label("Unable to $description")
-                                .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                                .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                                 .validation(DialogValidation { ValidationInfo("Unable to $description") })
                             label.component.foreground = JBColor.RED
                         }
@@ -141,7 +141,7 @@ abstract class AbstractLatentStep<T>(parent: NewProjectWizardStep) : AbstractNew
                         }
                     }
                 )
-                    .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                    .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .validation(DialogValidation { ValidationInfo("Haven't finished $description") })
             }
         }
diff --git a/src/main/kotlin/creator/step/ModNameStep.kt b/src/main/kotlin/creator/step/ModNameStep.kt
@@ -15,8 +15,8 @@ import com.intellij.ide.wizard.AbstractNewProjectWizardStep
 import com.intellij.ide.wizard.NewProjectWizardBaseData
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.validation.AFTER_GRAPH_PROPAGATION
 import com.intellij.openapi.ui.validation.CHECK_NON_EMPTY
+import com.intellij.openapi.ui.validation.WHEN_GRAPH_PROPAGATION_FINISHED
 import com.intellij.openapi.util.Key
 import com.intellij.ui.dsl.builder.COLUMNS_MEDIUM
 import com.intellij.ui.dsl.builder.Panel
@@ -42,7 +42,7 @@ abstract class AbstractModNameStep(parent: NewProjectWizardStep) : AbstractNewPr
                 textField()
                     .bindText(nameProperty)
                     .columns(COLUMNS_MEDIUM)
-                    .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))
+                    .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
                     .textValidation(CHECK_NON_EMPTY)
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import com.intellij.openapi.Disposable`
`21`	`21`	`import com.intellij.openapi.diagnostic.logger`
`22`	`22`	`import com.intellij.openapi.project.Project`
`23`	`23`	`import com.intellij.openapi.ui.ValidationInfo`
`24`		`-import com.intellij.openapi.ui.validation.AFTER_GRAPH_PROPAGATION`
`25`	`24`	`import com.intellij.openapi.ui.validation.DialogValidation`
	`25`	`+import com.intellij.openapi.ui.validation.WHEN_GRAPH_PROPAGATION_FINISHED`
`26`	`26`	`import com.intellij.openapi.util.Disposer`
`27`	`27`	`import com.intellij.ui.JBColor`
`28`	`28`	`import com.intellij.ui.dsl.builder.Panel`
`@@ -95,7 +95,7 @@ abstract class AbstractLatentStep<T>(parent: NewProjectWizardStep) : AbstractNew`
`95`	`95`	`placeholder.component = panel {`
`96`	`96`	`row {`
`97`	`97`	`val label = label("Unable to $description")`
`98`		`- .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))`
	`98`	`+ .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))`
`99`	`99`	`.validation(DialogValidation { ValidationInfo("Unable to $description") })`
`100`	`100`	`label.component.foreground = JBColor.RED`
`101`	`101`	`}`
`@@ -141,7 +141,7 @@ abstract class AbstractLatentStep<T>(parent: NewProjectWizardStep) : AbstractNew`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`)`
`144`		`- .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph))`
	`144`	`+ .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))`
`145`	`145`	`.validation(DialogValidation { ValidationInfo("Haven't finished $description") })`
`146`	`146`	`}`
`147`	`147`	`}`