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

Minor, rename val EXTENSION_REGISTRY -> extensionRegistry

Browse Source
This commit is contained in:
Alexander Udalov
2015-07-02 18:32:28 +03:00
parent 110d6fa7f1
commit c8439ae6fc
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt
+2 -3
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
public abstract class SerializedResourcePaths {
public abstract val EXTENSION_REGISTRY: ExtensionRegistryLite
public abstract val extensionRegistry: ExtensionRegistryLite
public abstract fun getClassMetadataPath(classId: ClassId): String
@@ -39,5 +39,4 @@ public abstract class SerializedResourcePaths {
}
public val fallbackPaths: FallbackPaths = FallbackPaths
}
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt
+1 -1
View File
@@ -51,7 +51,7 @@ public abstract class DeserializedPackageFragment(
internal val deserializedMemberScope by storageManager.createLazyValue {
val packageStream = loadResourceSure(serializedResourcePaths.getPackageFilePath(fqName))
val packageProto = ProtoBuf.Package.parseFrom(packageStream, serializedResourcePaths.EXTENSION_REGISTRY)
val packageProto = ProtoBuf.Package.parseFrom(packageStream, serializedResourcePaths.extensionRegistry)
DeserializedPackageMemberScope(this, packageProto, nameResolver, components, classNames = { loadClassNames(packageProto) })
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ResourceLoadingClassDataFinder.kt
+1 -1
View File
@@ -36,7 +36,7 @@ public open class ResourceLoadingClassDataFinder(
return ClassData(
packageFragment.nameResolver,
ProtoBuf.Class.parseFrom(stream, serializedResourcePaths.EXTENSION_REGISTRY)
ProtoBuf.Class.parseFrom(stream, serializedResourcePaths.extensionRegistry)
)
}
}