From 07a23cab10442d8048f4dc3e97513eb39cd7d367 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 23 Dec 2015 19:05:12 +0300
Subject: [PATCH] Minor, make SerializedResourcePaths an interface

---
 .../kotlin/builtins/BuiltInsSerializedResourcePaths.kt | 10 +++++-----
 .../kotlin/serialization/SerializedResourcePaths.kt    | 10 +++++-----
 .../js/KotlinJavascriptSerializedResourcePaths.kt      |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt
index e40ad991905..20dc6169bf6 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.serialization.SerializedResourcePaths
 import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
 
-public object BuiltInsSerializedResourcePaths : SerializedResourcePaths() {
-    public override val extensionRegistry: ExtensionRegistryLite
+object BuiltInsSerializedResourcePaths : SerializedResourcePaths {
+    override val extensionRegistry: ExtensionRegistryLite
 
     init {
         extensionRegistry = ExtensionRegistryLite.newInstance()
@@ -34,15 +34,15 @@ public object BuiltInsSerializedResourcePaths : SerializedResourcePaths() {
     val PACKAGE_FILE_EXTENSION = "kotlin_package"
     val STRING_TABLE_FILE_EXTENSION = "kotlin_string_table"
 
-    public override fun getClassMetadataPath(classId: ClassId): String {
+    override fun getClassMetadataPath(classId: ClassId): String {
         return packageFqNameToPath(classId.getPackageFqName()) + "/" + classId.getRelativeClassName().asString() +
                "." + CLASS_METADATA_FILE_EXTENSION
     }
 
-    public override fun getPackageFilePath(fqName: FqName): String =
+    override fun getPackageFilePath(fqName: FqName): String =
             packageFqNameToPath(fqName) + "/" + shortName(fqName) + "." + PACKAGE_FILE_EXTENSION
 
-    public override fun getStringTableFilePath(fqName: FqName): String =
+    override fun getStringTableFilePath(fqName: FqName): String =
             packageFqNameToPath(fqName) + "/" + shortName(fqName) + "." + STRING_TABLE_FILE_EXTENSION
 
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt
index dbfa71c21eb..49b263cc858 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt
@@ -20,12 +20,12 @@ import com.google.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 
-abstract class SerializedResourcePaths {
-    abstract val extensionRegistry: ExtensionRegistryLite
+interface SerializedResourcePaths {
+    val extensionRegistry: ExtensionRegistryLite
 
-    abstract fun getClassMetadataPath(classId: ClassId): String
+    fun getClassMetadataPath(classId: ClassId): String
 
-    abstract fun getPackageFilePath(fqName: FqName): String
+    fun getPackageFilePath(fqName: FqName): String
 
-    abstract fun getStringTableFilePath(fqName: FqName): String
+    fun getStringTableFilePath(fqName: FqName): String
 }
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt
index c9f26583143..5bcfadfd539 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.SerializedResourcePaths
 
-public object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths() {
-    public override val extensionRegistry: ExtensionRegistryLite = ExtensionRegistryLite.newInstance()
+object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths {
+    override val extensionRegistry: ExtensionRegistryLite = ExtensionRegistryLite.newInstance()
 
     init {
         JsProtoBuf.registerAllExtensions(extensionRegistry)
@@ -32,7 +32,7 @@ public object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths(
     private val CLASSES_FILE_EXTENSION = "kotlin_classes"
     private val STRING_TABLE_FILE_EXTENSION = "kotlin_string_table"
 
-    public fun getClassesInPackageFilePath(fqName: FqName): String =
+    fun getClassesInPackageFilePath(fqName: FqName): String =
             fqName.toPath().withSepIfNotEmpty() + shortName(fqName) + "." + CLASSES_FILE_EXTENSION