In delombok mode, @Accessors is now eliminated from your source files.

2 files changed, 42 insertions, 7 deletions

diff --git a/src/core/lombok/javac/handlers/HandleAccessors.java b/src/core/lombok/javac/handlers/HandleAccessors.java
new file mode 100644
index 00000000..f642d64d
--- /dev/null
+++ b/src/core/lombok/javac/handlers/HandleAccessors.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 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
+ * 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.deleteAnnotationIfNeccessary;
+
+import org.mangosdk.spi.ProviderFor;
+
+import com.sun.tools.javac.tree.JCTree.JCAnnotation;
+
+import lombok.core.AnnotationValues;
+import lombok.experimental.Accessors;
+import lombok.javac.JavacAnnotationHandler;
+import lombok.javac.JavacNode;
+
+@ProviderFor(JavacAnnotationHandler.class)
+public class HandleAccessors extends JavacAnnotationHandler<Accessors> {
+	@Override public void handle(AnnotationValues<Accessors> annotation, JCAnnotation ast, JavacNode annotationNode) {
+		// Accessors itself is handled by HandleGetter/Setter; this is just to ensure that the annotation is removed
+		// from the AST when delomboking.
+		deleteAnnotationIfNeccessary(annotationNode, Accessors.class);
+	}
+}
diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index e96f2f62..71c4c92e 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -1,5 +1,4 @@
 class AccessorsFluent {
-	@lombok.experimental.Accessors(fluent = true)
 	private String fieldName = "";
 	
 	@java.lang.SuppressWarnings("all")
@@ -14,10 +13,8 @@ class AccessorsFluent {
 	}
 }
 
-@lombok.experimental.Accessors(fluent = true)
 class AccessorsFluentOnClass {
 	private String fieldName = "";
-	@lombok.experimental.Accessors
 	private String otherFieldWithOverride = "";
 	
 	@java.lang.SuppressWarnings("all")
@@ -38,7 +35,6 @@ class AccessorsFluentOnClass {
 }
 
 class AccessorsChain {
-	@lombok.experimental.Accessors(chain = true)
 	private boolean isRunning;
 	
 	@java.lang.SuppressWarnings("all")
@@ -48,7 +44,6 @@ class AccessorsChain {
 	}
 }
 
-@lombok.experimental.Accessors(prefix = "f")
 class AccessorsPrefix {
 	
 	private String fieldName;
@@ -60,7 +55,6 @@ class AccessorsPrefix {
 	}
 }
 
-@lombok.experimental.Accessors(prefix = {"f", ""})
 class AccessorsPrefix2 {
 	
 	private String fieldName;
@@ -77,7 +71,6 @@ class AccessorsPrefix2 {
 	}
 }
 
-@lombok.experimental.Accessors(prefix = "f")
 class AccessorsPrefix3 {
 	private String fName;