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

Minor, make SerializedResourcePaths an interface

Browse Source
This commit is contained in:
Alexander Udalov
2015-12-23 19:05:12 +03:00
parent 75f046fa81
commit 07a23cab10
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt
+5 -5
View File
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.SerializedResourcePaths import org.jetbrains.kotlin.serialization.SerializedResourcePaths
import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
public object BuiltInsSerializedResourcePaths : SerializedResourcePaths() { object BuiltInsSerializedResourcePaths : SerializedResourcePaths {
public override val extensionRegistry: ExtensionRegistryLite override val extensionRegistry: ExtensionRegistryLite
init { init {
extensionRegistry = ExtensionRegistryLite.newInstance() extensionRegistry = ExtensionRegistryLite.newInstance()
@@ -34,15 +34,15 @@ public object BuiltInsSerializedResourcePaths : SerializedResourcePaths() {
val PACKAGE_FILE_EXTENSION = "kotlin_package" val PACKAGE_FILE_EXTENSION = "kotlin_package"
val STRING_TABLE_FILE_EXTENSION = "kotlin_string_table" 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() + return packageFqNameToPath(classId.getPackageFqName()) + "/" + classId.getRelativeClassName().asString() +
"." + CLASS_METADATA_FILE_EXTENSION "." + CLASS_METADATA_FILE_EXTENSION
} }
public override fun getPackageFilePath(fqName: FqName): String = override fun getPackageFilePath(fqName: FqName): String =
packageFqNameToPath(fqName) + "/" + shortName(fqName) + "." + PACKAGE_FILE_EXTENSION 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 packageFqNameToPath(fqName) + "/" + shortName(fqName) + "." + STRING_TABLE_FILE_EXTENSION
core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt
+5 -5
View File
@@ -20,12 +20,12 @@ import com.google.protobuf.ExtensionRegistryLite
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
abstract class SerializedResourcePaths { interface SerializedResourcePaths {
abstract val extensionRegistry: ExtensionRegistryLite 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
} }
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt
+3 -3
View File
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.serialization.SerializedResourcePaths import org.jetbrains.kotlin.serialization.SerializedResourcePaths
public object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths() { object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths {
public override val extensionRegistry: ExtensionRegistryLite = ExtensionRegistryLite.newInstance() override val extensionRegistry: ExtensionRegistryLite = ExtensionRegistryLite.newInstance()
init { init {
JsProtoBuf.registerAllExtensions(extensionRegistry) JsProtoBuf.registerAllExtensions(extensionRegistry)
@@ -32,7 +32,7 @@ public object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths(
private val CLASSES_FILE_EXTENSION = "kotlin_classes" private val CLASSES_FILE_EXTENSION = "kotlin_classes"
private val STRING_TABLE_FILE_EXTENSION = "kotlin_string_table" 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 fqName.toPath().withSepIfNotEmpty() + shortName(fqName) + "." + CLASSES_FILE_EXTENSION