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

Minor. Green code and formatting.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-02-03 17:15:57 +03:00
parent 84ca0a5b4e
commit 512ea72e69
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+23 -23
View File
@@ -78,7 +78,7 @@ class CacheFormatVersion(targetDataRoot: File) {
} }
} }
public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, IncrementalCache { public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache {
class object { class object {
val PROTO_MAP = "proto.tab" val PROTO_MAP = "proto.tab"
val CONSTANTS_MAP = "constants.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 baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME)
private val protoMap = ProtoMap() private val protoMap = ProtoMap()
private val constantsMap = ConstantsMap() private val constantsMap = ConstantsMap()
private val inlineFunctionsMap = InlineFunctionsMap() private val inlineFunctionsMap = InlineFunctionsMap()
private val packagePartMap = PackagePartMap() private val packagePartMap = PackagePartMap()
private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, 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<File>, classFile: File): RecompilationDecision { public fun saveFileToCache(sourceFiles: Collection<File>, classFile: File): RecompilationDecision {
if (classFile.extension.toLowerCase() != "class") return DO_NOTHING if (classFile.extension.toLowerCase() != "class") return DO_NOTHING
cacheFormatVersion.saveIfNeeded() cacheFormatVersion.saveIfNeeded()
val kotlinClass = LocalFileKotlinClass.create(classFile) val kotlinClass = LocalFileKotlinClass.create(classFile)
@@ -217,7 +217,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private abstract class ClassFileBasedMap<V>: BasicMap<V>() { private abstract class ClassFileBasedMap<V> : BasicMap<V>() {
// TODO may be too expensive, because it traverses all files in out directory // TODO may be too expensive, because it traverses all files in out directory
public fun clearOutdated(outDirectory: File) { public fun clearOutdated(outDirectory: File) {
@@ -239,7 +239,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private inner class ProtoMap: ClassFileBasedMap<ByteArray>() { private inner class ProtoMap : ClassFileBasedMap<ByteArray>() {
override fun createMap(): PersistentHashMap<String, ByteArray> = PersistentHashMap( override fun createMap(): PersistentHashMap<String, ByteArray> = PersistentHashMap(
File(baseDir, PROTO_MAP), File(baseDir, PROTO_MAP),
EnumeratorStringDescriptor(), EnumeratorStringDescriptor(),
@@ -261,7 +261,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private inner class ConstantsMap: ClassFileBasedMap<Map<String, Any>>() { private inner class ConstantsMap : ClassFileBasedMap<Map<String, Any>>() {
override fun createMap(): PersistentHashMap<String, Map<String, Any>> = PersistentHashMap( override fun createMap(): PersistentHashMap<String, Map<String, Any>> = PersistentHashMap(
File(baseDir, CONSTANTS_MAP), File(baseDir, CONSTANTS_MAP),
EnumeratorStringDescriptor(), EnumeratorStringDescriptor(),
@@ -305,7 +305,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private object ConstantsMapExternalizer: DataExternalizer<Map<String, Any>> { private object ConstantsMapExternalizer : DataExternalizer<Map<String, Any>> {
override fun save(out: DataOutput, map: Map<String, Any>?) { override fun save(out: DataOutput, map: Map<String, Any>?) {
out.writeInt(map!!.size()) out.writeInt(map!!.size())
for (name in map.keySet().toSortedList()) { for (name in map.keySet().toSortedList()) {
@@ -363,7 +363,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private inner class InlineFunctionsMap: ClassFileBasedMap<Map<String, Long>>() { private inner class InlineFunctionsMap : ClassFileBasedMap<Map<String, Long>>() {
override fun createMap(): PersistentHashMap<String, Map<String, Long>> = PersistentHashMap( override fun createMap(): PersistentHashMap<String, Map<String, Long>> = PersistentHashMap(
File(baseDir, INLINE_FUNCTIONS), File(baseDir, INLINE_FUNCTIONS),
EnumeratorStringDescriptor(), EnumeratorStringDescriptor(),
@@ -423,7 +423,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private object InlineFunctionsMapExternalizer: DataExternalizer<Map<String, Long>> { private object InlineFunctionsMapExternalizer : DataExternalizer<Map<String, Long>> {
override fun save(out: DataOutput, map: Map<String, Long>?) { override fun save(out: DataOutput, map: Map<String, Long>?) {
out.writeInt(map!!.size()) out.writeInt(map!!.size())
for (name in map.keySet()) { for (name in map.keySet()) {
@@ -449,7 +449,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
private inner class PackagePartMap: BasicMap<String>() { private inner class PackagePartMap : BasicMap<String>() {
// Format of serialization to string: <source file path> --> <package part JVM internal name> // Format of serialization to string: <source file path> --> <package part JVM internal name>
override fun createMap(): PersistentHashMap<String, String> = PersistentHashMap( override fun createMap(): PersistentHashMap<String, String> = PersistentHashMap(
File(baseDir, PACKAGE_PARTS), File(baseDir, PACKAGE_PARTS),
@@ -503,7 +503,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment
} }
} }
private val storageProvider = object: StorageProvider<IncrementalCacheImpl>() { private val storageProvider = object : StorageProvider<IncrementalCacheImpl>() {
override fun createStorage(targetDataDir: File): IncrementalCacheImpl { override fun createStorage(targetDataDir: File): IncrementalCacheImpl {
return IncrementalCacheImpl(targetDataDir) return IncrementalCacheImpl(targetDataDir)
} }
@@ -516,17 +516,17 @@ public fun BuildDataManager.getKotlinCache(target: BuildTarget<*>): IncrementalC
private fun ByteArray.md5(): Long { private fun ByteArray.md5(): Long {
val d = MessageDigest.getInstance("MD5").digest(this)!! val d = MessageDigest.getInstance("MD5").digest(this)!!
return ((d[0].toLong() and 0xFFL) return ((d[0].toLong() and 0xFFL)
or ((d[1].toLong() and 0xFFL) shl 8) or ((d[1].toLong() and 0xFFL) shl 8)
or ((d[2].toLong() and 0xFFL) shl 16) or ((d[2].toLong() and 0xFFL) shl 16)
or ((d[3].toLong() and 0xFFL) shl 24) or ((d[3].toLong() and 0xFFL) shl 24)
or ((d[4].toLong() and 0xFFL) shl 32) or ((d[4].toLong() and 0xFFL) shl 32)
or ((d[5].toLong() and 0xFFL) shl 40) or ((d[5].toLong() and 0xFFL) shl 40)
or ((d[6].toLong() and 0xFFL) shl 48) or ((d[6].toLong() and 0xFFL) shl 48)
or ((d[7].toLong() and 0xFFL) shl 56) or ((d[7].toLong() and 0xFFL) shl 56)
) )
} }
private object ByteArrayExternalizer: DataExternalizer<ByteArray> { private object ByteArrayExternalizer : DataExternalizer<ByteArray> {
override fun save(out: DataOutput, value: ByteArray) { override fun save(out: DataOutput, value: ByteArray) {
out.writeInt(value.size()) out.writeInt(value.size())
out.write(value) out.write(value)