azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-39179 Replace ApplicationBundle with KotlinBundle

Browse Source 
- Used bundle messages are moved to JavaBundle in platform >= 201
- ^KT-39179 Fixed
This commit is contained in:
Roman Golyshev
2020-05-26 11:59:10 +03:00
parent 03fcbfad1a
commit eb838b0fa0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinPackageEntry.kt
-1
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.idea.core.formatter package org.jetbrains.kotlin.idea.core.formatter
import com.intellij.openapi.application.ApplicationBundle import com.intellij.openapi.application.ApplicationBundle
import org.jetbrains.kotlin.resolve.ImportPath
class KotlinPackageEntry( class KotlinPackageEntry(
packageName: String, packageName: String,
idea/resources-en/messages/KotlinBundle.properties
+5
View File
@@ -2214,3 +2214,8 @@ logger.factory.method.name=Logger factory method name
logger.factory.class.name=Logger factory class name logger.factory.class.name=Logger factory class name
choose.logger.factory.class=Choose logger factory class choose.logger.factory.class=Choose logger factory class
codestyle.layout.import.aliases.separately=Import aliases separately codestyle.layout.import.aliases.separately=Import aliases separately
button.add.package=Add Package
listbox.import.package=Package
listbox.import.with.subpackages=With Subpackages
title.import.layout=Import Layout
title.packages.to.use.import.with=Packages to Use Import with '*'
idea/src/org/jetbrains/kotlin/idea/formatter/BaseKotlinImportLayoutPanel.kt
+4 -5
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.formatter
import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonShortcuts import com.intellij.openapi.actionSystem.CommonShortcuts
import com.intellij.openapi.actionSystem.ShortcutSet import com.intellij.openapi.actionSystem.ShortcutSet
import com.intellij.openapi.application.ApplicationBundle
import com.intellij.openapi.wm.IdeFocusManager import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.ui.* import com.intellij.ui.*
import com.intellij.ui.components.JBCheckBox import com.intellij.ui.components.JBCheckBox
@@ -166,7 +165,7 @@ open class BaseKotlinImportLayoutPanel(title: String) : JPanel(BorderLayout()) {
} }
} }
class KotlinStarImportLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBundle.message("title.packages.to.use.import.with")) { class KotlinStarImportLayoutPanel : BaseKotlinImportLayoutPanel(KotlinBundle.message("title.packages.to.use.import.with")) {
init { init {
val importLayoutPanel = ToolbarDecorator.createDecorator(layoutTable) val importLayoutPanel = ToolbarDecorator.createDecorator(layoutTable)
.setAddAction { addPackage() } .setAddAction { addPackage() }
@@ -182,7 +181,7 @@ class KotlinStarImportLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBundl
} }
} }
class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBundle.message("title.import.layout")) { class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(KotlinBundle.message("title.import.layout")) {
private val cbImportAliasesSeparately = JBCheckBox(KotlinBundle.message("codestyle.layout.import.aliases.separately")) private val cbImportAliasesSeparately = JBCheckBox(KotlinBundle.message("codestyle.layout.import.aliases.separately"))
init { init {
@@ -190,7 +189,7 @@ class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBund
val importLayoutPanel = ToolbarDecorator.createDecorator(layoutTable) val importLayoutPanel = ToolbarDecorator.createDecorator(layoutTable)
.addExtraAction( .addExtraAction(
object : DumbAwareActionButton(ApplicationBundle.message("button.add.package"), IconUtil.getAddPackageIcon()) { object : DumbAwareActionButton(KotlinBundle.message("button.add.package"), IconUtil.getAddPackageIcon()) {
override fun actionPerformed(event: AnActionEvent) { override fun actionPerformed(event: AnActionEvent) {
addPackage() addPackage()
} }
@@ -257,7 +256,7 @@ class KotlinImportOrderLayoutPanel : BaseKotlinImportLayoutPanel(ApplicationBund
} }
fun createTableForPackageEntries(packageTable: KotlinPackageEntryTable): JBTable { fun createTableForPackageEntries(packageTable: KotlinPackageEntryTable): JBTable {
val names = arrayOf(ApplicationBundle.message("listbox.import.package"), ApplicationBundle.message("listbox.import.with.subpackages")) val names = arrayOf(KotlinBundle.message("listbox.import.package"), KotlinBundle.message("listbox.import.with.subpackages"))
val packageNameColumnIndex = 0 val packageNameColumnIndex = 0
val withSubpackagesColumnIndex = 1 val withSubpackagesColumnIndex = 1