i18n: Extract common caching code from bundles, J2K existing bundles

idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.kt

@@ -13,39 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.jetbrains.kotlin.idea
 
-package org.jetbrains.kotlin.idea;
+import com.intellij.CommonBundle
-
+import org.jetbrains.annotations.NonNls
-import com.intellij.CommonBundle;
+import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.annotations.NonNls;
+import org.jetbrains.kotlin.idea.core.util.KotlinBundleBase
-import org.jetbrains.annotations.NotNull;
+import java.util.*
-import org.jetbrains.annotations.PropertyKey;
-
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.util.ResourceBundle;
-
-public class KotlinBundle {
-    private static Reference<ResourceBundle> ourBundle;
 
+object KotlinBundle : KotlinBundleBase() {
     @NonNls
-    private static final String BUNDLE = "org.jetbrains.kotlin.idea.KotlinBundle";
+    private const val BUNDLE = "org.jetbrains.kotlin.idea.KotlinBundle"
 
-    private KotlinBundle() {
+    override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
-    }
 
-    @NotNull
+    @JvmStatic
-    public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String {
-        return CommonBundle.message(getBundle(), key, params);
+        return CommonBundle.message(bundle, key, *params)
-    }
-
-    private static ResourceBundle getBundle() {
-        ResourceBundle bundle = null;
-        if (ourBundle != null) bundle = ourBundle.get();
-        if (bundle == null) {
-            bundle = ResourceBundle.getBundle(BUNDLE);
-            ourBundle = new SoftReference<ResourceBundle>(bundle);
-        }
-        return bundle;
     }
 }

idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/KotlinBundleBase.kt

@@ -0,0 +1,28 @@
+/*
+ * 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/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.java

@@ -1,51 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.refactoring;
-
-import com.intellij.CommonBundle;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.PropertyKey;
-
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.util.ResourceBundle;
-
-public class KotlinRefactoringBundle {
-    private static Reference<ResourceBundle> ourBundle;
-
-    @NonNls
-    private static final String BUNDLE = "org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle";
-
-    private KotlinRefactoringBundle() {
-    }
-
-    @NotNull
-    public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) {
-        return CommonBundle.message(getBundle(), key, params);
-    }
-
-    private static ResourceBundle getBundle() {
-        ResourceBundle bundle = null;
-        if (ourBundle != null) bundle = ourBundle.get();
-        if (bundle == null) {
-            bundle = ResourceBundle.getBundle(BUNDLE);
-            ourBundle = new SoftReference<ResourceBundle>(bundle);
-        }
-        return bundle;
-    }
-}

idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.kotlin.idea.refactoring
+
+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.*
+
+object KotlinRefactoringBundle : KotlinBundleBase() {
+    @NonNls
+    private const val BUNDLE = "org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle"
+
+    override fun createBundle(): ResourceBundle = ResourceBundle.getBundle(BUNDLE)
+
+    @JvmStatic
+    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any?): String {
+        return CommonBundle.message(bundle, key, *params)
+    }
+}