From f0f2fd56842b1bf71a5f0baa32fb8d0a22ce4b30 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Tue, 27 Aug 2019 14:58:13 +0300 Subject: [PATCH] KT-28910: Extract labels from scratch editor to KotlinBundle messages --- .../org/jetbrains/kotlin/idea/KotlinBundle.properties | 4 ++++ .../kotlin/idea/scratch/ui/ModulesComboBoxAction.kt | 3 ++- .../idea/scratch/ui/ModulesComboBoxAction.kt.183 | 3 ++- .../kotlin/idea/scratch/ui/ScratchTopPanel.kt | 11 ++++------- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties index b7b9d11cd18..57b3c459959 100644 --- a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties +++ b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties @@ -256,4 +256,8 @@ scratch.run.button=Run Scratch File scratch.run.from.here.button=Run Scratch From Here scratch.stop.button=Stop scratch execution scratch.clear.button=Clear results +scratch.module.combobox=Use classpath of module +scratch.is.repl.checkbox=Use REPL +scratch.is.interactive.checkbox=Interactive mode +scratch.make.before.run.checkbox=Make module before Run diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt index 6af81143dc0..550447cfc61 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt @@ -16,13 +16,14 @@ import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.vcs.changes.committed.LabeledComboBoxAction import com.intellij.util.ui.UIUtil import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo import org.jetbrains.kotlin.idea.caches.project.testSourceInfo import org.jetbrains.kotlin.idea.scratch.ScratchFile import org.jetbrains.kotlin.idea.scratch.isKotlinWorksheet import javax.swing.JComponent -class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction("Use classpath of module") { +class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction(KotlinBundle.message("scratch.module.combobox")) { override fun createPopupActionGroup(button: JComponent): DefaultActionGroup { val actionGroup = DefaultActionGroup() actionGroup.add(ModuleIsNotSelectedAction(ConfigurationModuleSelector.NO_MODULE_TEXT)) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 index c4385dabd2c..13946d76e2c 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183 @@ -16,13 +16,14 @@ import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.vcs.changes.committed.LabeledComboBoxAction import com.intellij.util.ui.UIUtil import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo import org.jetbrains.kotlin.idea.caches.project.testSourceInfo import org.jetbrains.kotlin.idea.scratch.ScratchFile import org.jetbrains.kotlin.idea.scratch.isKotlinWorksheet import javax.swing.JComponent -class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction("Use classpath of module") { +class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction(KotlinBundle.message("scratch.module.combobox")) { override fun createPopupActionGroup(button: JComponent): DefaultActionGroup { val actionGroup = DefaultActionGroup() actionGroup.add(ModuleIsNotSelectedAction(ConfigurationModuleSelector.NO_MODULE_TEXT)) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt index 5c2b6b7182e..75d8dca74bb 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt @@ -17,17 +17,14 @@ package org.jetbrains.kotlin.idea.scratch.ui -import com.intellij.openapi.Disposable import com.intellij.openapi.actionSystem.* import com.intellij.openapi.application.ApplicationManager -import com.intellij.util.messages.Topic -import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.scratch.ScratchFile import org.jetbrains.kotlin.idea.scratch.actions.ClearScratchAction import org.jetbrains.kotlin.idea.scratch.actions.RunScratchAction import org.jetbrains.kotlin.idea.scratch.actions.StopScratchAction import org.jetbrains.kotlin.idea.scratch.output.ScratchOutputHandlerAdapter -import javax.swing.JComponent class ScratchTopPanel(val scratchFile: ScratchFile) { private val moduleChooserAction: ModulesComboBoxAction = ModulesComboBoxAction(scratchFile) @@ -79,7 +76,7 @@ class ScratchTopPanel(val scratchFile: ScratchFile) { } } - private inner class IsMakeBeforeRunAction : SmallBorderCheckboxAction("Make module before Run") { + private inner class IsMakeBeforeRunAction : SmallBorderCheckboxAction(KotlinBundle.message("scratch.make.before.run.checkbox")) { override fun update(e: AnActionEvent) { super.update(e) e.presentation.isVisible = scratchFile.module != null @@ -94,7 +91,7 @@ class ScratchTopPanel(val scratchFile: ScratchFile) { } } - private inner class IsInteractiveCheckboxAction : SmallBorderCheckboxAction("Interactive mode") { + private inner class IsInteractiveCheckboxAction : SmallBorderCheckboxAction(KotlinBundle.message("scratch.is.interactive.checkbox")) { override fun isSelected(e: AnActionEvent): Boolean { return scratchFile.options.isInteractiveMode } @@ -104,7 +101,7 @@ class ScratchTopPanel(val scratchFile: ScratchFile) { } } - private inner class IsReplCheckboxAction : SmallBorderCheckboxAction("Use REPL") { + private inner class IsReplCheckboxAction : SmallBorderCheckboxAction(KotlinBundle.message("scratch.is.repl.checkbox")) { override fun isSelected(e: AnActionEvent): Boolean { return scratchFile.options.isRepl }