Most of the javac implementation for HandleBuilder, plus

some minor updates and refactoring in the eclipse HandleBuilder.

1 files changed, 17 insertions, 2 deletions

diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 2577befb..23bc2daf 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -806,12 +806,13 @@ public class JavacHandlerUtil {
 	 * 
 	 * @param typeNode parent type to inject new type into
 	 * @param type New type (class, interface, etc) to inject.
+	 * @return 
 	 */
-	public static void injectType(final JavacNode typeNode, final JCClassDecl type) {
+	public static JavacNode injectType(final JavacNode typeNode, final JCClassDecl type) {
 		JCClassDecl typeDecl = (JCClassDecl) typeNode.get();
 		addSuppressWarningsAll(type.mods, typeNode, type.pos, getGeneratedBy(type));
 		typeDecl.defs = typeDecl.defs.append(type);
-		typeNode.add(type, Kind.TYPE);
+		return typeNode.add(type, Kind.TYPE);
 	}
 	
 	private static void addSuppressWarningsAll(JCModifiers mods, JavacNode node, int pos, JCTree source) {
@@ -1025,6 +1026,20 @@ public class JavacHandlerUtil {
 		return result.toList();
 	}
 	
+	public static JCExpression namePlusTypeParamsToTypeReference(TreeMaker maker, Name typeName, List<JCTypeParameter> params) {
+		ListBuffer<JCExpression> typeArgs = ListBuffer.lb();
+		
+		if (!params.isEmpty()) {
+			for (JCTypeParameter param : params) {
+				typeArgs.append(maker.Ident(param.name));
+			}
+			
+			return maker.TypeApply(maker.Ident(typeName), typeArgs.toList());
+		}
+		
+		return maker.Ident(typeName);
+	}
+	
 	static List<JCAnnotation> copyAnnotations(List<? extends JCExpression> in) {
 		ListBuffer<JCAnnotation> out = ListBuffer.lb();
 		for (JCExpression expr : in) {