Merge branch 'master' of github.com:rzwitserloot/lombok

src/core/lombok/commons/Log.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.commons;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	
+	Class<?> value() default void.class;
+}

src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java

@@ -23,6 +23,7 @@ package lombok.eclipse.handlers;
 
 import static lombok.eclipse.Eclipse.*;
 
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -42,6 +43,7 @@ import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
 import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.compiler.ast.Clinit;
 import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
 import org.eclipse.jdt.internal.compiler.ast.Expression;
@@ -404,11 +406,19 @@ public class EclipseHandlerUtil {
 		return null;
 	}
 	
+	/**
+	 * Inserts a field into an existing type. The type must represent a {@code TypeDeclaration}.
+	 * The field carries the @{@link SuppressWarnings}("all") annotation.
+	 */
+	public static void injectFieldSuppressWarnings(EclipseNode type, FieldDeclaration field) {
+		field.annotations = createSuppressWarningsAll(field, field.annotations);
+		injectField(type, field);
+	}
+	
 	/**
 	 * Inserts a field into an existing type. The type must represent a {@code TypeDeclaration}.
 	 */
 	public static void injectField(EclipseNode type, FieldDeclaration field) {
-		field.annotations = createSuppressWarningsAll(field, field.annotations);
 		TypeDeclaration parent = (TypeDeclaration) type.get();
 		
 		if (parent.fields == null) {
@@ -421,9 +431,24 @@ public class EclipseHandlerUtil {
 			parent.fields = newArray;
 		}
 		
+		if ((field.modifiers & Modifier.STATIC) != 0) {
+			if (!hasClinit(parent)) {
+				parent.addClinit();
+			}
+		}
+		
 		type.add(field, Kind.FIELD).recursiveSetHandled();
 	}
 	
+	private static boolean hasClinit(TypeDeclaration parent) {
+		if (parent.methods == null) return false;
+		
+		for (AbstractMethodDeclaration method : parent.methods) {
+			if (method instanceof Clinit) return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Inserts a method into an existing type. The type must represent a {@code TypeDeclaration}.
 	 */

src/core/lombok/eclipse/handlers/HandleLog.java

@@ -0,0 +1,281 @@
+/*
+ * Copyright © 2009 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.eclipse.handlers;
+
+import static lombok.eclipse.Eclipse.fromQualifiedName;
+import static lombok.eclipse.handlers.EclipseHandlerUtil.*;
+
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+
+import lombok.core.AnnotationValues;
+import lombok.core.AST.Kind;
+import lombok.eclipse.Eclipse;
+import lombok.eclipse.EclipseAnnotationHandler;
+import lombok.eclipse.EclipseNode;
+import lombok.eclipse.handlers.EclipseHandlerUtil.MemberExistsResult;
+
+import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.compiler.ast.ClassLiteralAccess;
+import org.eclipse.jdt.internal.compiler.ast.Expression;
+import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.MessageSend;
+import org.eclipse.jdt.internal.compiler.ast.NameReference;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.TypeReference;
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
+import org.mangosdk.spi.ProviderFor;
+
+public class HandleLog {
+	
+	private HandleLog() {
+		throw new UnsupportedOperationException();
+	}
+	
+	public static boolean processAnnotation(LoggingFramework framework, AnnotationValues<? extends java.lang.annotation.Annotation> annotation, Annotation source, EclipseNode annotationNode) {
+		
+		String loggingClassName = annotation.getRawExpression("value");
+		if (loggingClassName == null) loggingClassName = "void";
+		if (loggingClassName.endsWith(".class")) loggingClassName = loggingClassName.substring(0, loggingClassName.length() - 6);
+		
+		EclipseNode owner = annotationNode.up();
+		switch (owner.getKind()) {
+		case TYPE:
+			TypeDeclaration typeDecl = null;
+			if (owner.get() instanceof TypeDeclaration) typeDecl = (TypeDeclaration) owner.get();
+			int modifiers = typeDecl == null ? 0 : typeDecl.modifiers;
+			
+			boolean notAClass = (modifiers &
+					(ClassFileConstants.AccInterface | ClassFileConstants.AccAnnotation)) != 0;
+			
+			if (typeDecl == null || notAClass) {
+				annotationNode.addError("@Log is legal only on classes and enums.");
+				return false;
+			}
+			
+			if (fieldExists("log", owner) != MemberExistsResult.NOT_EXISTS) {
+				annotationNode.addWarning("Field 'log' already exists.");
+				return true;
+			}
+			
+			if (loggingClassName.equals("void")) {
+				loggingClassName = getSelfName(owner);
+			}
+			
+			injectField(owner, createField(framework, source, loggingClassName));
+			owner.rebuild();
+			return true;
+		default:
+			annotationNode.addError("@Log is legal only on types.");
+			return true;
+		}
+	}
+	
+	private static String getSelfName(EclipseNode type) {
+		String typeName = getSingleTypeName(type);
+		EclipseNode upType = type.up();
+		while (upType.getKind() == Kind.TYPE) {
+			typeName = getSingleTypeName(upType) + "." + typeName;
+			upType = upType.up();
+		}
+		String packageDeclaration = type.getPackageDeclaration();
+		if (packageDeclaration != null) {
+			typeName = packageDeclaration + "." + typeName;
+		}
+		return typeName;
+	}
+	
+	private static String getSingleTypeName(EclipseNode type) {
+		TypeDeclaration typeDeclaration = (TypeDeclaration)type.get();
+		char[] rawTypeName = typeDeclaration.name;
+		return rawTypeName == null ? "" : new String(rawTypeName);
+	}
+	
+	private static FieldDeclaration createField(LoggingFramework framework, Annotation source, String loggingClassName) {
+		int pS = source.sourceStart, pE = source.sourceEnd;
+		long p = (long)pS << 32 | pE;
+		
+		// 	private static final <loggerType> log = <factoryMethod>(<parameter>);
+
+		FieldDeclaration fieldDecl = new FieldDeclaration("log".toCharArray(), 0, -1);
+		Eclipse.setGeneratedBy(fieldDecl, source);
+		fieldDecl.declarationSourceEnd = -1;
+		fieldDecl.modifiers = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL;
+		
+		fieldDecl.type = createTypeReference(framework.getLoggerTypeName(), source);
+		
+		MessageSend factoryMethodCall = new MessageSend();
+		Eclipse.setGeneratedBy(factoryMethodCall, source);
+
+		factoryMethodCall.receiver = createNameReference(framework.getLoggerFactoryTypeName(), source);
+		factoryMethodCall.selector = framework.getLoggerFactoryMethodName().toCharArray();
+		
+		Expression parameter = framework.createFactoryParameter(loggingClassName, source);
+		
+		factoryMethodCall.arguments = new Expression[] { parameter };
+		factoryMethodCall.nameSourcePosition = p;
+		factoryMethodCall.sourceStart = pS;
+		factoryMethodCall.sourceEnd = factoryMethodCall.statementEnd = pE;
+		
+		fieldDecl.initialization = factoryMethodCall;
+		
+		return fieldDecl;
+	}
+	
+	private static TypeReference createTypeReference(String typeName, Annotation source) {
+		int pS = source.sourceStart, pE = source.sourceEnd;
+		long p = (long)pS << 32 | pE;
+		
+		char[][] typeNameTokens = fromQualifiedName(typeName);
+		long[] pos = new long[typeNameTokens.length];
+		Arrays.fill(pos, p);
+		
+		QualifiedTypeReference typeReference = new QualifiedTypeReference(typeNameTokens, pos);
+		Eclipse.setGeneratedBy(typeReference, source);
+		return typeReference;
+	}
+	
+	private static NameReference createNameReference(String name, Annotation source) {
+		int pS = source.sourceStart, pE = source.sourceEnd;
+		long p = (long)pS << 32 | pE;
+		
+		char[][] nameTokens = fromQualifiedName(name);
+		long[] pos = new long[nameTokens.length];
+		Arrays.fill(pos, p);
+		
+		QualifiedNameReference nameReference = new QualifiedNameReference(nameTokens, pos, pS, pE);
+		nameReference.statementEnd = pE;
+
+		Eclipse.setGeneratedBy(nameReference, source);
+		return nameReference;
+	}
+	
+	/**
+	 * Handles the {@link lombok.commons.Log} annotation for Eclipse.
+	 */
+	@ProviderFor(EclipseAnnotationHandler.class)
+	public static class HandleCommonsLog implements EclipseAnnotationHandler<lombok.commons.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.commons.Log> annotation, Annotation source, EclipseNode annotationNode) {
+			return processAnnotation(LoggingFramework.COMMONS, annotation, source, annotationNode);
+		}
+	}
+	
+	/**
+	 * Handles the {@link lombok.jul.Log} annotation for Eclipse.
+	 */
+	@ProviderFor(EclipseAnnotationHandler.class)
+	public static class HandleJulLog implements EclipseAnnotationHandler<lombok.jul.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.jul.Log> annotation, Annotation source, EclipseNode annotationNode) {
+			return processAnnotation(LoggingFramework.JUL, annotation, source, annotationNode);
+		}
+	}
+	
+	/**
+	 * Handles the {@link lombok.log4j.Log} annotation for Eclipse.
+	 */
+	@ProviderFor(EclipseAnnotationHandler.class)
+	public static class HandleLog4jLog implements EclipseAnnotationHandler<lombok.log4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.log4j.Log> annotation, Annotation source, EclipseNode annotationNode) {
+			return processAnnotation(LoggingFramework.LOG4J, annotation, source, annotationNode);
+		}
+	}
+	
+	/**
+	 * Handles the {@link lombok.slf4j.Log} annotation for Eclipse.
+	 */
+	@ProviderFor(EclipseAnnotationHandler.class)
+	public static class HandleSlf4jLog implements EclipseAnnotationHandler<lombok.slf4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.slf4j.Log> annotation, Annotation source, EclipseNode annotationNode) {
+			return processAnnotation(LoggingFramework.SLF4J, annotation, source, annotationNode);
+		}
+	}
+	
+	enum LoggingFramework {
+		// private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TargetType.class);
+		COMMONS(lombok.jul.Log.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory", "getLog"),
+		
+		// private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(TargetType.class.getName());
+		JUL(lombok.jul.Log.class, "java.util.logging.Logger", "java.util.logging.Logger", "getLogger") {
+			@Override public Expression createFactoryParameter(String typeName, Annotation source) {
+				int pS = source.sourceStart, pE = source.sourceEnd;
+				long p = (long)pS << 32 | pE;
+				
+				MessageSend factoryParameterCall = new MessageSend();
+				Eclipse.setGeneratedBy(factoryParameterCall, source);
+				
+				factoryParameterCall.receiver = super.createFactoryParameter(typeName, source);
+				factoryParameterCall.selector = "getName".toCharArray();
+				
+				factoryParameterCall.nameSourcePosition = p;
+				factoryParameterCall.sourceStart = pS;
+				factoryParameterCall.sourceEnd = factoryParameterCall.statementEnd = pE;
+				
+				return factoryParameterCall;
+			}
+		},
+		
+		// private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TargetType.class);
+		LOG4J(lombok.jul.Log.class, "org.apache.log4j.Logger", "org.apache.log4j.Logger", "getLogger"),
+
+		// private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TargetType.class);
+		SLF4J(lombok.slf4j.Log.class, "org.slf4j.Logger", "org.slf4j.LoggerFactory", "getLogger"),
+		
+		;
+		
+		private final Class<? extends java.lang.annotation.Annotation> annotationClass;
+		private final String loggerTypeName;
+		private final String loggerFactoryTypeName;
+		private final String loggerFactoryMethodName;
+
+		LoggingFramework(Class<? extends java.lang.annotation.Annotation> annotationClass, String loggerTypeName, String loggerFactoryTypeName, String loggerFactoryMethodName) {
+			this.annotationClass = annotationClass;
+			this.loggerTypeName = loggerTypeName;
+			this.loggerFactoryTypeName = loggerFactoryTypeName;
+			this.loggerFactoryMethodName = loggerFactoryMethodName;
+		}
+		
+		final Class<? extends java.lang.annotation.Annotation> getAnnotationClass() {
+			return annotationClass;
+		}
+		
+		final String getLoggerTypeName() {
+			return loggerTypeName;
+		}
+		
+		final String getLoggerFactoryTypeName() {
+			return loggerFactoryTypeName;
+		}
+		
+		final String getLoggerFactoryMethodName() {
+			return loggerFactoryMethodName;
+		}
+		
+		Expression createFactoryParameter(String typeName, Annotation source){
+			TypeReference type = createTypeReference(typeName, source);
+			ClassLiteralAccess result = new ClassLiteralAccess(source.sourceEnd, type);
+			Eclipse.setGeneratedBy(result, source);
+			return result;
+		};
+	}
+}

src/core/lombok/eclipse/handlers/HandleSynchronized.java

@@ -101,7 +101,7 @@ public class HandleSynchronized implements EclipseAnnotationHandler<Synchronized
 			fieldDecl.type = new QualifiedTypeReference(TypeConstants.JAVA_LANG_OBJECT, new long[] { 0, 0, 0 });
 			Eclipse.setGeneratedBy(fieldDecl.type, source);
 			fieldDecl.initialization = arrayAlloc;
-			injectField(annotationNode.up().up(), fieldDecl);
+			injectFieldSuppressWarnings(annotationNode.up().up(), fieldDecl);
 		}
 		
 		if (method.statements == null) return false;

src/core/lombok/javac/handlers/HandleLog.java

@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.javac.handlers;
+
+import static lombok.javac.handlers.JavacHandlerUtil.*;
+
+import java.lang.annotation.Annotation;
+
+import lombok.core.AnnotationValues;
+import lombok.core.AST.Kind;
+import lombok.javac.JavacAnnotationHandler;
+import lombok.javac.JavacNode;
+
+import org.mangosdk.spi.ProviderFor;
+
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.tree.TreeMaker;
+import com.sun.tools.javac.tree.JCTree.JCAnnotation;
+import com.sun.tools.javac.tree.JCTree.JCClassDecl;
+import com.sun.tools.javac.tree.JCTree.JCExpression;
+import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
+import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
+import com.sun.tools.javac.util.List;
+
+public class HandleLog {
+	
+	private HandleLog() {
+		throw new UnsupportedOperationException();
+	}
+	
+	public static boolean processAnnotation(LoggingFramework framework, AnnotationValues<?> annotation, JavacNode annotationNode) {
+		markAnnotationAsProcessed(annotationNode, framework.getAnnotationClass());
+		
+		String loggingClassName = annotation.getRawExpression("value");
+		if (loggingClassName == null) loggingClassName = "void";
+		if (loggingClassName.endsWith(".class")) loggingClassName = loggingClassName.substring(0, loggingClassName.length() - 6);
+		
+		JavacNode typeNode = annotationNode.up();
+		switch (typeNode.getKind()) {
+		case TYPE:
+			if ((((JCClassDecl)typeNode.get()).mods.flags & Flags.INTERFACE)!= 0) {
+				annotationNode.addError("@Log is legal only on classes and enums.");
+				return true;
+			}
+			
+			if (fieldExists("log", typeNode)!= MemberExistsResult.NOT_EXISTS) {
+				annotationNode.addWarning("Field 'log' already exists.");
+				return true;
+			}
+
+			if (loggingClassName.equals("void")) {
+				loggingClassName = getSelfName(typeNode);
+			}
+			createField(framework, typeNode, loggingClassName);
+			return true;
+		default:
+			annotationNode.addError("@Log is legal only on types.");
+			return true;
+		}
+	}
+	
+	private static String getSelfName(JavacNode typeNode) {
+		String typeName = ((JCClassDecl) typeNode.get()).name.toString();
+		JavacNode upType = typeNode.up();
+		while (upType.getKind() == Kind.TYPE) {
+			typeName = ((JCClassDecl) upType.get()).name.toString() + "." + typeName;
+			upType = upType.up();
+		}
+		
+		String packageDeclaration = typeNode.getPackageDeclaration();
+		if (packageDeclaration != null) {
+			typeName = packageDeclaration + "." + typeName;
+		}
+		return typeName;
+	}
+	
+	private static boolean createField(LoggingFramework framework, JavacNode typeNode, String loggerClassName) {
+		TreeMaker maker = typeNode.getTreeMaker();
+		
+		// 	private static final <loggerType> log = <factoryMethod>(<parameter>);
+		JCExpression loggerType = chainDotsString(maker, typeNode, framework.getLoggerTypeName());
+		JCExpression factoryMethod = chainDotsString(maker, typeNode, framework.getLoggerFactoryMethodName());
+		
+		JCExpression loggerName = framework.createFactoryParameter(typeNode, loggerClassName);
+		JCMethodInvocation factoryMethodCall = maker.Apply(List.<JCExpression>nil(), factoryMethod, List.<JCExpression>of(loggerName));
+		
+		JCVariableDecl fieldDecl = maker.VarDef(
+				maker.Modifiers(Flags.PRIVATE | Flags.FINAL | Flags.STATIC),
+				typeNode.toName("log"), loggerType, factoryMethodCall);
+		
+		injectField(typeNode, fieldDecl);
+		return true;
+	}
+	
+	/**
+	 * Handles the {@link lombok.commons.Log} annotation for javac.
+	 */
+	@ProviderFor(JavacAnnotationHandler.class)
+	public static class HandleCommonsLog implements JavacAnnotationHandler<lombok.commons.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.commons.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+			return processAnnotation(LoggingFramework.COMMONS, annotation, annotationNode);
+		}
+	}
+	
+	/**
+	 * Handles the {@link lombok.jul.Log} annotation for javac.
+	 */
+	@ProviderFor(JavacAnnotationHandler.class)
+	public static class HandleJulLog implements JavacAnnotationHandler<lombok.jul.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.jul.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+			return processAnnotation(LoggingFramework.JUL, annotation, annotationNode);
+		}
+	}	
+	
+	/**
+	 * Handles the {@link lombok.log4j.Log} annotation for javac.
+	 */
+	@ProviderFor(JavacAnnotationHandler.class)
+	public static class HandleLog4jLog implements JavacAnnotationHandler<lombok.log4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.log4j.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+			return processAnnotation(LoggingFramework.LOG4J, annotation, annotationNode);
+		}
+	}
+	
+	/**
+	 * Handles the {@link lombok.slf4j.Log} annotation for javac.
+	 */
+	@ProviderFor(JavacAnnotationHandler.class)
+	public static class HandleSlf4jLog implements JavacAnnotationHandler<lombok.slf4j.Log> {
+		@Override public boolean handle(AnnotationValues<lombok.slf4j.Log> annotation, JCAnnotation ast, JavacNode annotationNode) {
+			return processAnnotation(LoggingFramework.SLF4J, annotation, annotationNode);
+		}
+	}
+	
+	enum LoggingFramework {
+		// private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(TargetType.class);
+		COMMONS(lombok.jul.Log.class, "org.apache.commons.logging.Log", "org.apache.commons.logging.LogFactory.getLog"),
+		
+		// private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(TargetType.class.getName());
+		JUL(lombok.jul.Log.class, "java.util.logging.Logger", "java.util.logging.Logger.getLogger") {
+			@Override public JCExpression createFactoryParameter(JavacNode typeNode, String typeName) {
+				TreeMaker maker = typeNode.getTreeMaker();
+				JCExpression classAccess = super.createFactoryParameter(typeNode, typeName);
+				JCExpression method = maker.Select(classAccess, typeNode.toName("getName"));
+				return maker.Apply(List.<JCExpression>nil(), method, List.<JCExpression>nil());
+			}
+		},
+		
+		// private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(TargetType.class);
+		LOG4J(lombok.jul.Log.class, "org.apache.log4j.Logger", "org.apache.log4j.Logger.getLogger"),
+		
+		// private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TargetType.class);
+		SLF4J(lombok.slf4j.Log.class, "org.slf4j.Logger", "org.slf4j.LoggerFactory.getLogger"),
+		
+		;
+		
+		private final Class<? extends Annotation> annotationClass;
+		private final String loggerTypeName;
+		private final String loggerFactoryName;
+		
+		LoggingFramework(Class<? extends Annotation> annotationClass, String loggerTypeName, String loggerFactoryName) {
+			this.annotationClass = annotationClass;
+			this.loggerTypeName = loggerTypeName;
+			this.loggerFactoryName = loggerFactoryName;
+		}
+		
+		final Class<? extends Annotation> getAnnotationClass() {
+			return annotationClass;
+		}
+		
+		final String getLoggerTypeName() {
+			return loggerTypeName;
+		}
+		
+		final String getLoggerFactoryMethodName() {
+			return loggerFactoryName;
+		}
+		
+		JCExpression createFactoryParameter(JavacNode typeNode, String typeName) {
+			return chainDotsString(typeNode.getTreeMaker(), typeNode, typeName + ".class");
+		}
+	}
+}

src/core/lombok/javac/handlers/HandleSynchronized.java

@@ -89,7 +89,7 @@ public class HandleSynchronized implements JavacAnnotationHandler<Synchronized>
 			JCVariableDecl fieldDecl = maker.VarDef(
 					maker.Modifiers(Flags.PRIVATE | Flags.FINAL | (isStatic ? Flags.STATIC : 0)),
 					methodNode.toName(lockName), objectType, newObjectArray);
-			injectField(methodNode.up(), fieldDecl);
+			injectFieldSuppressWarnings(methodNode.up(), fieldDecl);
 		}
 		
 		if (method.body == null) return false;

src/core/lombok/javac/handlers/JavacHandlerUtil.java

@@ -390,15 +390,28 @@ public class JavacHandlerUtil {
 		return call;
 	}
 	
+	/**
+	 * Adds the given new field declaration to the provided type AST Node.
+	 * The field carries the @{@link SuppressWarnings}("all") annotation.
+	 * Also takes care of updating the JavacAST.
+	 */
+	public static void injectFieldSuppressWarnings(JavacNode typeNode, JCVariableDecl field) {
+		injectField(typeNode, field, true);
+	}
+	
 	/**
 	 * Adds the given new field declaration to the provided type AST Node.
 	 * 
 	 * Also takes care of updating the JavacAST.
 	 */
 	public static void injectField(JavacNode typeNode, JCVariableDecl field) {
+		injectField(typeNode, field, false);
+	}
+
+	private static void injectField(JavacNode typeNode, JCVariableDecl field, boolean addSuppressWarnings) {
 		JCClassDecl type = (JCClassDecl) typeNode.get();
 		
-		addSuppressWarningsAll(field.mods, typeNode, field.pos);
+		if (addSuppressWarnings) addSuppressWarningsAll(field.mods, typeNode, field.pos);
 		type.defs = type.defs.append(field);
 		
 		typeNode.add(field, Kind.FIELD).recursiveSetHandled();
@@ -476,6 +489,21 @@ public class JavacHandlerUtil {
 		
 		return e;
 	}
+
+	
+	/**
+	 * In javac, dotted access of any kind, from {@code java.lang.String} to {@code var.methodName}
+	 * is represented by a fold-left of {@code Select} nodes with the leftmost string represented by
+	 * a {@code Ident} node. This method generates such an expression.
+	 * 
+	 * For example, maker.Select(maker.Select(maker.Ident(NAME[java]), NAME[lang]), NAME[String]).
+	 * 
+	 * @see com.sun.tools.javac.tree.JCTree.JCIdent
+	 * @see com.sun.tools.javac.tree.JCTree.JCFieldAccess
+	 */
+	public static JCExpression chainDotsString(TreeMaker maker, JavacNode node, String elems) {
+		return chainDots(maker, node, elems.split("\\."));	
+	}
 	
 	/**
 	 * Searches the given field node for annotations and returns each one that matches the provided regular expression pattern.

src/core/lombok/jul/Log.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.jul;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	
+	Class<?> value() default void.class;
+}

src/core/lombok/log4j/Log.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.log4j;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	
+	Class<?> value() default void.class;
+}

src/core/lombok/slf4j/Log.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2010 Reinier Zwitserloot, Roel Spilker and Robbert Jan Grootjans.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.slf4j;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Log {
+	
+	Class<?> value() default void.class;
+}

src/delombok/lombok/delombok/PrettyCommentsPrinter.java

@@ -337,7 +337,7 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
      * Traversal methods
      *************************************************************************/
 
-    /** Exception to propogate IOException through visitXXX methods */
+    /** Exception to propagate IOException through visitXXX methods */
     private static class UncheckedIOException extends Error {
         static final long serialVersionUID = -4032692679158424751L;
         UncheckedIOException(IOException e) {

test/transform/resource/after-delombok/LoggerCommons.java

@@ -1,6 +1,9 @@
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 class LoggerCommons {
-	private static final Log log = LogFactory.getLog(LoggerCommons.class);
+	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
+}
+class LoggerCommonsString {
+	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class);
+}
+class LoggerCommonsJavaLangString {
+	private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class);
 }

test/transform/resource/after-delombok/LoggerJul.java

@@ -1,5 +1,9 @@
-import java.util.logging.Logger;
-
 class LoggerJul {
-	private static final Logger log = Logger.getLogger("LoggerJul");
+	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
+}
+class LoggerJulString {
+	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName());
+}
+class LoggerJulJavaLangString {
+	private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName());
 }

test/transform/resource/after-delombok/LoggerLog4j.java

@@ -1,5 +1,9 @@
-import org.apache.log4j.Logger;
-
 class LoggerLog4j {
-	private static final Logger log = Logger.getLogger(LoggerLog4j.class);
+	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
+}
+class LoggerLog4jString {
+	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class);
+}
+class LoggerLog4jJavaLangString {
+	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class);
 }

test/transform/resource/after-delombok/LoggerSlf4j.java

@@ -1,6 +1,8 @@
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class LoggerLog4j {
-	private static final Logger log = LoggerFactory.getLogger(LoggerLog4j.class);
+class LoggerSlf4j {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
+}
+class LoggerSlf4jOuter {
+	static class Inner {
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class);
+	}
 }

test/transform/resource/after-delombok/LoggerSlf4jAlreadyExists.java

@@ -0,0 +1,3 @@
+class LoggerSlf4jAlreadyExists {
+	int log;
+}

test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java

@@ -0,0 +1,3 @@
+class LoggerSlf4jClassOfArray {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class);
+}

test/transform/resource/after-delombok/LoggerSlf4jOnNonType.java

@@ -0,0 +1,4 @@
+class LoggerSlf4jOnNonType {
+	void foo() {
+	}
+}

test/transform/resource/after-delombok/LoggerSlf4jTypes.java

@@ -0,0 +1,17 @@
+interface LoggerSlf4jTypesInterface {
+}
+@interface LoggerSlf4jTypesAnnotation {
+}
+enum LoggerSlf4jTypesEnum {
+;
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
+}
+enum LoggerSlf4jTypesEnumWithElement {
+	FOO;
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
+}
+interface LoggerSlf4jTypesInterfaceOuter {
+	class Inner {
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class);
+	}
+}

test/transform/resource/after-delombok/LoggerSlf4jWithClass.java

@@ -0,0 +1,12 @@
+class LoggerSlf4jWithClass {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class);
+}
+class LoggerSlf4jWithClassList {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class);
+}
+class LoggerSlf4jWithClassValue {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class);
+}
+class LoggerSlf4jWithClassVoid {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class);
+}

test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java

@@ -0,0 +1,9 @@
+package before;
+class LoggerSlf4jWithPackage {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class);
+}
+class LoggerSlf4jWithPackageOuter {
+	static class Inner {
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class);
+	}
+}

test/transform/resource/after-delombok/ValInFor.java

@@ -15,6 +15,5 @@ public class ValInFor {
 			System.out.println(shouldBeString.toLowerCase());
 			val shouldBeString2 = shouldBeString;
 		}
-	}
-*/
+	}*/
 }

test/transform/resource/after-ecj/LoggerCommons.java

@@ -0,0 +1,24 @@
+@lombok.commons.Log class LoggerCommons {
+  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
+  <clinit>() {
+  }
+  LoggerCommons() {
+    super();
+  }
+}
+@lombok.commons.Log(String.class) class LoggerCommonsString {
+  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(String.class);
+  <clinit>() {
+  }
+  LoggerCommonsString() {
+    super();
+  }
+}
+@lombok.commons.Log(java.lang.String.class) class LoggerCommonsJavaLangString {
+  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(java.lang.String.class);
+  <clinit>() {
+  }
+  LoggerCommonsJavaLangString() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerJul.java

@@ -0,0 +1,24 @@
+@lombok.jul.Log class LoggerJul {
+  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
+  <clinit>() {
+  }
+  LoggerJul() {
+    super();
+  }
+}
+@lombok.jul.Log(String.class) class LoggerJulString {
+  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(String.class.getName());
+  <clinit>() {
+  }
+  LoggerJulString() {
+    super();
+  }
+}
+@lombok.jul.Log(java.lang.String.class) class LoggerJulJavaLangString {
+  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(java.lang.String.class.getName());
+  <clinit>() {
+  }
+  LoggerJulJavaLangString() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerLog4j.java

@@ -0,0 +1,24 @@
+@lombok.log4j.Log class LoggerLog4j {
+  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
+  <clinit>() {
+  }
+  LoggerLog4j() {
+    super();
+  }
+}
+@lombok.log4j.Log(String.class) class LoggerLog4jString {
+  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(String.class);
+  <clinit>() {
+  }
+  LoggerLog4jString() {
+    super();
+  }
+}
+@lombok.log4j.Log(java.lang.String.class) class LoggerLog4jJavaLangString {
+  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(java.lang.String.class);
+  <clinit>() {
+  }
+  LoggerLog4jJavaLangString() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4j.java

@@ -0,0 +1,21 @@
+@lombok.slf4j.Log class LoggerSlf4j {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
+  <clinit>() {
+  }
+  LoggerSlf4j() {
+    super();
+  }
+}
+class LoggerSlf4jOuter {
+  static @lombok.slf4j.Log class Inner {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class);
+    <clinit>() {
+    }
+    Inner() {
+      super();
+    }
+  }
+  LoggerSlf4jOuter() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4jAlreadyExists.java

@@ -0,0 +1,6 @@
+@lombok.slf4j.Log class LoggerSlf4jAlreadyExists {
+  int log;
+  LoggerSlf4jAlreadyExists() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java

@@ -0,0 +1,8 @@
+@lombok.slf4j.Log(String[].class) class LoggerSlf4jClassOfArray {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class);
+  <clinit>() {
+  }
+  LoggerSlf4jClassOfArray() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4jOnNonType.java

@@ -0,0 +1,7 @@
+class LoggerSlf4jOnNonType {
+  LoggerSlf4jOnNonType() {
+    super();
+  }
+  @lombok.slf4j.Log void foo() {
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4jTypes.java

@@ -0,0 +1,31 @@
+@lombok.slf4j.Log interface LoggerSlf4jTypesInterface {
+}
+@lombok.slf4j.Log @interface LoggerSlf4jTypesAnnotation {
+}
+@lombok.slf4j.Log enum LoggerSlf4jTypesEnum {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
+  <clinit>() {
+  }
+  LoggerSlf4jTypesEnum() {
+    super();
+  }
+}
+@lombok.slf4j.Log enum LoggerSlf4jTypesEnumWithElement {
+  FOO(),
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
+  <clinit>() {
+  }
+  LoggerSlf4jTypesEnumWithElement() {
+    super();
+  }
+}
+interface LoggerSlf4jTypesInterfaceOuter {
+  @lombok.slf4j.Log class Inner {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class);
+    <clinit>() {
+    }
+    Inner() {
+      super();
+    }
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4jWithClass.java

@@ -0,0 +1,32 @@
+@lombok.slf4j.Log(String.class) class LoggerSlf4jWithClass {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClass() {
+    super();
+  }
+}
+@lombok.slf4j.Log(java.util.List.class) class LoggerSlf4jWithClassList {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.util.List.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClassList() {
+    super();
+  }
+}
+@lombok.slf4j.Log(value = java.lang.String.class) class LoggerSlf4jWithClassValue {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClassValue() {
+    super();
+  }
+}
+@lombok.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithClassVoid() {
+    super();
+  }
+}

test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java

@@ -0,0 +1,22 @@
+package before;
+@lombok.slf4j.Log class LoggerSlf4jWithPackage {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class);
+  <clinit>() {
+  }
+  LoggerSlf4jWithPackage() {
+    super();
+  }
+}
+class LoggerSlf4jWithPackageOuter {
+  static @lombok.slf4j.Log class Inner {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class);
+    <clinit>() {
+    }
+    Inner() {
+      super();
+    }
+  }
+  LoggerSlf4jWithPackageOuter() {
+    super();
+  }
+}

test/transform/resource/after-ecj/SynchronizedPlain.java

@@ -19,6 +19,8 @@ class SynchronizedPlain1 {
 }
 class SynchronizedPlain2 {
   private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0];
+  <clinit>() {
+  }
   SynchronizedPlain2() {
     super();
   }

test/transform/resource/before/LoggerCommons.java

@@ -0,0 +1,11 @@
+@lombok.commons.Log
+class LoggerCommons {
+}
+
+@lombok.commons.Log(String.class)
+class LoggerCommonsString {
+}
+
+@lombok.commons.Log(java.lang.String.class)
+class LoggerCommonsJavaLangString {
+}

test/transform/resource/before/LoggerJul.java

@@ -0,0 +1,11 @@
+@lombok.jul.Log
+class LoggerJul {
+}
+
+@lombok.jul.Log(String.class)
+class LoggerJulString {
+}
+
+@lombok.jul.Log(java.lang.String.class)
+class LoggerJulJavaLangString {
+}

test/transform/resource/before/LoggerLog4j.java

@@ -0,0 +1,11 @@
+@lombok.log4j.Log
+class LoggerLog4j {
+}
+
+@lombok.log4j.Log(String.class)
+class LoggerLog4jString {
+}
+
+@lombok.log4j.Log(java.lang.String.class)
+class LoggerLog4jJavaLangString {
+}

test/transform/resource/before/LoggerSlf4j.java

@@ -0,0 +1,9 @@
+@lombok.slf4j.Log
+class LoggerSlf4j {
+}
+class LoggerSlf4jOuter {
+	@lombok.slf4j.Log
+	static class Inner {
+		
+	}
+}

test/transform/resource/before/LoggerSlf4jAlreadyExists.java

@@ -0,0 +1,4 @@
+@lombok.slf4j.Log
+class LoggerSlf4jAlreadyExists {
+	int log;
+}

test/transform/resource/before/LoggerSlf4jClassOfArray.java

@@ -0,0 +1,3 @@
+@lombok.slf4j.Log(String[].class)
+class LoggerSlf4jClassOfArray {
+}

test/transform/resource/before/LoggerSlf4jOnNonType.java

@@ -0,0 +1,5 @@
+class LoggerSlf4jOnNonType {
+	@lombok.slf4j.Log
+	void foo() {
+	}
+}

test/transform/resource/before/LoggerSlf4jTypes.java

@@ -0,0 +1,18 @@
+@lombok.slf4j.Log
+interface LoggerSlf4jTypesInterface {
+}
+@lombok.slf4j.Log
+@interface LoggerSlf4jTypesAnnotation {
+}
+@lombok.slf4j.Log
+enum LoggerSlf4jTypesEnum {
+}
+@lombok.slf4j.Log
+enum LoggerSlf4jTypesEnumWithElement {
+	FOO;
+}
+interface LoggerSlf4jTypesInterfaceOuter {
+	@lombok.slf4j.Log
+	class Inner {
+	}
+}

test/transform/resource/before/LoggerSlf4jWithClass.java

@@ -0,0 +1,12 @@
+@lombok.slf4j.Log(String.class)
+class LoggerSlf4jWithClass {
+}
+@lombok.slf4j.Log(java.util.List.class)
+class LoggerSlf4jWithClassList {
+}
+@lombok.slf4j.Log(value = java.lang.String.class)
+class LoggerSlf4jWithClassValue {
+}
+@lombok.slf4j.Log(void.class)
+class LoggerSlf4jWithClassVoid {
+}

test/transform/resource/before/LoggerSlf4jWithPackage.java

@@ -0,0 +1,9 @@
+package before;
+@lombok.slf4j.Log
+class LoggerSlf4jWithPackage {
+}
+class LoggerSlf4jWithPackageOuter {
+	@lombok.slf4j.Log
+	static class Inner {
+	}
+}

test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages

@@ -0,0 +1 @@
+1:1 WARNING Field 'log' already exists.

test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages

@@ -0,0 +1 @@
+2:9 ERROR @Log is not legal on non-static inner classes.

test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages

@@ -0,0 +1 @@
+2:9 ERROR @Log is legal only on types.

test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages

@@ -0,0 +1,2 @@
+1:1 ERROR @Log is legal only on classes and enums.
+4:1 ERROR @Log is legal only on classes and enums.

test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages

@@ -0,0 +1 @@
+1 warning Field 'log' already exists.

test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages

@@ -0,0 +1 @@
+2:9 ERROR @Log is not legal on non-static inner classes.

test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages

@@ -0,0 +1 @@
+2 error @Log is legal only on types.

test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages

@@ -0,0 +1,2 @@
+1 error @Log is legal only on classes and enums.
+4 error @Log is legal only on classes and enums.