From 4996428ea12be7e381d76614e34a15ad1cc6d275 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Thu, 8 May 2014 06:25:38 +0200
Subject: @Delegate has moved to lombok.experimental.

Some work on the aliasing system to make that go smoothly.
---
 src/core/lombok/eclipse/EclipseImportList.java     | 14 +++++++++++---
 src/core/lombok/eclipse/handlers/HandleGetter.java |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/core/lombok/eclipse')

diff --git a/src/core/lombok/eclipse/EclipseImportList.java b/src/core/lombok/eclipse/EclipseImportList.java
index 69246b3c..47167ec6 100644
--- a/src/core/lombok/eclipse/EclipseImportList.java
+++ b/src/core/lombok/eclipse/EclipseImportList.java
@@ -62,15 +62,23 @@ public class EclipseImportList implements ImportList {
 	}
 	
 	@Override public boolean hasStarImport(String packageName) {
-		for (Map.Entry<String, String> e : LombokInternalAliasing.IMPLIED_EXTRA_STAR_IMPORTS.entrySet()) {
-			if (e.getValue().equals(packageName) && hasStarImport(e.getKey())) return true;
-		}
 		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/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java
index 8cffaa2c..d3d974c9 100644
--- a/src/core/lombok/eclipse/handlers/HandleGetter.java
+++ b/src/core/lombok/eclipse/handlers/HandleGetter.java
@@ -34,7 +34,7 @@ import java.util.Map;
 
 import lombok.AccessLevel;
 import lombok.ConfigurationKeys;
-import lombok.Delegate;
+import lombok.experimental.Delegate;
 import lombok.Getter;
 import lombok.core.AST.Kind;
 import lombok.core.AnnotationValues;
-- 
cgit