From f4cce859657d191b705617155f4a7547c8ece21c Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 15 Aug 2011 22:16:03 +0200 Subject: fixed a warning during the ant compile process --- src/core/lombok/javac/apt/Javac6BaseFileObjectWrapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core') 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(); } -- cgit From a85023b919928e2a57343639be1d69d15fd0c1d0 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 15 Aug 2011 22:16:54 +0200 Subject: Optimized the 'val' search; previously a fairly lengthy import list check was done for _every_ local declaration _anywhere_ in _any_ eclipse source file to see if it needed 'val' treatment. Now as a shortcut there's a check if the typeRef's last part is equal to 'val', and if not, no check is performed. --- src/core/lombok/eclipse/Eclipse.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/core') 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(); -- cgit