From 8436a8e1194c065537661908240c0a2b29bf1209 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 22 Jan 2015 17:16:06 +0300
Subject: [PATCH] Simplify code in module script/xml generation

Pass classpath and annotation roots explicitly instead of wrapped in a callback

Original commit: 3ea59117aca9346a54f4bdb5bafd0ee9e56cb302
---
 .../build/KotlinBuilderModuleScriptGenerator.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
index 46b8b5828f5..de324ea1d05 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
@@ -47,8 +47,6 @@ import java.io.IOException;
 import java.util.*;
 
 import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies;
-import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor;
-import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider;
 
 public class KotlinBuilderModuleScriptGenerator {
 
@@ -89,9 +87,10 @@ public class KotlinBuilderModuleScriptGenerator {
             builder.addModule(
                     target.getId(),
                     outputDir.getAbsolutePath(),
-                    getKotlinModuleDependencies(target),
                     moduleSources,
                     findSourceRoots(context, target),
+                    findClassPathRoots(target),
+                    findAnnotationRoots(target),
                     target.isTests(),
                     // this excludes the output directories from the class path, to be removed for true incremental compilation
                     outputDirs
@@ -116,16 +115,6 @@ public class KotlinBuilderModuleScriptGenerator {
         return outputDir;
     }
 
-    private static DependencyProvider getKotlinModuleDependencies(final ModuleBuildTarget target) {
-        return new DependencyProvider() {
-            @Override
-            public void processClassPath(@NotNull DependencyProcessor processor) {
-                processor.processClassPathSection("Classpath", findClassPathRoots(target));
-                processor.processAnnotationRoots(findAnnotationRoots(target));
-            }
-        };
-    }
-
     @NotNull
     private static Collection<File> findClassPathRoots(@NotNull ModuleBuildTarget target) {
         return getAllDependencies(target).classes().getRoots();