Kapt: Analyze sources again if the received analysis result is 'RetryWithAdditionalJavaRoots'. ->

Add additional Java roots to Java source roots and clear diagnostic messages before the next analysis round.
(cherry picked from commit 17ad807)

compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt

@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.analyzer
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.ErrorUtils
+import java.io.File
 
 open class AnalysisResult protected constructor(
         val bindingContext: BindingContext,
@@ -58,6 +59,12 @@ open class AnalysisResult protected constructor(
     }
 
     private class Error(bindingContext: BindingContext, val exception: Throwable) : AnalysisResult(bindingContext, ErrorUtils.getErrorModule())
+    
+    class RetryWithAdditionalJavaRoots(
+            bindingContext: BindingContext, 
+            moduleDescriptor: ModuleDescriptor, 
+            val additionalJavaRoots: List<File>
+    ) : AnalysisResult(bindingContext, moduleDescriptor)
 
     companion object {
         val EMPTY: AnalysisResult = success(BindingContext.EMPTY, ErrorUtils.getErrorModule())

compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java

@@ -122,6 +122,10 @@ public class CompilerConfiguration {
             this.readOnly = readOnly;
         }
     }
+    
+    public boolean isReadOnly() {
+        return readOnly;
+    }
 
     @NotNull
     private static <T> T unmodifiable(@NotNull T object) {