From 91980c52936364099e39a8be9480379d69d0db9b Mon Sep 17 00:00:00 2001 From: Burak Eregar Date: Fri, 25 Jan 2019 15:53:35 +0000 Subject: [PATCH] KT-27869: Make Java to Kotlin dialog show yes/no button according to it's question * Change `showOkCancelDialog` to `showYesNoDialog` #KT-27869 Fixed --- .../src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt | 2 +- .../org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 | 2 +- .../jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index bc8afaf224c..e07c0b69e7d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -131,7 +131,7 @@ class JavaToKotlinAction : AnAction() { if (enableExternalCodeProcessing && converterResult!!.externalCodeProcessing != null) { val question = "Some code in the rest of your project may require corrections after performing this conversion. Do you want to find such code and correct it too?" - if (!askExternalCodeProcessing || (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK)) { + if (!askExternalCodeProcessing || (Messages.showYesNoDialog(project, question, title, Messages.getQuestionIcon()) == Messages.YES)) { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 index 3855662ad02..51490e9cb58 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.181 @@ -126,7 +126,7 @@ class JavaToKotlinAction : AnAction() { if (enableExternalCodeProcessing && converterResult!!.externalCodeProcessing != null) { val question = "Some code in the rest of your project may require corrections after performing this conversion. Do you want to find such code and correct it too?" - if (!askExternalCodeProcessing || (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK)) { + if (!askExternalCodeProcessing || (Messages.showYesNoDialog(project, question, title, Messages.getQuestionIcon()) == Messages.YES)) { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 index d8b581545c8..44d226ba474 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt.as32 @@ -125,7 +125,7 @@ class JavaToKotlinAction : AnAction() { if (enableExternalCodeProcessing && converterResult!!.externalCodeProcessing != null) { val question = "Some code in the rest of your project may require corrections after performing this conversion. Do you want to find such code and correct it too?" - if (!askExternalCodeProcessing || (Messages.showOkCancelDialog(project, question, title, Messages.getQuestionIcon()) == Messages.OK)) { + if (!askExternalCodeProcessing || (Messages.showYesNoDialog(project, question, title, Messages.getQuestionIcon()) == Messages.YES)) { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction {