From 4fa346877c739a00d57fd5de12ea5479081df76e Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 21 Aug 2017 03:29:27 +0300
Subject: [PATCH] Rename IncrementalCacheImpl->IncrementalJvmCache

Original commit: 919daefb0ed1a5089abb246f397f63ac6076a7de
---
 .../jetbrains/kotlin/jps/build/KotlinBuilder.kt    |  8 ++++----
 ...entalCacheImpl.kt => JpsIncrementalJvmCache.kt} | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/{JpsIncrementalCacheImpl.kt => JpsIncrementalJvmCache.kt} (83%)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 1f131ee18c6..3c1c5e223df 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -420,7 +420,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
     private fun doCompileModuleChunk(
             allCompiledFiles: MutableSet<File>, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext,
             dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>, environment: JpsCompilerEnvironment,
-            filesToCompile: MultiMap<ModuleBuildTarget, File>, incrementalCaches: Map<ModuleBuildTarget, IncrementalCacheImpl>,
+            filesToCompile: MultiMap<ModuleBuildTarget, File>, incrementalCaches: Map<ModuleBuildTarget, IncrementalJvmCache>,
             project: JpsProject
     ): OutputItemsCollector? {
 
@@ -539,7 +539,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>,
             filesToCompile: MultiMap<ModuleBuildTarget, File>,
             outputItems: Map<ModuleBuildTarget, Iterable<GeneratedFile>>,
-            incrementalCaches: Map<ModuleBuildTarget, JpsIncrementalCacheImpl>
+            incrementalCaches: Map<ModuleBuildTarget, JpsIncrementalJvmCache>
     ) {
         val previousMappings = context.projectDescriptor.dataManager.mappings
         val callback = JavaBuilderUtil.getDependenciesRegistrar(context)
@@ -779,7 +779,7 @@ private fun ChangesCollector.processChangesUsingLookups(
         compiledFiles: Set<File>,
         dataManager: BuildDataManager,
         fsOperations: FSOperationsHelper,
-        caches: Iterable<IncrementalCacheImpl>
+        caches: Iterable<IncrementalJvmCache>
 ) {
     val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider)
     val allCaches = caches.flatMap { it.thisWithDependentCaches }
@@ -803,7 +803,7 @@ private fun getLookupTracker(project: JpsProject): LookupTracker {
     return testLookupTracker
 }
 
-private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map<ModuleBuildTarget, JpsIncrementalCacheImpl> {
+private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map<ModuleBuildTarget, JpsIncrementalJvmCache> {
     val dependentTargets = getDependentTargets(chunk, context)
 
     val dataManager = context.projectDescriptor.dataManager
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalJvmCache.kt
similarity index 83%
rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalJvmCache.kt
index 4bc52d42ff0..9178a270dbf 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalJvmCache.kt
@@ -21,14 +21,14 @@ import org.jetbrains.jps.builders.storage.StorageProvider
 import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.jps.incremental.storage.BuildDataManager
 import org.jetbrains.jps.incremental.storage.StorageOwner
-import org.jetbrains.kotlin.incremental.IncrementalCacheImpl
+import org.jetbrains.kotlin.incremental.IncrementalJvmCache
 import org.jetbrains.kotlin.jps.build.KotlinBuilder
 import java.io.File
 
-class JpsIncrementalCacheImpl(
+class JpsIncrementalJvmCache(
         target: ModuleBuildTarget,
         paths: BuildDataPaths
-) : IncrementalCacheImpl(paths.getTargetDataRoot(target), target.outputDir), StorageOwner {
+) : IncrementalJvmCache(paths.getTargetDataRoot(target), target.outputDir), StorageOwner {
     override fun debugLog(message: String) {
         KotlinBuilder.LOG.debug(message)
     }
@@ -37,16 +37,16 @@ class JpsIncrementalCacheImpl(
 private class KotlinIncrementalStorageProvider(
         private val target: ModuleBuildTarget,
         private val paths: BuildDataPaths
-) : StorageProvider<JpsIncrementalCacheImpl>() {
+) : StorageProvider<JpsIncrementalJvmCache>() {
 
     override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target
 
     override fun hashCode() = target.hashCode()
 
-    override fun createStorage(targetDataDir: File): JpsIncrementalCacheImpl =
-            JpsIncrementalCacheImpl(target, paths)
+    override fun createStorage(targetDataDir: File): JpsIncrementalJvmCache =
+            JpsIncrementalJvmCache(target, paths)
 }
 
-fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): JpsIncrementalCacheImpl =
+fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): JpsIncrementalJvmCache =
         getStorage(target, KotlinIncrementalStorageProvider(target, dataPaths))