From 512ea72e695f13054b4062e5512a849658bfcaa9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Feb 2015 17:15:57 +0300 Subject: [PATCH] Minor. Green code and formatting. --- .../jps/incremental/IncrementalCacheImpl.kt | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7791427fc3a..8056f2536a2 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -78,7 +78,7 @@ class CacheFormatVersion(targetDataRoot: File) { } } -public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, IncrementalCache { +public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" @@ -87,10 +87,10 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) - private val protoMap = ProtoMap() - private val constantsMap = ConstantsMap() - private val inlineFunctionsMap = InlineFunctionsMap() - private val packagePartMap = PackagePartMap() + private val protoMap = ProtoMap() + private val constantsMap = ConstantsMap() + private val inlineFunctionsMap = InlineFunctionsMap() + private val packagePartMap = PackagePartMap() private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) @@ -98,7 +98,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING - + cacheFormatVersion.saveIfNeeded() val kotlinClass = LocalFileKotlinClass.create(classFile) @@ -217,7 +217,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private abstract class ClassFileBasedMap: BasicMap() { + private abstract class ClassFileBasedMap : BasicMap() { // TODO may be too expensive, because it traverses all files in out directory public fun clearOutdated(outDirectory: File) { @@ -239,7 +239,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private inner class ProtoMap: ClassFileBasedMap() { + private inner class ProtoMap : ClassFileBasedMap() { override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PROTO_MAP), EnumeratorStringDescriptor(), @@ -261,7 +261,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private inner class ConstantsMap: ClassFileBasedMap>() { + private inner class ConstantsMap : ClassFileBasedMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), @@ -305,7 +305,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private object ConstantsMapExternalizer: DataExternalizer> { + private object ConstantsMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) for (name in map.keySet().toSortedList()) { @@ -363,7 +363,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private inner class InlineFunctionsMap: ClassFileBasedMap>() { + private inner class InlineFunctionsMap : ClassFileBasedMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, INLINE_FUNCTIONS), EnumeratorStringDescriptor(), @@ -423,7 +423,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private object InlineFunctionsMapExternalizer: DataExternalizer> { + private object InlineFunctionsMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) for (name in map.keySet()) { @@ -449,7 +449,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } - private inner class PackagePartMap: BasicMap() { + private inner class PackagePartMap : BasicMap() { // Format of serialization to string: --> override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PACKAGE_PARTS), @@ -503,7 +503,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } -private val storageProvider = object: StorageProvider() { +private val storageProvider = object : StorageProvider() { override fun createStorage(targetDataDir: File): IncrementalCacheImpl { return IncrementalCacheImpl(targetDataDir) } @@ -516,17 +516,17 @@ public fun BuildDataManager.getKotlinCache(target: BuildTarget<*>): IncrementalC private fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! return ((d[0].toLong() and 0xFFL) - or ((d[1].toLong() and 0xFFL) shl 8) - or ((d[2].toLong() and 0xFFL) shl 16) - or ((d[3].toLong() and 0xFFL) shl 24) - or ((d[4].toLong() and 0xFFL) shl 32) - or ((d[5].toLong() and 0xFFL) shl 40) - or ((d[6].toLong() and 0xFFL) shl 48) - or ((d[7].toLong() and 0xFFL) shl 56) - ) + or ((d[1].toLong() and 0xFFL) shl 8) + or ((d[2].toLong() and 0xFFL) shl 16) + or ((d[3].toLong() and 0xFFL) shl 24) + or ((d[4].toLong() and 0xFFL) shl 32) + or ((d[5].toLong() and 0xFFL) shl 40) + or ((d[6].toLong() and 0xFFL) shl 48) + or ((d[7].toLong() and 0xFFL) shl 56) + ) } -private object ByteArrayExternalizer: DataExternalizer { +private object ByteArrayExternalizer : DataExternalizer { override fun save(out: DataOutput, value: ByteArray) { out.writeInt(value.size()) out.write(value)