From a482bd434101e7af1e696f486c7db90875481e9a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:00:53 +0400 Subject: [PATCH] Minor. Renamed parameter and corresponding variable. Original commit: 2ac351928e5ab08a64974874d1a232563962ee07 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 6 +++--- .../jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 24dcee1aa65..09d31f3128d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -223,7 +223,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { - List> moduleIdsAndFiles = new ArrayList>(); + List> moduleIdsAndSourceFiles = new ArrayList>(); Map outDirectories = new HashMap(); for (ModuleBuildTarget target : chunk.getTargets()) { @@ -231,10 +231,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { outDirectories.put(targetId, target.getOutputDir()); for (String file : dirtyFilesHolder.getRemovedFiles(target)) { - moduleIdsAndFiles.add(new Pair(targetId, new File(file))); + moduleIdsAndSourceFiles.add(new Pair(targetId, new File(file))); } } - cache.clearCacheForRemovedFiles(moduleIdsAndFiles, outDirectories); + cache.clearCacheForRemovedFiles(moduleIdsAndSourceFiles, outDirectories); IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index c63fa5d1bf3..97941652d92 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -92,8 +92,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return DO_NOTHING } - public fun clearCacheForRemovedFiles(moduleIdsAndFiles: Collection>, outDirectories: Map) { - for ((moduleId, sourceFile) in moduleIdsAndFiles) { + public fun clearCacheForRemovedFiles(moduleIdsAndSourceFiles: Collection>, outDirectories: Map) { + for ((moduleId, sourceFile) in moduleIdsAndSourceFiles) { constantsMap.remove(moduleId, sourceFile) inlineFunctionsMap.remove(moduleId, sourceFile) packagePartMap.remove(moduleId, sourceFile)