Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 16 insertions, 0 deletions

diff --git a/test/transform/resource/before/OnXJava7Style.java b/test/transform/resource/before/OnXJava7Style.java
new file mode 100644
index 00000000..6a3c35ff
--- /dev/null
+++ b/test/transform/resource/before/OnXJava7Style.java
@@ -0,0 +1,16 @@
+//version :7
+public class OnXJava7Style {
+	@interface Foo {
+		String value() default "";
+	}
+
+	@interface Bar {
+		String stuff() default "";
+	}
+
+	@lombok.Getter(onMethod=@__(@Foo)) String a;
+	@lombok.Setter(onMethod=@__(@Foo())) String b;
+	@lombok.Setter(onParam=@__(@Foo("a"))) String c;
+	@lombok.Setter(onParam=@__(@Bar(stuff="b"))) String d;
+	@lombok.Getter(onMethod=@__({@Foo(value="c"), @Bar(stuff="d")})) String e;
+}