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

Wizard: use built-in browse folder button for path component

Browse Source
This commit is contained in:
Ilya Kirillov
2020-03-13 16:14:46 +03:00
parent cbfe05efc8
commit 5e2c762501
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/components/PathFieldComponent.kt
+5 -3
View File
@@ -4,8 +4,10 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.ui.TextBrowseFolderListener import com.intellij.openapi.ui.TextBrowseFolderListener
import com.intellij.openapi.ui.TextFieldWithBrowseButton import com.intellij.openapi.ui.TextFieldWithBrowseButton
import org.jetbrains.kotlin.tools.projectWizard.core.Context import org.jetbrains.kotlin.tools.projectWizard.core.Context
import org.jetbrains.kotlin.tools.projectWizard.core.asPath
import org.jetbrains.kotlin.tools.projectWizard.core.entity.SettingValidator import org.jetbrains.kotlin.tools.projectWizard.core.entity.SettingValidator
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.textField import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.textField
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.withOnUpdatedListener
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
import javax.swing.JComponent import javax.swing.JComponent
@@ -22,9 +24,9 @@ class PathFieldComponent(
validator, validator,
onValueUpdate onValueUpdate
) { ) {
override val uiComponent: TextFieldWithBrowseButton = TextFieldWithBrowseButton( override val uiComponent: TextFieldWithBrowseButton = TextFieldWithBrowseButton().apply {
textField(initialValue?.toString().orEmpty()) { path -> fireValueUpdated(Paths.get(path.trim())) } textField.text = initialValue?.toString().orEmpty()
).apply { textField.withOnUpdatedListener { path -> fireValueUpdated(path.trim().asPath()) }
addBrowseFolderListener( addBrowseFolderListener(
TextBrowseFolderListener( TextBrowseFolderListener(
FileChooserDescriptorFactory.createSingleFolderDescriptor(), FileChooserDescriptorFactory.createSingleFolderDescriptor(),
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt
+6 -5
View File
@@ -27,10 +27,7 @@ import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.UiConstants.GAP_BORDER
import java.awt.* import java.awt.*
import java.awt.event.MouseAdapter import java.awt.event.MouseAdapter
import java.awt.event.MouseEvent import java.awt.event.MouseEvent
import javax.swing.BorderFactory import javax.swing.*
import javax.swing.Icon
import javax.swing.JComponent
import javax.swing.JPanel
import javax.swing.border.Border import javax.swing.border.Border
import javax.swing.event.DocumentEvent import javax.swing.event.DocumentEvent
import javax.swing.event.DocumentListener import javax.swing.event.DocumentListener
@@ -43,7 +40,11 @@ internal inline fun label(text: String, bold: Boolean = false, init: JBLabel.()
inline fun panel(layout: LayoutManager = BorderLayout(), init: JPanel.() -> Unit = {}) = JPanel(layout).apply(init) inline fun panel(layout: LayoutManager = BorderLayout(), init: JPanel.() -> Unit = {}) = JPanel(layout).apply(init)
fun textField(defaultValue: String?, onUpdated: (value: String) -> Unit) = JBTextField(defaultValue).apply { fun textField(defaultValue: String?, onUpdated: (value: String) -> Unit) =
JBTextField(defaultValue)
.withOnUpdatedListener(onUpdated)
fun <F : JTextField> F.withOnUpdatedListener(onUpdated: (value: String) -> Unit) = apply {
document.addDocumentListener(object : DocumentListener { document.addDocumentListener(object : DocumentListener {
override fun insertUpdate(e: DocumentEvent?) = onUpdated(this@apply.text) override fun insertUpdate(e: DocumentEvent?) = onUpdated(this@apply.text)
override fun removeUpdate(e: DocumentEvent?) = onUpdated(this@apply.text) override fun removeUpdate(e: DocumentEvent?) = onUpdated(this@apply.text)