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

Fix style: KotlinGradleMultiplatformWizardStep

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-03-02 11:29:15 +03:00
parent fe7b7fb0bd
commit 720c84d1d6
1 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt
+41 -16
View File
@@ -37,19 +37,18 @@ class KotlinGradleMultiplatformWizardStep(
private val wizardContext: WizardContext private val wizardContext: WizardContext
) : ModuleWizardStep() { ) : ModuleWizardStep() {
private val mainModuleNameComponent: LabeledComponent<JTextField> private val mainModuleNameComponent: LabeledComponent<JTextField> =
private val jvmModuleNameComponent: LabeledComponent<JTextField> LabeledComponent.create(JTextField(), "Main module name:", BorderLayout.WEST)
private val jsModuleNameComponent: LabeledComponent<JTextField> private val jvmModuleNameComponent: LabeledComponent<JTextField> =
LabeledComponent.create(JTextField(), "JVM module name:", BorderLayout.WEST)
private val jsModuleNameComponent: LabeledComponent<JTextField> =
LabeledComponent.create(JTextField(), "JS module name:", BorderLayout.WEST)
private val panel: JPanel private val panel: JPanel
private var syncEditing: Boolean = true private var syncEditing: Boolean = true
private var inSyncUpdate: Boolean = false private var inSyncUpdate: Boolean = false
init { 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 { panel = object : JPanel(GridBagLayout()), PanelWithAnchor {
private var anchor: JComponent? = mainModuleNameComponent.anchor private var anchor: JComponent? = mainModuleNameComponent.anchor
@@ -62,7 +61,6 @@ class KotlinGradleMultiplatformWizardStep(
jsModuleNameComponent.anchor = anchor jsModuleNameComponent.anchor = anchor
} }
} }
val baseDir = wizardContext.projectFileDirectory val baseDir = wizardContext.projectFileDirectory
val projectName = wizardContext.projectName val projectName = wizardContext.projectName
val initialProjectName = projectName ?: ProjectWizardUtil.findNonExistingFileName(baseDir, "untitled", "") val initialProjectName = projectName ?: ProjectWizardUtil.findNonExistingFileName(baseDir, "untitled", "")
@@ -90,21 +88,48 @@ class KotlinGradleMultiplatformWizardStep(
jsModuleNameComponent.component.document.addDocumentListener(stopSyncEditingListener) jsModuleNameComponent.component.document.addDocumentListener(stopSyncEditingListener)
panel.border = BorderFactory.createEmptyBorder(10, 10, 10, 10) 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(
panel.add(jvmModuleNameComponent, GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.emptyInsets(), 0, 0)) mainModuleNameComponent,
panel.add(jsModuleNameComponent, GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.emptyInsets(), 0, 0)) GridBagConstraints(
panel.add(JLabel(""), GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, JBUI.emptyInsets(), 0, 0)) 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) UIUtil.mergeComponentsWithAnchor(panel)
} }
private fun updateDerivedModuleNames() { private fun updateDerivedModuleNames() {
inSyncUpdate = true inSyncUpdate = true
try { try {
jvmModuleNameComponent.component.text = mainModuleName + "-jvm" jvmModuleNameComponent.component.text = "$mainModuleName-jvm"
jsModuleNameComponent.component.text = mainModuleName + "-js" jsModuleNameComponent.component.text = "$mainModuleName-js"
} } finally {
finally {
inSyncUpdate = false inSyncUpdate = false
} }
} }