1) We now honor the "public" and "abstract" modifier settings

2) Annotations are now handled, but @SuppressWarnings is skipped

2 files changed, 84 insertions, 15 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
index a721b468..df7c71db 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
@@ -123,9 +123,9 @@ public class EclipsePatcher extends Agent {
 				"org.eclipse.jdt.core.dom.MethodDeclaration"
 			))
 			.methodToWrap(new Hook("org.eclipse.jface.text.IDocument", "get", "java.lang.String", "int", "int"))
-			.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getRealMethodDeclarationSource", "java.lang.String", "java.lang.String", "org.eclipse.jdt.core.dom.MethodDeclaration"))
-			.requestExtra(StackRequest.PARAM4)
-			.build());
+			.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getRealMethodDeclarationSource", "java.lang.String", "java.lang.String", "java.lang.Object", "org.eclipse.jdt.core.dom.MethodDeclaration"))
+			.requestExtra(StackRequest.THIS, StackRequest.PARAM4)
+			.transplant().build());
 		
 		/* get real generated node in stead of a random one generated by the annotation */
 		sm.addScript(ScriptBuilder.replaceMethodCall()
@@ -133,21 +133,21 @@ public class EclipsePatcher extends Agent {
 				.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor", "createMethodComments"))
 				.methodToReplace(new Hook("org.eclipse.jdt.internal.corext.refactoring.structure.ASTNodeSearchUtil", "getMethodDeclarationNode", "org.eclipse.jdt.core.dom.MethodDeclaration", "org.eclipse.jdt.core.IMethod", "org.eclipse.jdt.core.dom.CompilationUnit"))
 				.replacementMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getRealMethodDeclarationNode", "org.eclipse.jdt.core.dom.MethodDeclaration", "org.eclipse.jdt.core.IMethod", "org.eclipse.jdt.core.dom.CompilationUnit"))
-				.build());
+				.transplant().build());
 		
 		/* Do not add @Override's for generated methods */
 		sm.addScript(ScriptBuilder.exitEarly()
 				.target(new MethodTarget("org.eclipse.jdt.core.dom.rewrite.ListRewrite", "insertFirst"))
 				.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "isListRewriteOnGeneratedNode", "boolean", "org.eclipse.jdt.core.dom.rewrite.ListRewrite"))
 				.request(StackRequest.THIS)
-				.build());
+				.transplant().build());
 		
 		/* Do not add comments for generated methods */
 		sm.addScript(ScriptBuilder.exitEarly()
 				.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor", "createMethodComment"))
 				.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "isGenerated", "boolean", "org.eclipse.jdt.core.dom.ASTNode"))
 				.request(StackRequest.PARAM2)
-				.build());
+				.transplant().build());
 	}
 	
 	private static void patchAboutDialog(ScriptManager sm) {
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
index 53d60bde..38928fec 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
 
@@ -91,15 +92,49 @@ public class PatchFixes {
 		return list;
 	}
 	
-	/* Very practical implementation, but works for getter and setter even with type parameters */
-	public static java.lang.String getRealMethodDeclarationSource(java.lang.String original, org.eclipse.jdt.core.dom.MethodDeclaration declaration) {
+	public static java.lang.String getRealMethodDeclarationSource(java.lang.String original, Object processor, org.eclipse.jdt.core.dom.MethodDeclaration declaration) throws Exception {
 		if (!isGenerated(declaration)) return original;
 		
-		StringBuilder signature = new StringBuilder();
+		boolean fPublic = (Boolean)processor.getClass().getDeclaredField("fPublic").get(processor);
+		boolean fAbstract = (Boolean)processor.getClass().getDeclaredField("fAbstract").get(processor);
+		
+		final List<String> skippedAnnotations = new ArrayList<String>();
+		skippedAnnotations.add("java.lang.Override"); // always skipped by extract interface
+		skippedAnnotations.add("java.lang.SuppressWarnings"); // always added by lombok
+
+		// Near copy of ExtractInterFaceProcessor.createMethodDeclaration(...)
+		// couldn't find a way to pass these as parameters
+		boolean publicFound= false;
+		boolean abstractFound= false;
 		
-		// We should get these from the refactor action
-		boolean needsPublic = true, needsAbstract = true;
+		List<org.eclipse.jdt.core.dom.Annotation> annotations = new ArrayList<org.eclipse.jdt.core.dom.Annotation>();
+		org.eclipse.jdt.core.dom.Modifier modifier= null;
+		org.eclipse.jdt.core.dom.IExtendedModifier extended= null;
+		for (final Iterator<?> iterator= declaration.modifiers().iterator(); iterator.hasNext();) {
+			extended= (org.eclipse.jdt.core.dom.IExtendedModifier) iterator.next();
+			if (!extended.isAnnotation()) {
+				modifier= (org.eclipse.jdt.core.dom.Modifier) extended;
+				if (fPublic && modifier.getKeyword().equals(org.eclipse.jdt.core.dom.Modifier.ModifierKeyword.PUBLIC_KEYWORD)) {
+					publicFound= true;
+					continue;
+				}
+				if (fAbstract && modifier.getKeyword().equals(org.eclipse.jdt.core.dom.Modifier.ModifierKeyword.ABSTRACT_KEYWORD)) {
+					abstractFound= true;
+					continue;
+				}
+			} else {
+				org.eclipse.jdt.core.dom.Annotation annotation = (org.eclipse.jdt.core.dom.Annotation)extended;
+				if (!skippedAnnotations.contains(annotation.resolveTypeBinding().getQualifiedName()))
+					annotations.add(annotation);
+			}
+		}
+	
+		boolean needsPublic = fPublic && !publicFound; 
+		boolean needsAbstract = fAbstract && !abstractFound;
+		// END Near copy of ExtractInterFaceProcessor.createMethodDeclaration(...)
 		
+		StringBuilder signature = new StringBuilder();
+		addAnnotations(annotations, signature);
 		if (needsPublic) signature.append("public ");
 		if (needsAbstract) signature.append("abstract ");
 		
@@ -112,15 +147,48 @@ public class PatchFixes {
 		for (Object parameter : declaration.parameters()) {
 			if (!first) signature.append(", ");
 			first = false;
-			// The annotations are still missing
-			// Note: what happens to imports for the annotations? 
-			// I assume they have been taken care of by the default extraction system
 			signature.append(parameter);
 		}
 		
 		signature.append(");");
 		return signature.toString();
 	}
+
+	// part of getRealMethodDeclarationSource(...)
+	public static void addAnnotations(List<org.eclipse.jdt.core.dom.Annotation> annotations, StringBuilder signature) {
+		for (org.eclipse.jdt.core.dom.Annotation annotation : annotations) {
+			boolean lombokFound = false;
+			List<String> values = new ArrayList<String>();
+			if (annotation.isSingleMemberAnnotation()) {
+				org.eclipse.jdt.core.dom.SingleMemberAnnotation smAnn = (org.eclipse.jdt.core.dom.SingleMemberAnnotation) annotation;
+				values.add(smAnn.getValue().toString());
+				
+			} else if (annotation.isNormalAnnotation()) {
+				org.eclipse.jdt.core.dom.NormalAnnotation normalAnn = (org.eclipse.jdt.core.dom.NormalAnnotation) annotation;
+				for (Object value : normalAnn.values()) {
+					values.add(value.toString());
+				}
+			}
+
+			if (!lombokFound) {
+				signature.append("@").append(annotation.resolveTypeBinding().getQualifiedName());
+				if (!values.isEmpty()) {
+					signature.append("(");
+					boolean first = true;
+					for (String string : values) {
+						if (first) {
+							first = false;
+						} else {
+							signature.append(",");
+						}
+						signature.append('"').append(string).append('"');
+					}
+					signature.append(")");
+				}
+				signature.append(" ");
+			}
+		}
+	}
 	
 	
 	public static org.eclipse.jdt.core.dom.MethodDeclaration getRealMethodDeclarationNode(org.eclipse.jdt.core.IMethod sourceMethod, org.eclipse.jdt.core.dom.CompilationUnit cuUnit) throws JavaModelException {
@@ -154,7 +222,8 @@ public class PatchFixes {
 		return methodDeclarationNode;
 	}
 	
-	private static org.eclipse.jdt.core.dom.AbstractTypeDeclaration findTypeDeclaration(IType searchType, List<?> nodes) {
+	// part of getRealMethodDeclarationNode
+	public static org.eclipse.jdt.core.dom.AbstractTypeDeclaration findTypeDeclaration(IType searchType, List<?> nodes) {
 		for (Object object : nodes) {
 			if (object instanceof org.eclipse.jdt.core.dom.AbstractTypeDeclaration) {
 				org.eclipse.jdt.core.dom.AbstractTypeDeclaration typeDeclaration = (org.eclipse.jdt.core.dom.AbstractTypeDeclaration) object;