User: joe Date: 26 Feb 23 11:58 Revision: c67a0e85d9aec533290c7ae87927bf0630be0b86 Summary: Fixup new project wizard for 2023.1 TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8326&personal=false Index: src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt =================================================================== --- src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt (revision 77d8bb6ec6db97fbcd81938e9a0cda0033808b62) +++ src/main/kotlin/creator/ProjectSetupFinalizerWizardStep.kt (revision c67a0e85d9aec533290c7ae87927bf0630be0b86) @@ -22,8 +22,8 @@ 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 @@ 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) Index: src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt =================================================================== --- src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt (revision 77d8bb6ec6db97fbcd81938e9a0cda0033808b62) +++ src/main/kotlin/creator/buildsystem/BuildSystemPropertiesStep.kt (revision c67a0e85d9aec533290c7ae87927bf0630be0b86) @@ -16,10 +16,10 @@ 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 @@ 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 Index: src/main/kotlin/creator/step/AbstractLatentStep.kt =================================================================== --- src/main/kotlin/creator/step/AbstractLatentStep.kt (revision 77d8bb6ec6db97fbcd81938e9a0cda0033808b62) +++ src/main/kotlin/creator/step/AbstractLatentStep.kt (revision c67a0e85d9aec533290c7ae87927bf0630be0b86) @@ -21,8 +21,8 @@ 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 @@ 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 @@ } } ) - .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph)) + .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph)) .validation(DialogValidation { ValidationInfo("Haven't finished $description") }) } } Index: src/main/kotlin/creator/step/ModNameStep.kt =================================================================== --- src/main/kotlin/creator/step/ModNameStep.kt (revision 77d8bb6ec6db97fbcd81938e9a0cda0033808b62) +++ src/main/kotlin/creator/step/ModNameStep.kt (revision c67a0e85d9aec533290c7ae87927bf0630be0b86) @@ -15,8 +15,8 @@ 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 @@ textField() .bindText(nameProperty) .columns(COLUMNS_MEDIUM) - .validationRequestor(AFTER_GRAPH_PROPAGATION(propertyGraph)) + .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph)) .textValidation(CHECK_NON_EMPTY) } }