From 00efb07a9061d994e0e397dc734d5a80f49be553 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 1 Apr 2014 11:25:14 +0400
Subject: [PATCH] removing unused parameter and field

---
 .../com/intellij/compiler/impl/CompileDriver.java |  2 +-
 .../impl/compiler/ArtifactCompileScope.java       | 15 +++++----------
 .../appengine/actions/AppEngineUploader.java      |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

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 af5db1458218..ce5a6072ca43 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -207,7 +207,7 @@ public class CompileDriver {
       compileScope = projectScope;
     }
     else {
-      CompileScope scopeWithArtifacts = ArtifactCompileScope.createScopeWithArtifacts(projectScope, ArtifactUtil.getArtifactWithOutputPaths(myProject), false);
+      CompileScope scopeWithArtifacts = ArtifactCompileScope.createScopeWithArtifacts(projectScope, ArtifactUtil.getArtifactWithOutputPaths(myProject));
       compileScope = addAdditionalRoots(scopeWithArtifacts, ALL_EXCEPT_SOURCE_PROCESSING);
     }
     doRebuild(callback, null, true, compileScope);
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
index f79426895c91..5280384dff11 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
@@ -43,8 +43,7 @@ public class ArtifactCompileScope {
   private static final Key<Boolean> FORCE_ARTIFACT_BUILD = Key.create("force_artifact_build");
   private static final Key<Artifact[]> ARTIFACTS_KEY = Key.create("artifacts");
   private static final Key<Set<Artifact>> CACHED_ARTIFACTS_KEY = Key.create("cached_artifacts");
-  private static final Key<Key<?>> ARTIFACTS_CONTENT_ID_KEY = Key.create("build_artifacts_task");
-
+  
   private ArtifactCompileScope() {
   }
 
@@ -61,19 +60,15 @@ public class ArtifactCompileScope {
   public static CompileScope createArtifactsScope(@NotNull Project project,
                                                   @NotNull Collection<Artifact> artifacts,
                                                   final boolean forceArtifactBuild) {
-    return createScopeWithArtifacts(createScopeForModulesInArtifacts(project, artifacts), artifacts, true, forceArtifactBuild);
+    return createScopeWithArtifacts(createScopeForModulesInArtifacts(project, artifacts), artifacts, forceArtifactBuild);
   }
 
   public static CompileScope createScopeWithArtifacts(final CompileScope baseScope,
-                                                      @NotNull Collection<Artifact> artifacts,
-                                                      boolean useCustomContentId) {
-    return createScopeWithArtifacts(baseScope, artifacts, useCustomContentId, false);
+                                                      @NotNull Collection<Artifact> artifacts) {
+    return createScopeWithArtifacts(baseScope, artifacts, false);
   }
 
-  public static CompileScope createScopeWithArtifacts(final CompileScope baseScope,
-                                                      @NotNull Collection<Artifact> artifacts,
-                                                      boolean useCustomContentId,
-                                                      final boolean forceArtifactBuild) {
+  public static CompileScope createScopeWithArtifacts(final CompileScope baseScope, @NotNull Collection<Artifact> artifacts, final boolean forceArtifactBuild) {
     baseScope.putUserData(ARTIFACTS_KEY, artifacts.toArray(new Artifact[artifacts.size()]));
     if (forceArtifactBuild) {
       baseScope.putUserData(FORCE_ARTIFACT_BUILD, Boolean.TRUE);
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java b/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
index dea389ac77b6..ea24e05f88d0 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
@@ -198,7 +198,7 @@ public class AppEngineUploader {
 
     final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
     final CompileScope moduleScope = compilerManager.createModuleCompileScope(myAppEngineFacet.getModule(), true);
-    final CompileScope compileScope = ArtifactCompileScope.createScopeWithArtifacts(moduleScope, Collections.singletonList(myArtifact), true);
+    final CompileScope compileScope = ArtifactCompileScope.createScopeWithArtifacts(moduleScope, Collections.singletonList(myArtifact));
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       public void run() {
         compilerManager.make(compileScope, new CompileStatusNotification() {