i18n: rewrite bundles with AbstractKotlinBundle

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinObsoleteCodeStyle.kt

@@ -9,7 +9,6 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
-import org.jetbrains.kotlin.idea.util.KotlinFormatterBundle
 
 class KotlinObsoleteCodeStyle : KotlinPredefinedCodeStyle(CODE_STYLE_TITLE, KotlinLanguage.INSTANCE) {
     override val codeStyleId: String = CODE_STYLE_ID

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinStyleGuideCodeStyle.kt

@@ -9,7 +9,6 @@ import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
-import org.jetbrains.kotlin.idea.util.KotlinFormatterBundle
 
 class KotlinStyleGuideCodeStyle : KotlinPredefinedCodeStyle("Kotlin style guide", KotlinLanguage.INSTANCE) {
     override val codeStyleId: String = CODE_STYLE_ID

idea/formatter/src/org/jetbrains/kotlin/idea/util/KotlinFormatterBundle.kt

@@ -1,18 +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.util
-
-import com.intellij.AbstractBundle
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-
-@NonNls
-private const val BUNDLE = "messages.KotlinFormatterBundle"
-
-object KotlinFormatterBundle : AbstractBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}

idea/ide-common/src/org/jetbrains/kotlin/util/KotlinIdeCommonBundle.kt

@@ -1,18 +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.util
-
-import com.intellij.AbstractBundle
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-
-@NonNls
-private const val BUNDLE = "messages.KotlinIdeCommonBundle"
-
-object KotlinIdeCommonBundle : AbstractBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}

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

@@ -5,14 +5,14 @@
 
 package org.jetbrains.kotlin.idea.core.util
 
-import com.intellij.AbstractBundle
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
+import org.jetbrains.kotlin.util.AbstractKotlinBundle
 
 @NonNls
 private const val BUNDLE = "messages.KotlinIdeaCoreBundle"
 
-object KotlinIdeaCoreBundle : AbstractBundle(BUNDLE) {
+object KotlinIdeaCoreBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
     fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }

idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinIdeaGradleBundle.kt

@@ -5,14 +5,14 @@
 
 package org.jetbrains.kotlin.idea
 
-import com.intellij.AbstractBundle
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.annotations.PropertyKey
+import org.jetbrains.kotlin.util.AbstractKotlinBundle
 
 @NonNls
 private const val BUNDLE = "messages.KotlinIdeaGradleBundle"
 
-object KotlinIdeaGradleBundle : AbstractBundle(BUNDLE) {
+object KotlinIdeaGradleBundle : AbstractKotlinBundle(BUNDLE) {
     @JvmStatic
     fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 }