From 179f2a0ded890bad617a0dae6637c5a00393942b Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Mon, 1 Aug 2011 17:04:01 +0400
Subject: [PATCH] optimize imports: typo

---
 .../com/intellij/psi/impl/source/codeStyle/ImportHelper.java    | 2 +-
 .../advHighlighting/reimportConflictingClasses/x/Usage.java     | 1 +
 .../reimportConflictingClasses/x/Usage_afterOptimize.txt        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
index 18a1c4cd97e2..1b89fab7844d 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
@@ -253,7 +253,7 @@ public class ImportHelper{
   private static void calcClassesConflictingViaOnDemandImports(PsiJavaFile file, Collection<String> onDemandImportsList,
                                                                GlobalSearchScope resolveScope, final Set<String> namesToUseSingle) {
     List<String> onDemands = new ArrayList<String>(Arrays.asList(file.getImplicitlyImportedPackages()));
-    for (String onDemand : onDemands) {
+    for (String onDemand : onDemandImportsList) {
       if (!onDemands.contains(onDemand)) {
         onDemands.add(onDemand);
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage.java
index 3a79af4db913..e6e26cf02646 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage.java
@@ -4,6 +4,7 @@ import x.n.X1;
 import x.n.X2;
 import x.n.X3;
 
+@Deprecated
 public class Y {
     X1 x1;
     x.n.Class s;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage_afterOptimize.txt b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage_afterOptimize.txt
index 8ac2b4e0d83e..15f16b2b5940 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage_afterOptimize.txt
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/reimportConflictingClasses/x/Usage_afterOptimize.txt
@@ -4,6 +4,7 @@ import x.n.*;
 
 import java.lang.Class;
 
+@Deprecated
 public class Y {
     X1 x1;
     x.n.Class s;