summaryrefslogtreecommitdiffstats
path: root/src/org/jetbrains/java/decompiler/main/collectors
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2014-10-24 21:16:23 +1100
committermd_5 <git@md-5.net>2014-10-25 09:30:59 +1100
commitb98e02e557eb7c30d6425ffd9cfa8b7b71b164dc (patch)
tree4c1ac9026ebda849390d4000fe744cea917c4a17 /src/org/jetbrains/java/decompiler/main/collectors
parente0f22e66296eeaf1e2a9af73af0c7f9ba28521b1 (diff)
downloadfernflower-b98e02e557eb7c30d6425ffd9cfa8b7b71b164dc.tar
fernflower-b98e02e557eb7c30d6425ffd9cfa8b7b71b164dc.tar.gz
fernflower-b98e02e557eb7c30d6425ffd9cfa8b7b71b164dc.tar.lz
fernflower-b98e02e557eb7c30d6425ffd9cfa8b7b71b164dc.tar.xz
fernflower-b98e02e557eb7c30d6425ffd9cfa8b7b71b164dc.zip
Spigot Changes
Diffstat (limited to 'src/org/jetbrains/java/decompiler/main/collectors')
-rw-r--r--src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java2
1 files changed, 1 insertions, 1 deletions
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());
}
}