From 8d1211a2f885bf52ea79bdc8c2c0f258d924de43 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 6 Sep 2016 16:28:26 +0200 Subject: [PATCH] convert ITNReporter, JetBrainsAccountDialog to kotlin --- .../{ITNReporter.java => ITNReporter.kt} | 20 +++++++++---------- ...tDialog.java => JetBrainsAccountDialog.kt} | 0 2 files changed, 9 insertions(+), 11 deletions(-) rename platform/platform-impl/src/com/intellij/diagnostic/{ITNReporter.java => ITNReporter.kt} (93%) rename platform/platform-impl/src/com/intellij/diagnostic/{JetBrainsAccountDialog.java => JetBrainsAccountDialog.kt} (100%) diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt similarity index 93% rename from platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java rename to platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt index b24a5c39dcda..f92a81299bdb 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt @@ -163,19 +163,17 @@ private fun submit(event: IdeaLoggingEvent, parentComponent: Component, callback else if (showYesNoDialog(parentComponent, project, msg, ReportMessages.ERROR_REPORT, Messages.getErrorIcon()) != Messages.YES) { callback.consume(SubmittedReportInfo(SubmittedReportInfo.SubmissionStatus.FAILED)) } - else { - if (e is NoSuchEAPUserException) { - val dialog: JetBrainsAccountDialog - if (parentComponent.isShowing) { - dialog = JetBrainsAccountDialog(parentComponent) - } - else { - dialog = JetBrainsAccountDialog(project!!) - } - dialog.show() + else if (e is NoSuchEAPUserException) { + val dialog: JetBrainsAccountDialog + if (parentComponent.isShowing) { + dialog = JetBrainsAccountDialog(parentComponent) } - ApplicationManager.getApplication().invokeLater { submit(event, parentComponent, callback, errorBean, description) } + else { + dialog = JetBrainsAccountDialog(project!!) + } + dialog.show() } + ApplicationManager.getApplication().invokeLater { submit(event, parentComponent, callback, errorBean, description) } } } return true diff --git a/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt similarity index 100% rename from platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.java rename to platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt