From a3bb7369977328087612a21fb028d5bf1b857d27 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 27 Jan 2012 13:27:14 +0400
Subject: [PATCH] cleanup

---
 .../intellij/compiler/impl/CompileDriver.java |  3 +-
 .../compiler/impl/GenericCompilerRunner.java  |  6 +--
 .../generic/SingleTargetCompilerInstance.java | 48 -------------------
 .../generic/VirtualFileCompileItem.java       |  2 -
 4 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 java/compiler/impl/src/com/intellij/openapi/compiler/generic/SingleTargetCompilerInstance.java

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index d836d5776302..38a4c9a8c716 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -966,7 +966,8 @@ public class CompileDriver {
       boolean didSomething = false;
 
       final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
-      GenericCompilerRunner runner = new GenericCompilerRunner(context, myCompilerFilter, compilerManager, isRebuild, onlyCheckStatus);
+      GenericCompilerRunner runner = new GenericCompilerRunner(context, isRebuild, onlyCheckStatus,
+                                                               compilerManager.getCompilers(GenericCompiler.class, myCompilerFilter));
       try {
         didSomething |= generateSources(compilerManager, context, forceCompile, onlyCheckStatus);
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java b/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
index e6e5cc500daa..3f4575fe7952 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java
@@ -53,14 +53,12 @@ public class GenericCompilerRunner {
   private final Project myProject;
 
   public GenericCompilerRunner(CompileContext context,
-                               CompilerFilter compilerFilter,
-                               CompilerManager compilerManager,
                                boolean forceCompile,
-                               boolean onlyCheckStatus) {
+                               boolean onlyCheckStatus, final GenericCompiler[] compilers) {
     myContext = context;
     myForceCompile = forceCompile;
     myOnlyCheckStatus = onlyCheckStatus;
-    myCompilers = compilerManager.getCompilers(GenericCompiler.class, compilerFilter);
+    myCompilers = compilers;
     myProject = myContext.getProject();
   }
 
diff --git a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/SingleTargetCompilerInstance.java b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/SingleTargetCompilerInstance.java
deleted file mode 100644
index f2e4dd3ca71e..000000000000
--- a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/SingleTargetCompilerInstance.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2000-2010 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 com.intellij.openapi.compiler.generic;
-
-import com.intellij.openapi.compiler.CompileContext;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author nik
- */
-public abstract class SingleTargetCompilerInstance<Item extends CompileItem<K,S,O>, K,S, O> extends
-                                                                                            GenericCompilerInstance<BuildTarget, Item, K, S, O> {
-  protected SingleTargetCompilerInstance(CompileContext context) {
-    super(context);
-  }
-
-  @NotNull
-  @Override
-  public List<BuildTarget> getAllTargets() {
-    return Collections.singletonList(BuildTarget.DEFAULT);
-  }
-
-  @NotNull
-  @Override
-  public List<BuildTarget> getSelectedTargets() {
-    return getAllTargets();
-  }
-
-  @Override
-  public void processObsoleteTarget(@NotNull String targetId, @NotNull List<GenericCompilerCacheState<K, S, O>> obsoleteItems) {
-  }
-}
diff --git a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/VirtualFileCompileItem.java b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/VirtualFileCompileItem.java
index 03a14bd0d63c..b1e5394fc60d 100644
--- a/java/compiler/impl/src/com/intellij/openapi/compiler/generic/VirtualFileCompileItem.java
+++ b/java/compiler/impl/src/com/intellij/openapi/compiler/generic/VirtualFileCompileItem.java
@@ -16,8 +16,6 @@
 package com.intellij.openapi.compiler.generic;
 
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.io.EnumeratorStringDescriptor;
-import com.intellij.util.io.KeyDescriptor;
 import org.jetbrains.annotations.NotNull;
 
 /**