Writing incrementalCache attribute to <modules> element of xml module script

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleDescriptionBuilder.java

@@ -16,6 +16,9 @@
 
 package org.jetbrains.jet.compiler.runner;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
@@ -25,7 +28,6 @@ public interface KotlinModuleDescriptionBuilder {
     KotlinModuleDescriptionBuilder addModule(
             String moduleName,
             String outputDir,
-            String incrementalCacheDir,
             DependencyProvider dependencyProvider,
             List<File> sourceFiles,
             boolean tests,

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleDescriptionBuilderFactory.java

@@ -17,6 +17,6 @@
 package org.jetbrains.jet.compiler.runner;
 
 public interface KotlinModuleDescriptionBuilderFactory {
-    KotlinModuleDescriptionBuilder create();
+    KotlinModuleDescriptionBuilder create(String incrementalCacheDir);
     String getFileExtension();
 }

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleScriptBuilderFactory.java

@@ -32,7 +32,7 @@ public class KotlinModuleScriptBuilderFactory implements KotlinModuleDescription
     private KotlinModuleScriptBuilderFactory() {}
 
     @Override
-    public KotlinModuleDescriptionBuilder create() {
+    public KotlinModuleDescriptionBuilder create(String incrementalCacheDir) {
         return new Builder();
     }
 
@@ -54,7 +54,6 @@ public class KotlinModuleScriptBuilderFactory implements KotlinModuleDescription
         public KotlinModuleDescriptionBuilder addModule(
                 String moduleName,
                 String outputDir,
-                String incrementalCacheDir,
                 DependencyProvider dependencyProvider,
                 List<File> sourceFiles,
                 boolean tests,

ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinModuleXmlBuilderFactory.java

@@ -36,8 +36,8 @@ public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBui
     private KotlinModuleXmlBuilderFactory() {}
 
     @Override
-    public KotlinModuleDescriptionBuilder create() {
-        return new Builder();
+    public KotlinModuleDescriptionBuilder create(String incrementalCacheDir) {
+        return new Builder(incrementalCacheDir);
     }
 
     @Override
@@ -50,15 +50,19 @@ public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBui
         private final Printer p = new Printer(xml);
         private boolean done = false;
 
-        {
-            openTag(p, MODULES);
+        public Builder(String incrementalCacheDir) {
+            if (incrementalCacheDir == null) {
+                openTag(p, MODULES);
+            }
+            else {
+                openTag(p, MODULES + " " + INCREMENTAL_CACHE + "=\"" + getEscapedPath(new File(incrementalCacheDir)) + "\"");
+            }
         }
 
         @Override
         public KotlinModuleDescriptionBuilder addModule(
                 String moduleName,
                 String outputDir,
-                String incrementalCacheDir,
                 DependencyProvider dependencyProvider,
                 List<File> sourceFiles,
                 boolean tests,
@@ -75,9 +79,8 @@ public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBui
 
             p.println("<", MODULE, " ",
                       NAME, "=\"", escapeXml(moduleName), "\" ",
-                      OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\"",
-                      incrementalCacheDir != null ? " " + INCREMENTAL_CACHE + "=\"" + getEscapedPath(new File(incrementalCacheDir)) + "\" " : "",
-                      ">");
+                      OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\">"
+            );
             p.pushIndent();
 
             for (File sourceFile : sourceFiles) {