From b98e02e557eb7c30d6425ffd9cfa8b7b71b164dc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 24 Oct 2014 21:16:23 +1100
Subject: Spigot Changes

---
 src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/org/jetbrains/java/decompiler/main/collectors')

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index c66a3e0..fae600a 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -145,7 +145,7 @@ public class ImportCollector {
       // exclude a current class or one of the nested ones, java.lang and empty packages
       if (!setNotImportedNames.contains(ent.getKey()) &&
           !JAVA_LANG_PACKAGE.equals(ent.getValue()) &&
-          !ent.getValue().isEmpty()) {
+          !ent.getValue().isEmpty() && !ent.getValue().equals(this.currentPackagePoint)) { // Spigot: Remove same package imports
         res.add(ent.getValue() + "." + ent.getKey());
       }
     }
-- 
cgit v1.2.3