diff options
Diffstat (limited to 'src/core/lombok/eclipse')
| -rw-r--r-- | src/core/lombok/eclipse/EclipseImportList.java | 10 | ||||
| -rwxr-xr-x | src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/core/lombok/eclipse/EclipseImportList.java b/src/core/lombok/eclipse/EclipseImportList.java index 47167ec6..6d60f5aa 100644 --- a/src/core/lombok/eclipse/EclipseImportList.java +++ b/src/core/lombok/eclipse/EclipseImportList.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Map; import lombok.core.ImportList; import lombok.core.LombokInternalAliasing; @@ -65,19 +64,10 @@ public class EclipseImportList implements ImportList { if (isEqual(packageName, pkg)) return true; if ("java.lang".equals(packageName)) return true; - if (pkg != null && pkg.tokens != null && pkg.tokens.length == 0) { - for (Map.Entry<String, Collection<String>> e : LombokInternalAliasing.IMPLIED_EXTRA_STAR_IMPORTS.entrySet()) { - if (isEqual(e.getKey(), pkg) && e.getValue().contains(packageName)) return true; - } - } - if (imports != null) for (ImportReference imp : imports) { if ((imp.bits & ASTNode.OnDemand) == 0) continue; if (imp.isStatic()) continue; if (isEqual(packageName, imp)) return true; - for (Map.Entry<String, Collection<String>> e : LombokInternalAliasing.IMPLIED_EXTRA_STAR_IMPORTS.entrySet()) { - if (isEqual(e.getKey(), imp) && e.getValue().contains(packageName)) return true; - } } return false; diff --git a/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java b/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java index da0bf471..483431cc 100755 --- a/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java +++ b/src/core/lombok/eclipse/handlers/EclipseSingularsRecipes.java @@ -109,7 +109,9 @@ public class EclipseSingularsRecipes { } public String toQualified(String typeReference) { - return singularizableTypes.toQualified(typeReference); + List<String> q = singularizableTypes.toQualifieds(typeReference); + if (q.isEmpty()) return null; + return q.get(0); } public EclipseSingularizer getSingularizer(String fqn) { |