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

i18n: replace KotlinBundleBase with AbstractKotlinBundle

Browse Source
This commit is contained in:
Dmitry Gridin
2020-03-04 17:33:40 +07:00
parent 0a3e577b6c
commit 7507d62ec3
13 changed files with 58 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinBundleBase.kt
-28
View File
@@ -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<ResourceBundle>? = 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
}
}
idea/idea-git/src/org/jetbrains/kotlin/idea/git/KotlinGitBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.idea.git package org.jetbrains.kotlin.idea.git
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinGitBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinGitBundle"
private const val BUNDLE = "messages.KotlinGitBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinGitBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/KotlinGradleNativeBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.ide.konan package org.jetbrains.kotlin.ide.konan
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinGradleNativeBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinGradleNativeBundle"
private const val BUNDLE = "messages.KotlinGradleNativeBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinGradleNativeBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/idea-jvm/src/org/jetbrains/kotlin/idea/KotlinJvmBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.idea package org.jetbrains.kotlin.idea
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinJvmBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinJvmBundle"
private const val BUNDLE = "messages.KotlinJvmBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinJvmBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.idea.maven package org.jetbrains.kotlin.idea.maven
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinMavenBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinMavenBundle"
private const val BUNDLE = "messages.KotlinMavenBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinMavenBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.ide.konan package org.jetbrains.kotlin.ide.konan
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinNativeBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinNativeBundle"
private const val BUNDLE = "messages.KotlinNativeBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinNativeBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/idea-new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.properties → idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties
View File
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard package org.jetbrains.kotlin.tools.projectWizard.wizard
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinNewProjectWizardBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinNewProjectWizardBundle"
private const val BUNDLE = "org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinNewProjectWizardBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerCoreBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.idea.debugger package org.jetbrains.kotlin.idea.debugger
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinDebuggerCoreBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinDebuggerCoreBundle"
private const val BUNDLE = "messages.KotlinDebuggerCoreBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinDebuggerCoreBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/KotlinDebuggerCoroutinesBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.idea.debugger.coroutine package org.jetbrains.kotlin.idea.debugger.coroutine
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinDebuggerCoroutinesBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinDebuggerCoroutinesBundle"
private const val BUNDLE = "messages.KotlinDebuggerCoroutinesBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinDebuggerCoroutinesBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerEvaluationBundle.kt
+8 -11
View File
@@ -5,20 +5,17 @@
package org.jetbrains.kotlin.idea.debugger.evaluate package org.jetbrains.kotlin.idea.debugger.evaluate
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinDebuggerEvaluationBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinDebuggerEvaluationBundle"
private const val BUNDLE = "messages.KotlinDebuggerEvaluationBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinDebuggerEvaluationBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(
return CommonBundle.message(bundle, key, *params) @NonNls @PropertyKey(resourceBundle = BUNDLE) key: String,
} vararg params: Any
): String = getMessage(key, *params)
} }
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KServicesBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.nj2k package org.jetbrains.kotlin.nj2k
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinNJ2KServicesBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinNJ2KServicesBundle"
private const val BUNDLE = "messages.KotlinNJ2KServicesBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinNJ2KServicesBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }
nj2k/src/org/jetbrains/kotlin/nj2k/KotlinNJ2KBundle.kt
+5 -11
View File
@@ -5,20 +5,14 @@
package org.jetbrains.kotlin.nj2k package org.jetbrains.kotlin.nj2k
import com.intellij.CommonBundle
import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.PropertyKey import org.jetbrains.annotations.PropertyKey
import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase import org.jetbrains.kotlin.util.AbstractKotlinBundle
import java.util.*
object KotlinNJ2KBundle : KotlinBundleBase() { @NonNls
@NonNls private const val BUNDLE = "messages.KotlinNJ2KBundle"
private const val BUNDLE = "messages.KotlinNJ2KBundle"
override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
object KotlinNJ2KBundle : AbstractKotlinBundle(BUNDLE) {
@JvmStatic @JvmStatic
fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String { fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
return CommonBundle.message(bundle, key, *params)
}
} }