From 7527e4b02d20856ddc9b192fa1b810c7a5cd6a21 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 17 Jan 2020 17:27:14 +0300 Subject: [PATCH] Wizard: remove duplicated string validator --- .../kotlin/tools/projectWizard/core/entity/Setting.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt index 1feeffcf295..d6b1c58930d 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt @@ -6,7 +6,6 @@ import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.ModuleConfig import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module -import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version import org.jetbrains.kotlin.tools.projectWizard.templates.Template import java.nio.file.Files @@ -243,9 +242,8 @@ object StringSettingType : SettingType() { private val title: String, neededAtPhase: GenerationPhase ) : SettingBuilder(path, title, neededAtPhase) { - fun shouldNotBeBlank() = validate { value: String -> - if (value.isBlank()) ValidationResult.ValidationError("`${title.capitalize()}` should not be blank ") - else ValidationResult.OK + fun shouldNotBeBlank() { + validate(StringValidators.shouldNotBeBlank(title.capitalize())) } override val type = StringSettingType