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

5 files changed, 12 insertions, 9 deletions

diff --git a/src/core/lombok/Getter.java b/src/core/lombok/Getter.java
index c812d824..86e14b93 100644
--- a/src/core/lombok/Getter.java
+++ b/src/core/lombok/Getter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 The Project Lombok Authors.
+ * Copyright (C) 2009-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -45,8 +45,8 @@ import java.lang.annotation.Target;
  * Note that fields of type {@code boolean} (but not {@code java.lang.Boolean}) will result in an
  * {@code isFoo} name instead of {@code getFoo}.
  * <p>
- * If any method named {@code getFoo}/{@code isFoo} exists, regardless of return type or parameters, no method is generated,
- * and instead a compiler warning is emitted.
+ * If any method named {@code getFoo}/{@code isFoo} (case insensitive) exists, regardless of return type or parameters,
+ * no method is generated, and instead a compiler warning is emitted.
  * <p>
  * This annotation can also be applied to a class, in which case it'll be as if all non-static fields that don't already have
  * a {@code @Getter} annotation have the annotation.
diff --git a/src/core/lombok/Setter.java b/src/core/lombok/Setter.java
index ed4c146c..a7318259 100644
--- a/src/core/lombok/Setter.java
+++ b/src/core/lombok/Setter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 The Project Lombok Authors.
+ * Copyright (C) 2009-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -42,8 +42,8 @@ import java.lang.annotation.Target;
  *     }
  * </pre>
  * 
- * If any method named {@code setFoo} exists, regardless of return type or parameters, no method is generated,
- * and instead a compiler warning is emitted.
+ * If any method named {@code setFoo} (case insensitive) exists, regardless of return type or parameters,
+ * no method is generated, and instead a compiler warning is emitted.
  * <p>
  * This annotation can also be applied to a class, in which case it'll be as if all non-static fields that don't already have
  * a {@code Setter} annotation have the annotation.
diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java
index 5731769a..eec41577 100644
--- a/src/core/lombok/eclipse/handlers/HandleConstructor.java
+++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java
@@ -228,6 +228,8 @@ public class HandleConstructor {
 		constructor.selector = ((TypeDeclaration)type.get()).name;
 		constructor.constructorCall = new ExplicitConstructorCall(ExplicitConstructorCall.ImplicitSuper);
 		setGeneratedBy(constructor.constructorCall, source);
+		constructor.constructorCall.sourceStart = source.sourceStart;
+		constructor.constructorCall.sourceEnd = source.sourceEnd;
 		constructor.thrownExceptions = null;
 		constructor.typeParameters = null;
 		constructor.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
diff --git a/src/core/lombok/experimental/Accessors.java b/src/core/lombok/experimental/Accessors.java
index 5b454273..b925e746 100644
--- a/src/core/lombok/experimental/Accessors.java
+++ b/src/core/lombok/experimental/Accessors.java
@@ -49,7 +49,8 @@ public @interface Accessors {
 	
 	/**
 	 * If present, only fields with any of the stated prefixes are given the getter/setter treatment.
-	 * Note that a prefix only counts if the next character is NOT a lowercase character. If multiple fields
+	 * Note that a prefix only counts if the next character is NOT a lowercase character or the last
+	 * letter of the prefix is not a letter (for instance an underscore). If multiple fields
 	 * all turn into the same name when the prefix is stripped, an error will be generated.
 	 */
 	String[] prefix() default {};
diff --git a/src/installer/lombok/installer/eclipse/EclipseLocation.java b/src/installer/lombok/installer/eclipse/EclipseLocation.java
index ebc661b8..bf44d1e8 100644
--- a/src/installer/lombok/installer/eclipse/EclipseLocation.java
+++ b/src/installer/lombok/installer/eclipse/EclipseLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 The Project Lombok Authors.
+ * Copyright (C) 2009-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -327,8 +327,8 @@ public class EclipseLocation extends IdeLocation {
 					}
 					
 					newContents.append(line).append(OS_NEWLINE);
-					br.close();
 				}
+				br.close();
 			} finally {
 				fis.close();
 			}