From 50863b6985652457675271c20103cadd27bcb5a7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 25 Jun 2020 17:45:11 +0300 Subject: [PATCH] Fix using swing ComboBox and wrong bunching --- ...ureCompat.kt.193 => KotlinChangeSignatureCompat.kt.201} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/{KotlinChangeSignatureCompat.kt.193 => KotlinChangeSignatureCompat.kt.201} (86%) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.201 similarity index 86% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.201 index 5f3323b8b60..84a4342f79a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.201 @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages.OkCancelResult +import org.jetbrains.kotlin.descriptors.Visibility import javax.swing.Icon // FIX ME WHEN BUNCH 193 REMOVED @@ -23,10 +24,10 @@ fun showOkCancelDialog( project, message, title, - Messages.OK_BUTTON, - Messages.CANCEL_BUTTON, + Messages.getOkButton(), + Messages.getCancelButton(), icon ) } -typealias ComboBox = com.intellij.openapi.ui.ComboBox \ No newline at end of file +typealias ComboBox = com.intellij.openapi.ui.ComboBox