From 4c62f6439633ea1c73198ea0eb30b685631ba799 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 20 Feb 2020 20:09:10 +0300 Subject: [PATCH] Wizard: minor, not to use reading context directly in some places --- .../kotlin/tools/projectWizard/wizard/ui/SubStep.kt | 2 +- .../wizard/ui/firstStep/FirstWizardStepComponent.kt | 7 ++++--- .../wizard/ui/secondStep/SecondStepWizardComponent.kt | 3 ++- .../wizard/ui/secondStep/TemplatesComponent.kt | 4 ++-- .../wizard/ui/secondStep/modulesEditor/TargetsModel.kt | 2 +- .../projectWizard/wizard/ui/setting/SettingComponent.kt | 2 +- .../tools/projectWizard/settings/buildsystem/Module.kt | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/SubStep.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/SubStep.kt index 407d98f9695..83061eab88e 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/SubStep.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/SubStep.kt @@ -5,7 +5,7 @@ import java.awt.BorderLayout import javax.swing.JComponent abstract class SubStep( - val readingContext: ReadingContext + readingContext: ReadingContext ) : DynamicComponent(readingContext) { protected abstract fun buildContent(): JComponent diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt index 8770edf1d54..3eed518bf58 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/FirstWizardStepComponent.kt @@ -57,7 +57,7 @@ class TemplatesSubStep(readingContext: ReadingContext) : } read { allModules().forEach { module -> - module.apply { initDefaultValuesForSettings(readingContext.context) } + module.apply { initDefaultValuesForSettings() } } } } @@ -70,8 +70,9 @@ class TemplatesSubStep(readingContext: ReadingContext) : module.subModules.forEach(::addModule) } - readingContext.context.settingContext[KotlinPlugin::modules.reference] - ?.forEach(::addModule) + read { + KotlinPlugin::modules.reference.notRequiredSettingValue + }?.forEach(::addModule) return modules } diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/SecondStepWizardComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/SecondStepWizardComponent.kt index c9696d01050..ca930d95ce5 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/SecondStepWizardComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/SecondStepWizardComponent.kt @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.secondStep +import org.jetbrains.kotlin.idea.debugger.readAction import org.jetbrains.kotlin.idea.projectWizard.UiEditorUsageStats import org.jetbrains.kotlin.tools.projectWizard.core.ReadingContext import org.jetbrains.kotlin.tools.projectWizard.core.entity.ValidationResult @@ -63,7 +64,7 @@ class ModuleSettingsSubStep( uiEditorUsagesStats: UiEditorUsageStats ) : SubStep(wizard.valuesReadingContext) { private val sourcesetSettingsComponent = SourcesetSettingsComponent(wizard.valuesReadingContext).asSubComponent() - private val moduleSettingsComponent = ModuleSettingsComponent(readingContext, uiEditorUsagesStats).asSubComponent() + private val moduleSettingsComponent = ModuleSettingsComponent(wizard.valuesReadingContext, uiEditorUsagesStats).asSubComponent() private val nothingSelectedComponent = NothingSelectedComponent().asSubComponent() private val panel = panel { diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/TemplatesComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/TemplatesComponent.kt index 9f8b4e096c4..b5fe99c2d85 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/TemplatesComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/TemplatesComponent.kt @@ -84,7 +84,7 @@ class TemplatesComponent( } class ChooseTemplateComponent( - private val readingContext: ReadingContext, + readingContext: ReadingContext, private val onTemplateChosen: (Template) -> Unit ) : DynamicComponent(readingContext) { private enum class State(val text: String) { @@ -105,7 +105,7 @@ class ChooseTemplateComponent( } private val allTemplates - get() = with(readingContext) { + get() = read { TemplatesPlugin::templates.propertyValue } diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/TargetsModel.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/TargetsModel.kt index 8449dc7c61c..9f1155c78aa 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/TargetsModel.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/TargetsModel.kt @@ -65,7 +65,7 @@ class TargetsModel( fun add(module: Module) { uiEditorUsagesStats.modulesCreated++ with(readingContext) { - module.apply { initDefaultValuesForSettings(context) } + module.apply { initDefaultValuesForSettings() } } addToTheTree(module, modifyValue = true, parent = tree.selectedNode ?: root) } diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/setting/SettingComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/setting/SettingComponent.kt index 13cc10d271e..c706cda9d4a 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/setting/SettingComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/setting/SettingComponent.kt @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.FocusableComponent abstract class SettingComponent>( val reference: SettingReference, - val readingContext: ReadingContext + private val readingContext: ReadingContext ) : DynamicComponent(readingContext), Displayable, FocusableComponent { var value: V? get() = reference.value diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt index 8ffca3c01d3..fa8ccae8667 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt @@ -86,7 +86,7 @@ class Module( else -> "Module" } - fun ReadingContext.initDefaultValuesForSettings(context: Context) { + fun ReadingContext.initDefaultValuesForSettings() { configurator.safeAs()?.initDefaultValuesFor(this@Module, context) template?.apply { initDefaultValuesFor(this@Module, context) } }