Merge branch 'acc2' into accessors

Conflicts:
	src/core/lombok/eclipse/handlers/HandleGetter.java
	src/core/lombok/eclipse/handlers/HandleSetter.java
	src/core/lombok/javac/handlers/HandleGetter.java
	src/core/lombok/javac/handlers/HandleSetter.java

2 files changed, 28 insertions, 0 deletions

diff --git a/test/transform/resource/after-ecj/GetterDeprecated.java b/test/transform/resource/after-ecj/GetterDeprecated.java
new file mode 100644
index 00000000..c19198dd
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterDeprecated.java
@@ -0,0 +1,14 @@
+import lombok.Getter;
+class GetterDeprecated {
+  @Deprecated @Getter int annotation;
+  @Getter int javadoc;
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getAnnotation() {
+    return this.annotation;
+  }
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") int getJavadoc() {
+    return this.javadoc;
+  }
+  GetterDeprecated() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/SetterDeprecated.java b/test/transform/resource/after-ecj/SetterDeprecated.java
new file mode 100644
index 00000000..b12ae34d
--- /dev/null
+++ b/test/transform/resource/after-ecj/SetterDeprecated.java
@@ -0,0 +1,14 @@
+import lombok.Setter;
+class SetterDeprecated {
+  @Deprecated @Setter int annotation;
+  @Setter int javadoc;
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setAnnotation(final int annotation) {
+    this.annotation = annotation;
+  }
+  public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJavadoc(final int javadoc) {
+    this.javadoc = javadoc;
+  }
+  SetterDeprecated() {
+    super();
+  }
+}