Moved incremental cache API to separate package.

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -53,9 +53,9 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache;
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider;
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackage;
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache;
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.plugin.MainFunctionDetector;
 import org.jetbrains.jet.utils.KotlinPaths;

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java

@@ -42,9 +42,9 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext;
 import org.jetbrains.jet.lang.resolve.ImportPath;
 import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
 import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap;
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache;
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider;
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider;
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache;
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
 import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory;
 import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService;

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

@@ -16,20 +16,13 @@
 
 package org.jetbrains.jet.lang.resolve.kotlin.incremental
 
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
+import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.java.JvmClassName
-import org.jetbrains.jet.lang.psi.JetFile
 import java.util.HashMap
 import java.io.File
 
-public trait IncrementalCache {
-    public fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map<File, String>): Collection<String>
-
-    public fun getPackageData(moduleId: String, fqName: String): ByteArray?
-
-    public fun close()
-}
-
 public fun IncrementalCache.getPackagesWithRemovedFiles(moduleId: String, compiledSourceFiles: Collection<JetFile>): Collection<FqName> {
     return getRemovedPackageParts(moduleId, compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() }
 }

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

@@ -37,6 +37,7 @@ import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
 import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import org.jetbrains.jet.descriptors.serialization.PackageData
 import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
 
 public class IncrementalPackageFragmentProvider(
         sourceFiles: Collection<JetFile>,

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.kotlin.incremental.cache
+
+import org.jetbrains.jet.lang.resolve.name.FqName
+import org.jetbrains.jet.lang.resolve.java.JvmClassName
+import org.jetbrains.jet.lang.psi.JetFile
+import java.util.HashMap
+import java.io.File
+
+public trait IncrementalCache {
+    public fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map<File, String>): Collection<String>
+
+    public fun getPackageData(moduleId: String, fqName: String): ByteArray?
+
+    public fun close()
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.kotlin.incremental
+package org.jetbrains.jet.lang.resolve.kotlin.incremental.cache
 
 public trait IncrementalCacheProvider {
     public fun getIncrementalCache(moduleId: String): IncrementalCache

compiler/preloader/src/org/jetbrains/jet/preloading/ClassPreloadingUtils.java

@@ -79,7 +79,7 @@ public class ClassPreloadingUtils {
             public Class<?> loadClass(String name) throws ClassNotFoundException {
                 // When compiler is invoked from JPS, we should use loaded incremental cache interface from its class loader,
                 // because implementation is loaded from it, as well
-                if (name.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache")) {
+                if (name.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.")) {
                     if (parent == null) {
                         return super.loadClass(name);
                     }

jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt

@@ -34,7 +34,7 @@ import com.intellij.util.io.EnumeratorStringDescriptor
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames
 import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import java.util.HashSet
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
 import java.util.HashMap
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
 import com.intellij.util.containers.MultiMap

jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt

@@ -16,9 +16,9 @@
 
 package org.jetbrains.jet.jps.incremental
 
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider
 import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
 import kotlin.properties.Delegates
 
 public class IncrementalCacheProviderImpl(caches: Map<ModuleBuildTarget, IncrementalCacheImpl>): IncrementalCacheProvider {