From 240bca3b782a610c248d18ef4a5900d278fa512d Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Fri, 13 Dec 2019 16:40:13 +0300 Subject: [PATCH] cleanup: use reset/apply/isModify from DSL GitOrigin-RevId: 51ddd38a069dacb41052db45a2edbe862d10d46c --- .../ui/text/DateTimeFormatConfigurableUi.kt | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurableUi.kt b/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurableUi.kt index dd6aff545d4f..7fbb8f687017 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurableUi.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/text/DateTimeFormatConfigurableUi.kt @@ -4,7 +4,7 @@ package com.intellij.ide.ui.text import com.intellij.ide.ui.LafManager import com.intellij.openapi.options.ConfigurableUi import com.intellij.openapi.options.ConfigurationException -import com.intellij.openapi.util.text.StringUtil +import com.intellij.openapi.ui.DialogPanel import com.intellij.ui.layout.* import com.intellij.util.text.DateTimeFormatManager import com.intellij.util.text.JBDateFormat @@ -16,7 +16,7 @@ import javax.swing.JTextField * @author Konstantin Bulenkov */ class DateTimeFormatConfigurableUi(settings: DateTimeFormatManager) : ConfigurableUi { - private val ui: JComponent + private val ui: DialogPanel private lateinit var usePrettyFormatting: JCheckBox private lateinit var overrideSystemDateFormatting: JCheckBox private lateinit var use24HourTime: JCheckBox @@ -52,28 +52,16 @@ class DateTimeFormatConfigurableUi(settings: DateTimeFormatManager) : Configurab } } - override fun reset(settings: DateTimeFormatManager) { - usePrettyFormatting.isSelected = settings.isPrettyFormattingAllowed - } + override fun reset(settings: DateTimeFormatManager) = ui.reset() - override fun isModified(settings: DateTimeFormatManager): Boolean { - return usePrettyFormatting.isSelected != settings.isPrettyFormattingAllowed - || overrideSystemDateFormatting.isSelected != settings.isOverrideSystemDateFormat - || !StringUtil.equals(pattern.text, settings.dateFormatPattern) - || use24HourTime.isSelected != settings.isUse24HourTime - } + override fun isModified(settings: DateTimeFormatManager): Boolean = ui.isModified() @Throws(ConfigurationException::class) override fun apply(settings: DateTimeFormatManager) { - settings.isPrettyFormattingAllowed = usePrettyFormatting.isSelected - settings.isOverrideSystemDateFormat = overrideSystemDateFormatting.isSelected - settings.dateFormatPattern = pattern.text - settings.isUse24HourTime = use24HourTime.isSelected + ui.apply() JBDateFormat.invalidateCustomFormatter() LafManager.getInstance().updateUI() } - override fun getComponent(): JComponent { - return ui - } + override fun getComponent(): JComponent = ui }