Consistent use of JavacResolution.typeToJCTree instead of TreeMaker.Types - fixes issue 341 where use of @Delegate with T-extends type parameters would prepend a dot to the fully qualified classname.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/core/lombok/javac/handlers/HandleDelegate.java b/src/core/lombok/javac/handlers/HandleDelegate.java
index 9eca23db..41e587f8 100644
--- a/src/core/lombok/javac/handlers/HandleDelegate.java
+++ b/src/core/lombok/javac/handlers/HandleDelegate.java
@@ -288,7 +288,13 @@ public class HandleDelegate extends JavacAnnotationHandler<Delegate> {
 		
 		for (TypeMirror param : sig.type.getTypeVariables()) {
 			Name name = ((TypeVar) param).tsym.name;
-			typeParams.append(maker.TypeParameter(name, maker.Types(types.getBounds((TypeVar) param))));
+			
+			ListBuffer<JCExpression> bounds = types.getBounds((TypeVar) param).isEmpty() ? null : new ListBuffer<JCExpression>();
+			for (Type type : types.getBounds((TypeVar) param)) {
+				bounds.append(JavacResolution.typeToJCTree(type, annotation.getAst(), true));
+			}
+			
+			typeParams.append(maker.TypeParameter(name, bounds.toList()));
 			typeArgs.append(maker.Ident(name));
 		}