MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Using selected() method when possible

Browse Source 
GitOrigin-RevId: 337ce4959abc631cef05aa95661b0bd92be35f5b
This commit is contained in:
Pavel Porvatov
2023-04-05 15:19:16 +00:00
committed by intellij-monorepo-bot
parent 5043e6f910
commit b89bd59e4a
25 changed files with 95 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/ExtractMethodPopupProvider.kt
+3 -2
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.ui.DialogPanel
import com.intellij.ui.dsl.builder.Cell
import com.intellij.ui.dsl.builder.RightGap
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import javax.swing.JComponent
import javax.swing.JPanel
import javax.swing.LayoutFocusTraversalPolicy
@@ -59,8 +60,8 @@ class ExtractMethodPopupProvider(val annotateDefault: Boolean? = null,
if (annotate != null) {
row {
checkBox(JavaRefactoringBundle.message("extract.method.checkbox.annotate"))
.selected(annotate ?: false)
.applyToComponent {
isSelected = annotate ?: false
addActionListener {
annotate = isSelected
changeListener.invoke()
@@ -71,8 +72,8 @@ class ExtractMethodPopupProvider(val annotateDefault: Boolean? = null,
if (makeStatic != null) {
row {
checkBox(makeStaticLabel)
.selected(makeStatic ?: false)
.applyToComponent {
isSelected = makeStatic ?: false
addActionListener {
makeStatic = isSelected
changeListener.invoke()
platform/lang-impl/src/com/intellij/codeInspection/ui/UiDslOptPaneRenderer.kt
+1 -3
View File
@@ -216,9 +216,7 @@ class UiDslOptPaneRenderer : InspectionOptionPaneRenderer {
return when (component) {
is OptCheckbox -> {
checkBox(component.label.label())
.applyToComponent {
isSelected = context.getOption(component.bindId) as Boolean
}
.selected(context.getOption(component.bindId) as Boolean)
.onChanged { context.setOption(component.bindId, it.isSelected) }
}
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/TemplateInlayUtil.kt
+3 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.refactoring.rename.impl.isEmpty
import com.intellij.refactoring.util.TextOccurrencesUtil
import com.intellij.ui.dsl.builder.RightGap
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import com.intellij.ui.popup.PopupFactoryImpl
import com.intellij.util.ui.JBEmptyBorder
import com.intellij.util.ui.JBInsets
@@ -352,8 +353,8 @@ object TemplateInlayUtil {
commentsStringsOccurrences?.let {
row {
checkBox(RefactoringBundle.message("comments.and.strings"))
.selected(it)
.applyToComponent {
isSelected = it
addActionListener {
commentsStringsOccurrences = isSelected
optionsListener(TextOptions(commentStringOccurrences = commentsStringsOccurrences, textOccurrences = textOccurrences))
@@ -366,8 +367,8 @@ object TemplateInlayUtil {
textOccurrences?.let {
row {
val cb = checkBox(RefactoringBundle.message("text.occurrences"))
.selected(it)
.applyToComponent {
isSelected = it
addActionListener {
textOccurrences = isSelected
optionsListener(TextOptions(commentStringOccurrences = commentsStringsOccurrences, textOccurrences = textOccurrences))
platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt
+2 -1
View File
@@ -11,6 +11,7 @@ import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.components.dialog
import com.intellij.ui.dsl.builder.AlignX
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import com.intellij.util.io.encodeUrlQueryParameter
import com.intellij.util.text.nullize
import java.awt.Component
@@ -43,7 +44,7 @@ fun askJBAccountCredentials(parent: Component, project: Project?, authFailed: Bo
}
row("") {
rememberCheckBox = checkBox(UIBundle.message("auth.remember.cb"))
.applyToComponent { isSelected = remember }
.selected(remember)
.component
link(DiagnosticBundle.message("error.report.auth.restore")) {
val userName = userField.text.trim().encodeUrlQueryParameter()
platform/platform-impl/src/com/intellij/ide/actions/InvalidateCachesDialog.kt
+2 -3
View File
@@ -10,6 +10,7 @@ import com.intellij.ui.components.Link
import com.intellij.ui.components.panels.NonOpaquePanel
import com.intellij.ui.dsl.builder.DEFAULT_COMMENT_WIDTH
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import com.intellij.util.ui.JBUI
import java.awt.BorderLayout
import javax.swing.Action
@@ -82,9 +83,7 @@ class InvalidateCachesDialog(
val defaultValue = descr.optionalCheckboxDefaultValue()
val checkbox = checkBox(text)
.enabled(defaultValue != null)
.applyToComponent {
isSelected = defaultValue ?: true
}
.selected(defaultValue ?: true)
.component
invalidatorsOptions[checkbox] = descr
}
platform/platform-impl/src/com/intellij/ide/browsers/LaunchBrowserBeforeRunTaskProvider.kt
+2 -5
View File
@@ -18,10 +18,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.Key
import com.intellij.ui.components.dialog
import com.intellij.ui.dsl.builder.AlignX
import com.intellij.ui.dsl.builder.COLUMNS_MEDIUM
import com.intellij.ui.dsl.builder.columns
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.*
import com.intellij.util.xmlb.annotations.Attribute
import org.jetbrains.concurrency.Promise
import org.jetbrains.concurrency.resolvedPromise
@@ -69,7 +66,7 @@ internal class LaunchBrowserBeforeRunTaskProvider : BeforeRunTaskProvider<Launch
.align(AlignX.FILL)
if (JavaScriptDebuggerStarter.Util.hasStarters()) {
startJavaScriptDebuggerCheckBox = checkBox(IdeBundle.message("start.browser.with.js.debugger"))
.applyToComponent { isSelected = state.withDebugger }
.selected(state.withDebugger)
.component
}
}
platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.kt
+1 -1
View File
@@ -284,7 +284,7 @@ internal class AppearanceConfigurable : BoundSearchableConfigurable(message("tit
}
else {
val enableColorBlindness = checkBox(UIBundle.message("color.blindness.combobox.text"))
.applyToComponent { isSelected = colorBlindnessProperty.get() != null }
.selected(colorBlindnessProperty.get() != null)
comboBox(supportedValues)
.enabledIf(enableColorBlindness.selected)
.applyToComponent { renderer = SimpleListCellRenderer.create("") { PlatformEditorBundle.message(it.key) } }
platform/platform-impl/src/com/intellij/internal/ui/ShowIconScaleTestAction.kt
+35 -31
View File
@@ -118,48 +118,52 @@ private class IconScaleTestDialog(project: Project?) : DialogWrapper(project) {
group("Options") {
row {
checkBox("Pass object scale:").applyToComponent {
isSelected = passObjectScale
addItemListener {
passObjectScale = isSelected
invokeLater { rebuildUi() }
checkBox("Pass object scale:")
.selected(passObjectScale)
.applyToComponent {
addItemListener {
passObjectScale = isSelected
invokeLater { rebuildUi() }
}
}
}
}
indent {
row {
checkBox("Pass context component:").applyToComponent {
isSelected = passContextContext
checkBox("Pass context component:")
.selected(passContextContext)
.applyToComponent {
addItemListener {
passContextContext = isSelected
invokeLater { rebuildUi() }
}
}.enabled(passObjectScale)
}
}
row {
checkBox("Mark scalable:")
.selected(markScalable)
.applyToComponent {
addItemListener {
passContextContext = isSelected
invokeLater { rebuildUi() }
}
}.enabled(passObjectScale)
}
}
row {
checkBox("Mark scalable:").applyToComponent {
isSelected = markScalable
addItemListener {
markScalable = isSelected
invokeLater {
rebuildIcons()
rebuildUi()
markScalable = isSelected
invokeLater {
rebuildIcons()
rebuildUi()
}
}
}
}
}
row {
checkBox("Wrap with DeferredIcon:").applyToComponent {
isSelected = wrapDeferred
addItemListener {
wrapDeferred = isSelected
invokeLater {
rebuildIcons()
rebuildUi()
checkBox("Wrap with DeferredIcon:")
.selected(wrapDeferred)
.applyToComponent {
addItemListener {
wrapDeferred = isSelected
invokeLater {
rebuildIcons()
rebuildUi()
}
}
}
}
}
row("User scale:") {
platform/platform-impl/src/com/intellij/internal/ui/uiDslShowcase/DemoTips.kt
+1 -1
View File
@@ -115,7 +115,7 @@ fun demoTips(parentDisposable: Disposable): DialogPanel {
}
row {
radioButton("Value = 2, isSelected = true", 2)
.applyToComponent { isSelected = true }
.selected(true)
.comment("Initial bounded value is 0, this RadioButton is selected because initial bound variable value is not equal to values of RadioButton in the group and isSelected = true", maxLineLength = 40)
}
}.bind({ value }, { value = it })
platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/GroupsPanel.kt
+9 -12
View File
@@ -5,6 +5,7 @@ import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.dsl.builder.BottomGap
import com.intellij.ui.dsl.builder.TopGap
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import com.intellij.ui.layout.*
import org.jetbrains.annotations.ApiStatus
@@ -20,27 +21,23 @@ internal class GroupsPanel {
group(title = "Group at top, no gap before") {
row {
group1Visibility = checkBox("Group1 visibility")
.applyToComponent {
isSelected = true
}.component
.selected(true)
.component
group1Enabled = checkBox("Group1 enabled")
.applyToComponent {
isSelected = true
}.component
.selected(true)
.component
}
indent {
row {
group1RowVisibility = checkBox("Group1 label1 visibility")
.applyToComponent {
isSelected = true
}.component
.selected(true)
.component
}
}
row {
group2Visibility = checkBox("Group2 visibility")
.applyToComponent {
isSelected = true
}.component
.selected(true)
.component
}
}
platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/PlaceholderPanel.kt
+4 -6
View File
@@ -92,13 +92,11 @@ internal class PlaceholderPanel(parentDisposable: Disposable) {
}
}
checkBox("enabled")
.applyToComponent {
isSelected = true
}.onChanged { placeholder.enabled(it.isSelected) }
.selected(true)
.onChanged { placeholder.enabled(it.isSelected) }
checkBox("visible")
.applyToComponent {
isSelected = true
}.onChanged { placeholder.visible(it.isSelected) }
.selected(true)
.onChanged { placeholder.visible(it.isSelected) }
}
row("Placeholder:") {
placeholder = placeholder()
platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/SegmentedButtonPanel.kt
+1 -3
View File
@@ -47,9 +47,7 @@ internal class SegmentedButtonPanel(parentDisposable: Disposable) {
row {
checkBox("Enabled")
.applyToComponent {
isSelected = true
}
.selected(true)
.actionListener { _, component -> segmentedButtonRow.enabled(component.isSelected) }
}
platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/UiDslTestAction.kt
+6 -8
View File
@@ -156,9 +156,8 @@ private class UiDslTestDialog(project: Project?) : DialogWrapper(project, null,
for ((name, entity) in entities.toSortedMap()) {
row(name) {
checkBox("visible")
.applyToComponent {
isSelected = true
}.onChanged {
.selected(true)
.onChanged {
when (entity) {
is Cell<*> -> entity.visible(it.isSelected)
is Row -> entity.visible(it.isSelected)
@@ -166,9 +165,8 @@ private class UiDslTestDialog(project: Project?) : DialogWrapper(project, null,
}
}
checkBox("enabled")
.applyToComponent {
isSelected = true
}.onChanged {
.selected(true)
.onChanged {
when (entity) {
is Cell<*> -> entity.enabled(it.isSelected)
is Row -> entity.enabled(it.isSelected)
@@ -186,9 +184,9 @@ private class UiDslTestDialog(project: Project?) : DialogWrapper(project, null,
row {
checkBoxRow = checkBox("Row")
.applyToComponent { isSelected = true }
.selected(true)
checkBoxText = checkBox("textField")
.applyToComponent { isSelected = true }
.selected(true)
}
row("visibleIf test row") {
platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/ValidationPanel.kt
+2 -1
View File
@@ -4,6 +4,7 @@ package com.intellij.internal.ui.uiDslTestAction
import com.intellij.openapi.Disposable
import com.intellij.openapi.ui.DialogPanel
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import com.intellij.ui.layout.selected
import org.jetbrains.annotations.ApiStatus
import javax.swing.JCheckBox
@@ -20,7 +21,7 @@ internal class ValidationPanel(parentDisposable: Disposable) {
row {
cbValidationEnabled = checkBox("Validation enabled")
.applyToComponent { isSelected = true }
.selected(true)
.component
}
platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/ValidationRefactoringPanel.kt
+2 -3
View File
@@ -138,9 +138,8 @@ class ValidationRefactoringPanel(parentDisposable: Disposable) {
private fun Row.checkBoxValidation(validation: CellValidation<*>) {
checkBox("Enable")
.applyToComponent {
isSelected = true
}.onChanged { validation.enabled = it.isSelected }
.selected(true)
.onChanged { validation.enabled = it.isSelected }
}
private fun validationInfo(component: JTextField, place: String): ValidationInfo? {
platform/platform-tests/testSrc/com/intellij/ui/dsl/builder/ButtonsGroupTest.kt
+2 -2
View File
@@ -70,7 +70,7 @@ class ButtonsGroupTest {
panel {
buttonsGroup {
row { rb1 = radioButton("1").component }
row { rb2 = radioButton("2").applyToComponent { isSelected = true }.component }
row { rb2 = radioButton("2").selected(true).component }
}
}
@@ -79,7 +79,7 @@ class ButtonsGroupTest {
panel {
buttonsGroup {
row { rb1 = cell(JRadioButton("1")).component }
row { rb2 = cell(JRadioButton("2")).applyToComponent { isSelected = true }.component }
row { rb2 = cell(JRadioButton("2")).selected(true).component }
}
}
platform/platform-tests/testSrc/com/intellij/ui/dsl/builder/EnabledVisibleTest.kt
+2 -2
View File
@@ -46,9 +46,9 @@ class EnabledVisibleTest {
panel {
row {
checkBoxRow = checkBox("")
.applyToComponent { isSelected = true }
.selected(true)
checkBoxText = checkBox("")
.applyToComponent { isSelected = true }
.selected(true)
}
row("visibleIf test row") {
platform/statistics/devkit/src/com/intellij/internal/statistic/devkit/actions/scheme/EventsTestSchemeGroupConfiguration.kt
+2 -2
View File
@@ -99,16 +99,16 @@ class EventsTestSchemeGroupConfiguration(private val project: Project,
buttonsGroup {
row {
allowAllEventsRadioButton = radioButton(StatisticsBundle.message("stats.allow.all.events"))
.selected(!initialGroup.useCustomRules)
.applyToComponent {
isSelected = !initialGroup.useCustomRules
addChangeListener { updateRulesOption() }
}.component
}
row {
customRulesRadioButton = radioButton(StatisticsBundle.message("stats.use.custom.validation.rules"))
.gap(RightGap.SMALL)
.selected(initialGroup.useCustomRules)
.applyToComponent {
isSelected = initialGroup.useCustomRules
addChangeListener { updateRulesOption() }
}.component
contextHelp(StatisticsBundle.message("stats.test.scheme.custom.rules.help"))
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
+2 -5
View File
@@ -39,10 +39,7 @@ import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.ui.DoubleClickListener
import com.intellij.ui.TableSpeedSearch
import com.intellij.ui.UIBundle
import com.intellij.ui.dsl.builder.Align
import com.intellij.ui.dsl.builder.AlignX
import com.intellij.ui.dsl.builder.AlignY
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.*
import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns
import com.intellij.ui.treeStructure.treetable.TreeTable
import com.intellij.ui.treeStructure.treetable.TreeTableModel
@@ -183,8 +180,8 @@ open class MultipleFileMergeDialog(
if (project != null) {
row {
checkBox(VcsBundle.message("multiple.file.merge.group.by.directory.checkbox"))
.selected(groupByDirectory)
.applyToComponent {
isSelected = groupByDirectory
addChangeListener { toggleGroupByDirectory(isSelected) }
}
}
plugins/devkit/intellij.devkit.themes/src/actions/NewThemeAction.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.ui.components.dialog
import com.intellij.ui.dsl.builder.Cell
import com.intellij.ui.dsl.builder.columns
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.layout.*
import com.intellij.ui.dsl.builder.selected
import org.jetbrains.idea.devkit.actions.DevkitActionsUtil
import org.jetbrains.idea.devkit.inspections.quickfix.PluginDescriptorChooser
import org.jetbrains.idea.devkit.module.PluginModuleType
@@ -53,7 +53,7 @@ class NewThemeAction : AnAction() {
.addValidationRule(DevKitThemesBundle.message("new.theme.dialog.name.empty")) { name.component.text.isBlank() }
}
row("") {
isDark = checkBox(DevKitThemesBundle.message("new.theme.dialog.is.dark.checkbox.text")).applyToComponent { isSelected = true }
isDark = checkBox(DevKitThemesBundle.message("new.theme.dialog.is.dark.checkbox.text")).selected(true)
}
}
plugins/evaluation-plugin/src/com/intellij/cce/dialog/FlowConfigurable.kt
+2 -5
View File
@@ -4,10 +4,7 @@ import com.intellij.cce.EvaluationPluginBundle
import com.intellij.cce.workspace.Config
import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.openapi.extensions.PluginId
import com.intellij.ui.dsl.builder.AlignX
import com.intellij.ui.dsl.builder.Cell
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.text
import com.intellij.ui.dsl.builder.*
import java.awt.event.ItemEvent
import javax.swing.*
@@ -37,7 +34,7 @@ class FlowConfigurable : EvaluationConfigurable {
}
row(EvaluationPluginBundle.message("evaluation.settings.flow.logs.save")) {
checkBox("")
.applyToComponent { isSelected = saveLogs }
.selected(saveLogs)
.configureSaveLogs(statsCollectorEnabled)
}
row(EvaluationPluginBundle.message("evaluation.settings.flow.logs.split")) {
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/hint/types/GroovyLocalVariableTypeHintsInlayProvider.kt
+2 -1
View File
@@ -5,6 +5,7 @@ import com.intellij.codeInsight.hints.*
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiFile
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.builder.selected
import org.jetbrains.plugins.groovy.GroovyBundle
import javax.swing.JPanel
@@ -44,8 +45,8 @@ def foo() {
override fun createComponent(listener: ChangeListener): JPanel = panel {
row {
checkBox(GroovyBundle.message("settings.inlay.put.type.hint.before.identifier"))
.selected(insertTypeHintBeforeIdentifier)
.applyToComponent {
isSelected = insertTypeHintBeforeIdentifier
addItemListener {
listener.settingsChanged()
settings.insertBeforeIdentifier = this@applyToComponent.isSelected
python/ide/impl/src/com/jetbrains/python/PyIdeCommonOptionsPanel.kt
+2 -2
View File
@@ -92,13 +92,13 @@ internal class PyIdeCommonOptionsPanel(data: PyCommonOptionsFormData, showModule
row {
addContentRootsCheckbox = checkBox(PyBundle.message("runcfg.labels.add.content.roots.to.pythonpath"))
.applyToComponent { isSelected = true }
.selected(true)
.component
}
row {
addSourceRootsCheckbox = checkBox(PyBundle.message("runcfg.labels.add.source.roots.to.pythonpath"))
.applyToComponent { isSelected = true }
.selected(true)
.component
}
}.apply {
python/pluginCore/impl/src/com/jetbrains/python/run/PyPluginCommonOptionsPanel.kt
+3 -3
View File
@@ -44,7 +44,7 @@ class PyPluginCommonOptionsPanel {
buttonsGroup {
row(PyBundle.message("runcfg.labels.python.interpreter")) {
useModuleSdkRadioButton = radioButton(PyBundle.message("runcfg.labels.use.sdk.of.module"))
.applyToComponent { isSelected = true }
.selected(true)
.gap(RightGap.SMALL)
.component
@@ -84,12 +84,12 @@ class PyPluginCommonOptionsPanel {
}
row {
addContentRootsCheckbox = checkBox(PyBundle.message("runcfg.labels.add.content.roots.to.pythonpath"))
.applyToComponent { isSelected = true }
.selected(true)
.component
}
row {
addSourceRootsCheckbox = checkBox(PyBundle.message("runcfg.labels.add.source.roots.to.pythonpath"))
.applyToComponent { isSelected = true }
.selected(true)
.component
}
}.apply {
python/src/com/jetbrains/python/run/PythonRunConfigurationPanel.kt
+2 -2
View File
@@ -82,12 +82,12 @@ internal class PythonRunConfigurationPanel(configuration: PythonRunConfiguration
collapsibleGroup(PyBundle.message("runcfg.labels.execution")) {
row {
emulateTerminalCheckbox = checkBox(PyBundle.message("form.python.run.configuration.emulate.terminal.in.output.console"))
.applyToComponent { isSelected = true }
.selected(true)
.component
}
row {
showCommandLineCheckbox = checkBox(PyBundle.message("form.python.run.configuration.run.with.python.console"))
.applyToComponent { isSelected = true }
.selected(true)
.component
}
row {