diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2011-12-19 20:56:21 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2011-12-19 20:56:21 +0100 |
| commit | 76c45bc4824f68c2ef740351722fdd4e470248c5 (patch) | |
| tree | 1e7f01d848401d0fd6b8d67fc1a2809289587de9 | |
| parent | 0234039babafa1098c337136a97f4e1f94e35855 (diff) | |
| parent | 71c48fb991c657aaa30b805bc0e10e5bd00bec3b (diff) | |
| download | lombok-76c45bc4824f68c2ef740351722fdd4e470248c5.tar.gz lombok-76c45bc4824f68c2ef740351722fdd4e470248c5.tar.bz2 lombok-76c45bc4824f68c2ef740351722fdd4e470248c5.zip | |
Merge branch 'Issue_315' of https://github.com/jvanderhel/lombok into jvanderhel-Issue_315
| -rw-r--r-- | src/core/lombok/eclipse/handlers/HandleLog.java | 4 | ||||
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/core/lombok/eclipse/handlers/HandleLog.java b/src/core/lombok/eclipse/handlers/HandleLog.java index b37d4f27..0abac2fe 100644 --- a/src/core/lombok/eclipse/handlers/HandleLog.java +++ b/src/core/lombok/eclipse/handlers/HandleLog.java @@ -71,7 +71,9 @@ public class HandleLog { ClassLiteralAccess loggingType = selfType(owner, source); - injectField(owner, createField(framework, source, loggingType)); + FieldDeclaration fieldDeclaration = createField(framework, source, loggingType); + fieldDeclaration.traverse(new SetGeneratedByVisitor(source), typeDecl.staticInitializerScope); + injectField(owner, fieldDeclaration); owner.rebuild(); break; default: diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java index 25f7d7ce..1a3828c1 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java +++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java @@ -310,6 +310,13 @@ public class EclipsePatcher extends Agent { .wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "setIsGeneratedFlag", "void", "org.eclipse.jdt.core.dom.ASTNode", "org.eclipse.jdt.internal.compiler.ast.ASTNode")) .transplant().build()); + + sm.addScript(ScriptBuilder.wrapReturnValue() + .target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "convertToFieldDeclaration", "org.eclipse.jdt.core.dom.FieldDeclaration", "org.eclipse.jdt.internal.compiler.ast.FieldDeclaration")) + .request(StackRequest.PARAM1, StackRequest.RETURN_VALUE) + .wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "setIsGeneratedFlag", "void", + "org.eclipse.jdt.core.dom.ASTNode", "org.eclipse.jdt.internal.compiler.ast.ASTNode")) + .transplant().build()); sm.addScript(ScriptBuilder.wrapMethodCall() .target(new TargetMatcher() { |