From 7507d62ec3f94f5d23193a9a67bb1a21dd727083 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 4 Mar 2020 17:33:40 +0700 Subject: [PATCH] i18n: replace `KotlinBundleBase` with `AbstractKotlinBundle` --- .../kotlin/idea/core/util/KotlinBundleBase.kt | 28 ------------------- .../kotlin/idea/git/KotlinGitBundle.kt | 16 ++++------- .../ide/konan/KotlinGradleNativeBundle.kt | 16 ++++------- .../jetbrains/kotlin/idea/KotlinJvmBundle.kt | 16 ++++------- .../kotlin/idea/maven/KotlinMavenBundle.kt | 16 ++++------- .../kotlin/ide/konan/KotlinNativeBundle.kt | 16 ++++------- .../KotlinNewProjectWizardBundle.properties | 0 .../wizard/KotlinNewProjectWizardBundle.kt | 16 ++++------- .../idea/debugger/KotlinDebuggerCoreBundle.kt | 16 ++++------- .../KotlinDebuggerCoroutinesBundle.kt | 16 ++++------- .../KotlinDebuggerEvaluationBundle.kt | 19 ++++++------- .../kotlin/nj2k/KotlinNJ2KServicesBundle.kt | 16 ++++------- .../jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt | 16 ++++------- 13 files changed, 58 insertions(+), 149 deletions(-) delete mode 100644 idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinBundleBase.kt rename idea/idea-new-project-wizard/resources/{org/jetbrains/kotlin/tools/projectWizard/wizard => messages}/KotlinNewProjectWizardBundle.properties (100%) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinBundleBase.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinBundleBase.kt deleted file mode 100644 index 8521963b3b8..00000000000 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinBundleBase.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.core.util - -import java.lang.ref.Reference -import java.lang.ref.SoftReference -import java.util.* - -abstract class KotlinBundleBase { - private var bundleCache: Reference? = null - - protected abstract fun createBundle(): ResourceBundle - - val bundle: ResourceBundle - get() { - val cachedValue = bundleCache?.get() - if (cachedValue != null) { - return cachedValue - } - - val newValue = createBundle() - bundleCache = SoftReference(newValue) - return newValue - } -} \ No newline at end of file diff --git a/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt b/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt index 2c17afc821b..f2e6e4dbf20 100644 --- a/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt +++ b/idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.idea.git -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinGitBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinGitBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinGitBundle" +object KotlinGitBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt index 33bcc1c6d6f..c4f4923949d 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt +++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.ide.konan -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinGradleNativeBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinGradleNativeBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinGradleNativeBundle" +object KotlinGradleNativeBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt index d468d9291d8..9abec2ff2c0 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.idea -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinJvmBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinJvmBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinJvmBundle" +object KotlinJvmBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt index 8c2edd22e04..57c7a0ffbbe 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.idea.maven -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinMavenBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinMavenBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinMavenBundle" +object KotlinMavenBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt index 2bd0026dbb7..841b253384c 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.ide.konan -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinNativeBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinNativeBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinNativeBundle" +object KotlinNativeBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/idea-new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.properties b/idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties similarity index 100% rename from idea/idea-new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.properties rename to idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.kt index 9eeb41e1ae6..7ffaa9749e5 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinNewProjectWizardBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinNewProjectWizardBundle" +object KotlinNewProjectWizardBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt index 821c5cc82e0..088eb728efc 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt +++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.idea.debugger -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinDebuggerCoreBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinDebuggerCoreBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinDebuggerCoreBundle" +object KotlinDebuggerCoreBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt index fda22f8b2e1..04e66bc198e 100644 --- a/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.idea.debugger.coroutine -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinDebuggerCoroutinesBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinDebuggerCoroutinesBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinDebuggerCoroutinesBundle" +object KotlinDebuggerCoroutinesBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt index c70c75d5dc7..723cc5f4aab 100644 --- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt +++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt @@ -5,20 +5,17 @@ package org.jetbrains.kotlin.idea.debugger.evaluate -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinDebuggerEvaluationBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinDebuggerEvaluationBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinDebuggerEvaluationBundle" +object KotlinDebuggerEvaluationBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message( + @NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, + vararg params: Any + ): String = getMessage(key, *params) } \ No newline at end of file diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt index 575907922c0..1731332ca14 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.nj2k -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinNJ2KServicesBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinNJ2KServicesBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinNJ2KServicesBundle" +object KotlinNJ2KServicesBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt index 1e9d4f014a3..36909b8e2de 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt @@ -5,20 +5,14 @@ package org.jetbrains.kotlin.nj2k -import com.intellij.CommonBundle import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase -import java.util.* +import org.jetbrains.kotlin.util.AbstractKotlinBundle -object KotlinNJ2KBundle : KotlinBundleBase() { - @NonNls - private const val BUNDLE = "messages.KotlinNJ2KBundle" - - override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE) +@NonNls +private const val BUNDLE = "messages.KotlinNJ2KBundle" +object KotlinNJ2KBundle : AbstractKotlinBundle(BUNDLE) { @JvmStatic - fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { - return CommonBundle.message(bundle, key, *params) - } + fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) } \ No newline at end of file