From 82ff073a434034ce65d415fb0cd3a6cf3e7ad850 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 5 Dec 2011 15:39:33 +0400
Subject: [PATCH] KT-697 Remove unnecessary NotNull annotation import from
 Kotlin code

---
 src/org/jetbrains/jet/j2k/Converter.java                   | 4 +++-
 src/org/jetbrains/jet/j2k/ast/Import.java                  | 4 ++++
 testData/ast/annotations/file/jetbrainsNotNull.kt          | 1 -
 testData/ast/importStatement/file/simpleImport.kt          | 1 -
 testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index 42a2d844b1f..35b603df540 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/src/org/jetbrains/jet/j2k/Converter.java
@@ -432,7 +432,9 @@ public class Converter {
   @NotNull
   private static List<Import> importsToImportList(@NotNull PsiImportStatementBase[] imports) {
     List<Import> result = new LinkedList<Import>();
-    for (PsiImportStatementBase t : imports) result.add(importToImport(t));
+    for (PsiImportStatementBase i : imports)
+      if (!NOT_NULL_ANNOTATIONS.contains(importToImport(i).getName()))
+        result.add(importToImport(i));
     return result;
   }
 
diff --git a/src/org/jetbrains/jet/j2k/ast/Import.java b/src/org/jetbrains/jet/j2k/ast/Import.java
index 6cf6cca560a..854b2fa3534 100644
--- a/src/org/jetbrains/jet/j2k/ast/Import.java
+++ b/src/org/jetbrains/jet/j2k/ast/Import.java
@@ -8,6 +8,10 @@ import org.jetbrains.annotations.NotNull;
 public class Import extends Node {
   private final String myName;
 
+  public String getName() {
+    return myName;
+  }
+
   public Import(String name) {
     myName = name;
   }
diff --git a/testData/ast/annotations/file/jetbrainsNotNull.kt b/testData/ast/annotations/file/jetbrainsNotNull.kt
index 2b0b40a701f..bd1969cabda 100644
--- a/testData/ast/annotations/file/jetbrainsNotNull.kt
+++ b/testData/ast/annotations/file/jetbrainsNotNull.kt
@@ -1,5 +1,4 @@
 namespace test
-import org.jetbrains.annotations.NotNull
 public open class Test(str : String) {
 {
 $myStr = str
diff --git a/testData/ast/importStatement/file/simpleImport.kt b/testData/ast/importStatement/file/simpleImport.kt
index dcead7d53b8..97e54209431 100644
--- a/testData/ast/importStatement/file/simpleImport.kt
+++ b/testData/ast/importStatement/file/simpleImport.kt
@@ -1,4 +1,3 @@
 namespace org.jetbrains.jet.j2k
-import org.jetbrains.annotations.NotNull
 public open class Converter() {
 }
\ No newline at end of file
diff --git a/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt b/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
index d4534115df5..51ebb27fea5 100644
--- a/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
+++ b/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
@@ -1,5 +1,4 @@
 namespace org.jetbrains.jet.j2k.`in`
-import org.jetbrains.annotations.NotNull
 import org.jetbrains.annotations.Nullable
 public open class Converter() {
 }
\ No newline at end of file