diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lombok/eclipse/Eclipse.java | 5 | ||||
| -rw-r--r-- | src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/lombok/eclipse/Eclipse.java b/src/core/lombok/eclipse/Eclipse.java index 2cb2fe33..858c2fe9 100644 --- a/src/core/lombok/eclipse/Eclipse.java +++ b/src/core/lombok/eclipse/Eclipse.java @@ -581,7 +581,10 @@ public class Eclipse { * @param typeRef A type reference to check. */ public static boolean typeMatches(Class<?> type, EclipseNode node, TypeReference typeRef) { - if (typeRef == null || typeRef.getTypeName() == null) return false; + if (typeRef == null || typeRef.getTypeName() == null || typeRef.getTypeName().length == 0) return false; + String lastPartA = new String(typeRef.getTypeName()[typeRef.getTypeName().length -1]); + String lastPartB = type.getSimpleName(); + if (!lastPartA.equals(lastPartB)) return false; String typeName = toQualifiedName(typeRef.getTypeName()); TypeLibrary library = new TypeLibrary(); diff --git a/src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java b/src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java index f1f33426..9d9a2fb5 100644 --- a/src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java +++ b/src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java @@ -33,6 +33,8 @@ import java.nio.charset.CharsetDecoder; import javax.lang.model.element.Modifier; import javax.lang.model.element.NestingKind; +// Weird SuppressWarnings, but javac doesn't understand 'all' and eclipse doesn't understand that this file contains deprecation references. +@SuppressWarnings({"all", "deprecation"}) class Javac6BaseFileObjectWrapper extends com.sun.tools.javac.util.BaseFileObject { private final LombokFileObject delegate; @@ -48,7 +50,6 @@ class Javac6BaseFileObjectWrapper extends com.sun.tools.javac.util.BaseFileObjec return delegate.toUri(); } - @SuppressWarnings("all") @Override public String getName() { return delegate.getName(); } |