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

src/lombok/eclipse/handlers/HandleData.java

@@ -119,7 +119,7 @@ public class HandleData implements EclipseAnnotationHandler<Data> {
 			if ( (fieldDecl.modifiers & ClassFileConstants.AccTransient) == 0 ) nodesForEquality.add(child);
 			boolean isFinal = (fieldDecl.modifiers & ClassFileConstants.AccFinal) != 0;
 			nodesForToString.add(child);
-			if ( isFinal ) nodesForConstructor.add(child);
+			if ( isFinal && fieldDecl.initialization == null ) nodesForConstructor.add(child);
 			new HandleGetter().generateGetterForField(child, annotationNode.get());
 			if ( !isFinal ) new HandleSetter().generateSetterForField(child, annotationNode.get());
 		}

src/lombok/javac/handlers/HandleData.java

@@ -87,7 +87,7 @@ public class HandleData implements JavacAnnotationHandler<Data> {
 			if ( (fieldFlags & Flags.TRANSIENT) == 0 ) nodesForEquality = nodesForEquality.append(child);
 			boolean isFinal = (fieldFlags & Flags.FINAL) != 0;
 			nodesForToString = nodesForToString.append(child);
-			if ( isFinal ) nodesForConstructor = nodesForConstructor.append(child);
+			if ( isFinal && fieldDecl.init == null ) nodesForConstructor = nodesForConstructor.append(child);
 			new HandleGetter().generateGetterForField(child, annotationNode.get());
 			if ( !isFinal ) new HandleSetter().generateSetterForField(child, annotationNode.get());
 		}

usage_examples/GetterSetterExample_post.jpage

@@ -3,7 +3,7 @@ public class GetterSetterExample {
 	private String name;
 	
 	@Override public String toString() {
-		return String.format("%s (age: %d)", age, name);
+		return String.format("%s (age: %d)", name, age);
 	}
 	
 	public int getAge() {

usage_examples/GetterSetterExample_pre.jpage

@@ -7,6 +7,6 @@ public class GetterSetterExample {
 	private @Setter(AccessLevel.PROTECTED) String name;
 	
 	@Override public String toString() {
-		return String.format("%s (age: %d)", age, name);
+		return String.format("%s (age: %d)", name, age);
 	}
 }