added tests for new javadoc behaviour, javac implementation of copying javadoc for getters/setters, and fixed pretty printer to no longer inject an extra newline at the top of javadoc.

10 files changed, 212 insertions, 6 deletions

diff --git a/test/transform/resource/after-delombok/CommentsInterspersed.java b/test/transform/resource/after-delombok/CommentsInterspersed.java
index 5aaafe42..833f2ce0 100644
--- a/test/transform/resource/after-delombok/CommentsInterspersed.java
+++ b/test/transform/resource/after-delombok/CommentsInterspersed.java
@@ -1,9 +1,13 @@
 /* cmt *//* cmt2 */ /* cmt3 */ /*bla */
 public class CommentsInterspersed {
-	/** javadoc for field */
+	/**
+	 * javadoc for field
+	 */
 	private int x;
 	/* bla2 */ private String test = "foo"; //$NON-NLS-1$
-	/** Javadoc on method */
+	/**
+	 * Javadoc on method
+	 */
 	public native void gwtTest(); /*-{
 		javascript;
 	}-*/
diff --git a/test/transform/resource/after-delombok/DelegateWithDeprecated.java b/test/transform/resource/after-delombok/DelegateWithDeprecated.java
index 04e12160..f7bd1e6d 100644
--- a/test/transform/resource/after-delombok/DelegateWithDeprecated.java
+++ b/test/transform/resource/after-delombok/DelegateWithDeprecated.java
@@ -3,7 +3,9 @@ class DelegateWithDeprecated {
 	private interface Bar {
 		@Deprecated
 		void deprecatedAnnotation();
-		/** @deprecated */
+		/**
+		 * @deprecated
+		 */
 		void deprecatedComment();
 		void notDeprecated();
 	}
diff --git a/test/transform/resource/after-delombok/GetterDeprecated.java b/test/transform/resource/after-delombok/GetterDeprecated.java
index 3387540f..09ea9929 100644
--- a/test/transform/resource/after-delombok/GetterDeprecated.java
+++ b/test/transform/resource/after-delombok/GetterDeprecated.java
@@ -10,6 +10,9 @@ class GetterDeprecated {
 	public int getAnnotation() {
 		return this.annotation;
 	}
+	/**
+	 * @deprecated
+	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
 	public int getJavadoc() {
diff --git a/test/transform/resource/after-delombok/GetterSetterJavadoc.java b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
new file mode 100644
index 00000000..7bf92d1f
--- /dev/null
+++ b/test/transform/resource/after-delombok/GetterSetterJavadoc.java
@@ -0,0 +1,100 @@
+class GetterSetterJavadoc1 {
+	/**
+	 * Some text
+	 */
+	private int fieldName;
+	@java.lang.SuppressWarnings("all")
+	public GetterSetterJavadoc1() {
+	}
+	/**
+	 * Getter section
+	 *
+	 * @return Sky is blue
+	 */
+	@java.lang.SuppressWarnings("all")
+	public int getFieldName() {
+		return this.fieldName;
+	}
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World
+	 */
+	@java.lang.SuppressWarnings("all")
+	public void setFieldName(final int fieldName) {
+		this.fieldName = fieldName;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public boolean equals(final java.lang.Object o) {
+		if (o == this) return true;
+		if (!(o instanceof GetterSetterJavadoc1)) return false;
+		final GetterSetterJavadoc1 other = (GetterSetterJavadoc1)o;
+		if (!other.canEqual((java.lang.Object)this)) return false;
+		if (this.getFieldName() != other.getFieldName()) return false;
+		return true;
+	}
+	@java.lang.SuppressWarnings("all")
+	public boolean canEqual(final java.lang.Object other) {
+		return other instanceof GetterSetterJavadoc1;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = result * PRIME + this.getFieldName();
+		return result;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "GetterSetterJavadoc1(fieldName=" + this.getFieldName() + ")";
+	}
+}
+class GetterSetterJavadoc2 {
+	/**
+	 * Some text
+	 */
+	private int fieldName;
+	/**
+	 * Some text
+	 *
+	 * @return Sky is blue
+	 */
+	@java.lang.SuppressWarnings("all")
+	public int getFieldName() {
+		return this.fieldName;
+	}
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World
+	 */
+	@java.lang.SuppressWarnings("all")
+	public void setFieldName(final int fieldName) {
+		this.fieldName = fieldName;
+	}
+}
+class GetterSetterJavadoc3 {
+	/**
+	 * Some text
+	 */
+	private int fieldName;
+	/**
+	 * Getter section
+	 * @return Sky is blue
+	 */
+	@java.lang.SuppressWarnings("all")
+	public int getFieldName() {
+		return this.fieldName;
+	}
+	/**
+	 * Setter section
+	 * @param fieldName Hello, World
+	 */
+	@java.lang.SuppressWarnings("all")
+	public void setFieldName(final int fieldName) {
+		this.fieldName = fieldName;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/JavadocGenerally.java b/test/transform/resource/after-delombok/JavadocGenerally.java
new file mode 100644
index 00000000..729cdce3
--- /dev/null
+++ b/test/transform/resource/after-delombok/JavadocGenerally.java
@@ -0,0 +1,24 @@
+/**
+ * Doc on package
+ */
+package testPackage;
+/** Weird doc */
+/**
+ * Doc on class
+ */
+class JavadocGenerally {
+	/**
+	 * Doc on field
+	 */
+	private int someField;
+	/**
+	 * Doc on method
+	 */
+	public void test() {
+	}
+	/**
+	 * Doc on inner
+	 */
+	public interface TestingInner {
+	}
+}
diff --git a/test/transform/resource/after-delombok/SetterDeprecated.java b/test/transform/resource/after-delombok/SetterDeprecated.java
index 5a6cf9f3..72a609ad 100644
--- a/test/transform/resource/after-delombok/SetterDeprecated.java
+++ b/test/transform/resource/after-delombok/SetterDeprecated.java
@@ -10,6 +10,9 @@ class SetterDeprecated {
 	public void setAnnotation(final int annotation) {
 		this.annotation = annotation;
 	}
+	/**
+	 * @deprecated
+	 */
 	@java.lang.Deprecated
 	@java.lang.SuppressWarnings("all")
 	public void setJavadoc(final int javadoc) {
diff --git a/test/transform/resource/before/CommentsInterspersed.java b/test/transform/resource/before/CommentsInterspersed.java
index e7898aaa..23a1060b 100644
--- a/test/transform/resource/before/CommentsInterspersed.java
+++ b/test/transform/resource/before/CommentsInterspersed.java
@@ -1,12 +1,16 @@
 import  /* cmt */   lombok./* cmt2 */Getter   /* cmt3 */   ;
 
 public /*bla */ class CommentsInterspersed {
-	/** javadoc for field */
+	/**
+	 * javadoc for field
+	 */
 	private int x;
 	
 	private /* bla2 */ @Getter String test = "foo"; //$NON-NLS-1$
 	
-	/** Javadoc on method */
+	/**
+	 * Javadoc on method
+	 */
 	public native void gwtTest(); /*-{
 		javascript;
 	}-*/
diff --git a/test/transform/resource/before/DelegateWithDeprecated.java b/test/transform/resource/before/DelegateWithDeprecated.java
index b748c6ec..064e951d 100644
--- a/test/transform/resource/before/DelegateWithDeprecated.java
+++ b/test/transform/resource/before/DelegateWithDeprecated.java
@@ -6,7 +6,9 @@ class DelegateWithDeprecated {
 	private interface Bar {
 		@Deprecated
 		void deprecatedAnnotation();
-		/** @deprecated */
+		/**
+		 * @deprecated
+		 */
 		void deprecatedComment();
 		void notDeprecated();
 	}
diff --git a/test/transform/resource/before/GetterSetterJavadoc.java b/test/transform/resource/before/GetterSetterJavadoc.java
new file mode 100644
index 00000000..e3ae0aac
--- /dev/null
+++ b/test/transform/resource/before/GetterSetterJavadoc.java
@@ -0,0 +1,37 @@
+@lombok.Data
+class GetterSetterJavadoc1 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World
+	 * --- GETTER ---
+	 * Getter section
+	 *
+	 * @return Sky is blue
+	 */
+	private int fieldName;
+}
+
+class GetterSetterJavadoc2 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World
+	 * @return Sky is blue
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
+
+class GetterSetterJavadoc3 {
+	/**
+	 * Some text
+	 *
+	 * **SETTER**
+	 * Setter section
+	 * @param fieldName Hello, World
+	 * **GETTER**
+	 * Getter section
+	 * @return Sky is blue
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
diff --git a/test/transform/resource/before/JavadocGenerally.java b/test/transform/resource/before/JavadocGenerally.java
new file mode 100644
index 00000000..ee015acf
--- /dev/null
+++ b/test/transform/resource/before/JavadocGenerally.java
@@ -0,0 +1,27 @@
+/**
+ * Doc on package
+ */
+package testPackage;
+
+/** Weird doc */
+/**
+ * Doc on class
+ */
+class JavadocGenerally {
+	/**
+	 * Doc on field
+	 */
+	private int someField;
+
+	/**
+	 * Doc on method
+	 */
+	public void test() {
+	}
+
+	/**
+	 * Doc on inner
+	 */
+	public interface TestingInner {
+	}
+}