azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: remove duplicated string validator

Browse Source
This commit is contained in:
Ilya Kirillov
2020-01-17 17:27:14 +03:00
parent b33ae61508
commit 7527e4b02d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
+2 -4
View File
@@ -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.phases.GenerationPhase
import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem 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.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.settings.version.Version
import org.jetbrains.kotlin.tools.projectWizard.templates.Template import org.jetbrains.kotlin.tools.projectWizard.templates.Template
import java.nio.file.Files import java.nio.file.Files
@@ -243,9 +242,8 @@ object StringSettingType : SettingType<String>() {
private val title: String, private val title: String,
neededAtPhase: GenerationPhase neededAtPhase: GenerationPhase
) : SettingBuilder<String, StringSettingType>(path, title, neededAtPhase) { ) : SettingBuilder<String, StringSettingType>(path, title, neededAtPhase) {
fun shouldNotBeBlank() = validate { value: String -> fun shouldNotBeBlank() {
if (value.isBlank()) ValidationResult.ValidationError("`${title.capitalize()}` should not be blank ") validate(StringValidators.shouldNotBeBlank(title.capitalize()))
else ValidationResult.OK
} }
override val type = StringSettingType override val type = StringSettingType