Removed storing module ids in incremental caches.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt

@@ -23,19 +23,19 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import java.util.HashMap
 import java.io.File
 
-public fun IncrementalCache.getPackagesWithRemovedFiles(moduleId: String, compiledSourceFiles: Collection<JetFile>): Collection<FqName> {
-    return getRemovedPackageParts(moduleId, compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() }
+public fun IncrementalCache.getPackagesWithRemovedFiles(compiledSourceFiles: Collection<JetFile>): Collection<FqName> {
+    return getRemovedPackageParts(compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() }
 }
 
-public fun IncrementalCache.getRemovedPackageParts(moduleId: String, compiledSourceFiles: Collection<JetFile>): Collection<JvmClassName> {
+public fun IncrementalCache.getRemovedPackageParts(compiledSourceFiles: Collection<JetFile>): Collection<JvmClassName> {
     val compiledSourceFilesToFqName = HashMap<File, String>()
     for (sourceFile in compiledSourceFiles) {
         compiledSourceFilesToFqName[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName().asString()
     }
 
-    return getRemovedPackageParts(moduleId, compiledSourceFilesToFqName).map { JvmClassName.byInternalName(it) }
+    return getRemovedPackageParts(compiledSourceFilesToFqName).map { JvmClassName.byInternalName(it) }
 }
 
-public fun IncrementalCache.getPackageData(moduleId: String, fqName: FqName): ByteArray? {
-    return getPackageData(moduleId, fqName.asString())
+public fun IncrementalCache.getPackageData(fqName: FqName): ByteArray? {
+    return getPackageData(fqName.asString())
 }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -52,7 +52,7 @@ public class IncrementalPackageFragmentProvider(
 
     val packagePartsToNotLoadFromCache = (
             sourceFiles.map { PackagePartClassUtils.getPackagePartInternalName(it) }
-                    + incrementalCache.getRemovedPackageParts(moduleId, sourceFiles).map { it.getInternalName() }
+                    + incrementalCache.getRemovedPackageParts(sourceFiles).map { it.getInternalName() }
             ).toSet()
     val fqNameToSubFqNames = MultiMap<FqName, FqName>()
     val fqNameToPackageFragment = HashMap<FqName, PackageFragmentDescriptor>()
@@ -76,7 +76,7 @@ public class IncrementalPackageFragmentProvider(
             createPackageFragment(source.getPackageFqName())
         }
 
-        for (fqName in incrementalCache.getPackagesWithRemovedFiles(moduleId, sourceFiles)) {
+        for (fqName in incrementalCache.getPackagesWithRemovedFiles(sourceFiles)) {
             createPackageFragment(fqName)
         }
     }
@@ -95,7 +95,7 @@ public class IncrementalPackageFragmentProvider(
             get() = this@IncrementalPackageFragmentProvider.moduleId
 
         val _memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
-            val packageDataBytes = incrementalCache.getPackageData(moduleId, fqName)
+            val packageDataBytes = incrementalCache.getPackageData(fqName)
             if (packageDataBytes == null) {
                 JetScope.EMPTY
             }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt

@@ -23,9 +23,9 @@ import java.util.HashMap
 import java.io.File
 
 public trait IncrementalCache {
-    public fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map<File, String>): Collection<String>
+    public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map<File, String>): Collection<String>
 
-    public fun getPackageData(moduleId: String, fqName: String): ByteArray?
+    public fun getPackageData(fqName: String): ByteArray?
 
     public fun close()
 }