From 720c84d1d60dfc27941aedb7915a55e43eff5428 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 2 Mar 2018 11:29:15 +0300 Subject: [PATCH] Fix style: KotlinGradleMultiplatformWizardStep --- .../KotlinGradleMultiplatformWizardStep.kt | 57 +++++++++++++------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt index d735914d3c6..67c2288936a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt @@ -37,19 +37,18 @@ class KotlinGradleMultiplatformWizardStep( private val wizardContext: WizardContext ) : ModuleWizardStep() { - private val mainModuleNameComponent: LabeledComponent - private val jvmModuleNameComponent: LabeledComponent - private val jsModuleNameComponent: LabeledComponent + private val mainModuleNameComponent: LabeledComponent = + LabeledComponent.create(JTextField(), "Main module name:", BorderLayout.WEST) + private val jvmModuleNameComponent: LabeledComponent = + LabeledComponent.create(JTextField(), "JVM module name:", BorderLayout.WEST) + private val jsModuleNameComponent: LabeledComponent = + LabeledComponent.create(JTextField(), "JS module name:", BorderLayout.WEST) private val panel: JPanel private var syncEditing: Boolean = true private var inSyncUpdate: Boolean = false init { - mainModuleNameComponent = LabeledComponent.create(JTextField(), "Main module name:", BorderLayout.WEST) - jvmModuleNameComponent = LabeledComponent.create(JTextField(), "JVM module name:", BorderLayout.WEST) - jsModuleNameComponent = LabeledComponent.create(JTextField(), "JS module name:", BorderLayout.WEST) - panel = object : JPanel(GridBagLayout()), PanelWithAnchor { private var anchor: JComponent? = mainModuleNameComponent.anchor @@ -62,7 +61,6 @@ class KotlinGradleMultiplatformWizardStep( jsModuleNameComponent.anchor = anchor } } - val baseDir = wizardContext.projectFileDirectory val projectName = wizardContext.projectName val initialProjectName = projectName ?: ProjectWizardUtil.findNonExistingFileName(baseDir, "untitled", "") @@ -90,21 +88,48 @@ class KotlinGradleMultiplatformWizardStep( jsModuleNameComponent.component.document.addDocumentListener(stopSyncEditingListener) panel.border = BorderFactory.createEmptyBorder(10, 10, 10, 10) - panel.add(mainModuleNameComponent, GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.insets(10, 0, 0, 0), 0, 0)) - panel.add(jvmModuleNameComponent, GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.emptyInsets(), 0, 0)) - panel.add(jsModuleNameComponent, GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.emptyInsets(), 0, 0)) - panel.add(JLabel(""), GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.emptyInsets(), 0, 0)) + panel.add( + mainModuleNameComponent, + GridBagConstraints( + 0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, + GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, + JBUI.insets(10, 0, 0, 0), 0, 0 + ) + ) + panel.add( + jvmModuleNameComponent, + GridBagConstraints( + 0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, + GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, + JBUI.emptyInsets(), 0, 0 + ) + ) + panel.add( + jsModuleNameComponent, + GridBagConstraints( + 0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, + GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, + JBUI.emptyInsets(), 0, 0 + ) + ) + panel.add( + JLabel(""), + GridBagConstraints( + 0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, + GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, + JBUI.emptyInsets(), 0, 0 + ) + ) UIUtil.mergeComponentsWithAnchor(panel) } private fun updateDerivedModuleNames() { inSyncUpdate = true try { - jvmModuleNameComponent.component.text = mainModuleName + "-jvm" - jsModuleNameComponent.component.text = mainModuleName + "-js" + jvmModuleNameComponent.component.text = "$mainModuleName-jvm" + jsModuleNameComponent.component.text = "$mainModuleName-js" - } - finally { + } finally { inSyncUpdate = false } }