From fd6f7f9a7c6f8527d944fac2ebccb0556760d228 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 23 Mar 2020 01:07:49 +0300 Subject: [PATCH] Wizard: minor, remove unused code --- .../tools/projectWizard/wizard/ui/ui.kt | 50 ++----------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt index a343f5c1356..5a87c7627a4 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt @@ -6,7 +6,10 @@ import com.intellij.openapi.actionSystem.ActionPlaces import com.intellij.openapi.actionSystem.DefaultActionGroup import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.util.ThrowableComputable -import com.intellij.ui.* +import com.intellij.ui.ColorUtil +import com.intellij.ui.PopupHandler +import com.intellij.ui.SimpleTextAttributes +import com.intellij.ui.ToolbarDecorator import com.intellij.ui.components.JBLabel import com.intellij.ui.components.JBTextField import com.intellij.util.ui.UIUtil @@ -22,13 +25,9 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ProjectKind import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind -import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.UiConstants.GAP_BORDER_SIZE import java.awt.BorderLayout -import java.awt.Cursor import java.awt.Font import java.awt.LayoutManager -import java.awt.event.MouseAdapter -import java.awt.event.MouseEvent import javax.swing.* import javax.swing.border.Border import javax.swing.event.DocumentEvent @@ -57,17 +56,6 @@ fun F.withOnUpdatedListener(onUpdated: (value: String) -> Unit) }) } -internal fun hyperlinkLabel( - text: String, - onClick: () -> Unit -) = DescriptionPanel().apply { - cursor = Cursor(Cursor.HAND_CURSOR) - addMouseListener(object : MouseAdapter() { - override fun mouseClicked(e: MouseEvent?) = onClick() - }) - updateText("$text".asHtml()) -} - internal fun String.asHtml() = "$this" fun ValidationResult.ValidationError.asHtml() = when (messages.size) { @@ -139,30 +127,6 @@ fun ToolbarDecorator.createPanelWithPopupHandler(popupTarget: JComponent) = crea ) } -fun C.bordered( - needTopEmptyBorder: Boolean = true, - needBottomEmptyBorder: Boolean = true, - needInnerEmptyBorder: Boolean = true, - needLineBorder: Boolean = true -) = apply { - val lineBorder = if (needLineBorder) BorderFactory.createLineBorder(JBColor.border()) else null - border = BorderFactory.createCompoundBorder( - BorderFactory.createEmptyBorder( - if (needTopEmptyBorder) GAP_BORDER_SIZE else 0, - 0, - if (needBottomEmptyBorder) GAP_BORDER_SIZE else 0, - 0 - ), - when { - needInnerEmptyBorder -> BorderFactory.createCompoundBorder( - lineBorder, - BorderFactory.createEmptyBorder(GAP_BORDER_SIZE, GAP_BORDER_SIZE, GAP_BORDER_SIZE, GAP_BORDER_SIZE) - ) - else -> lineBorder - } - ) -} - fun C.addBorder(border: Border): C = apply { this.border = BorderFactory.createCompoundBorder(border, this.border) } @@ -175,12 +139,6 @@ fun runWithProgressBar(title: String, action: () -> T): T = null ) - -object UiConstants { - const val GAP_BORDER_SIZE = 5 -} - - val DisplayableSettingItem.fullTextHtml get() = buildString { append(text)