From 3a43cf0a093fde9077aef099a3afd922d0afda1a Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Wed, 20 Jan 2010 12:07:32 +0300
Subject: [PATCH] reverts

---
 .../javaCompiler/AnnotationProcessingCompiler.java |  2 +-
 .../impl/javaCompiler/BackendCompilerWrapper.java  | 37 ++++++++--------------
 .../compiler/impl/javaCompiler/JavaCompiler.java   |  2 +-
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java
index 21861c3b6e..f93c1e191a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java
@@ -79,7 +79,7 @@ public class AnnotationProcessingCompiler implements TranslatingCompiler{
     };
     final JavacCompiler javacCompiler = getBackEndCompiler();
     final boolean processorMode = javacCompiler.setAnnotationProcessorMode(true);
-    final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(myProject, Arrays.asList(files), _context, javacCompiler, sink);
+    final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(moduleChunk, myProject, Arrays.asList(files), _context, javacCompiler, sink);
     try {
       wrapper.compile();
     }
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
index 378a267317..b92fc0ea2d 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
@@ -79,6 +79,7 @@ public class BackendCompilerWrapper {
   private final CompileContextEx myCompileContext;
   private final List<VirtualFile> myFilesToCompile;
   private final TranslatingCompiler.OutputSink mySink;
+  private final Chunk<Module> myChunk;
   private final Project myProject;
   private final Set<VirtualFile> myFilesToRecompile;
   private final Map<Module, VirtualFile> myModuleToTempDirMap = new THashMap<Module, VirtualFile>();
@@ -89,10 +90,11 @@ public class BackendCompilerWrapper {
   public final Map<String, Set<CompiledClass>> myFileNameToSourceMap=  new THashMap<String, Set<CompiledClass>>();
 
 
-  public BackendCompilerWrapper(@NotNull final Project project,
+  public BackendCompilerWrapper(Chunk<Module> chunk, @NotNull final Project project,
                                 @NotNull List<VirtualFile> filesToCompile,
                                 @NotNull CompileContextEx compileContext,
                                 @NotNull BackendCompiler compiler, TranslatingCompiler.OutputSink sink) {
+    myChunk = chunk;
     myProject = project;
     myCompiler = compiler;
     myCompileContext = compileContext;
@@ -178,12 +180,15 @@ public class BackendCompilerWrapper {
       myFilesToRecompile.addAll(allDependent);
     }
     final List<TranslatingCompiler.OutputItem> outputs = processPackageInfoFiles();
-    if (!myFilesToRecompile.isEmpty() || !outputs.isEmpty()) {
+    if (myFilesToRecompile.size() > 0 || outputs.size() > 0) {
       mySink.add(null, outputs, VfsUtil.toVirtualFileArray(myFilesToRecompile));
     }
   }
 
   private Map<Module, List<VirtualFile>> buildModuleToFilesMap(final List<VirtualFile> filesToCompile) {
+    if (myChunk.getNodes().size() == 1) {
+      return Collections.singletonMap(myChunk.getNodes().iterator().next(), Collections.unmodifiableList(filesToCompile));
+    }
     return CompilerUtil.buildModuleToFilesMap(myCompileContext, filesToCompile);
   }
 
@@ -219,10 +224,12 @@ public class BackendCompilerWrapper {
     final List<VirtualFile> filesInScope = new ArrayList<VirtualFile>(files.size());
     ApplicationManager.getApplication().runReadAction(new Runnable() {
       public void run() {
-        final CompileScope compileScope = myCompileContext.getCompileScope();
         for (VirtualFile file : files) {
-          if (compileScope.belongs(file.getUrl())) {
-            filesInScope.add(file);
+          if (myCompileContext.getCompileScope().belongs(file.getUrl())) {
+            final Module module = myCompileContext.getModuleByFile(file);
+            if (myChunk.getNodes().contains(module)) {
+              filesInScope.add(file);
+            }
           }
         }
       }
@@ -232,32 +239,14 @@ public class BackendCompilerWrapper {
 
   private void compileModules(final Map<Module, List<VirtualFile>> moduleToFilesMap) throws CompilerException {
     myProcessedFilesCount = 0;
-
-    final List<ModuleChunk> chunks = getModuleChunks(moduleToFilesMap);
     try {
-      for (final ModuleChunk chunk : chunks) {
-        compileChunk(chunk);
-      }
+      compileChunk(new ModuleChunk(myCompileContext, myChunk, moduleToFilesMap));
     }
     catch (IOException e) {
       throw new CompilerException(e.getMessage(), e);
     }
   }
 
-  private List<ModuleChunk> getModuleChunks(final Map<Module, List<VirtualFile>> moduleToFilesMap) {
-    final List<Module> modules = new ArrayList<Module>(moduleToFilesMap.keySet());
-    final List<Chunk<Module>> chunks = ApplicationManager.getApplication().runReadAction(new Computable<List<Chunk<Module>>>() {
-      public List<Chunk<Module>> compute() {
-        return ModuleCompilerUtil.getSortedModuleChunks(myProject, modules);
-      }
-    });
-    final List<ModuleChunk> moduleChunks = new ArrayList<ModuleChunk>(chunks.size());
-    for (final Chunk<Module> chunk : chunks) {
-      moduleChunks.add(new ModuleChunk(myCompileContext, chunk, moduleToFilesMap));
-    }
-    return moduleChunks;
-  }
-
   private void compileChunk(ModuleChunk chunk) throws IOException {
     runTransformingCompilers(chunk);
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java
index 068ade2ad6..20601f3abc 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java
@@ -58,7 +58,7 @@ public class JavaCompiler implements TranslatingCompiler {
 
   public void compile(CompileContext context, Chunk<Module> moduleChunk, VirtualFile[] files, OutputSink sink) {
     final BackendCompiler backEndCompiler = getBackEndCompiler();
-    final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(myProject, Arrays.asList(files), (CompileContextEx)context, backEndCompiler, sink);
+    final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(moduleChunk, myProject, Arrays.asList(files), (CompileContextEx)context, backEndCompiler, sink);
     try {
       wrapper.compile();
     }
-- 
2.11.4.GIT