diff options
author | Roel Spilker <r.spilker@gmail.com> | 2013-11-19 21:02:59 +0100 |
---|---|---|
committer | Roel Spilker <r.spilker@gmail.com> | 2013-11-19 21:02:59 +0100 |
commit | 78b2d6919e35887940f9f11b6ae1731245739b83 (patch) | |
tree | 0dc305883c19a862a38669374c5614e26480d4b8 /test/transform/resource/before/GetterSetterJavadoc.java | |
parent | 5deb185591904d275cb06eea85c0d739587fc738 (diff) | |
parent | 83b7e77b0cce6cd5993b17f36164271accdd281c (diff) | |
download | lombok-78b2d6919e35887940f9f11b6ae1731245739b83.tar.gz lombok-78b2d6919e35887940f9f11b6ae1731245739b83.tar.bz2 lombok-78b2d6919e35887940f9f11b6ae1731245739b83.zip |
Merge branch 'master' of github.com:rzwitserloot/lombok
Conflicts:
src/delombok/lombok/delombok/DelombokApp.java
Diffstat (limited to 'test/transform/resource/before/GetterSetterJavadoc.java')
-rw-r--r-- | test/transform/resource/before/GetterSetterJavadoc.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/transform/resource/before/GetterSetterJavadoc.java b/test/transform/resource/before/GetterSetterJavadoc.java index e3ae0aac..0dc64092 100644 --- a/test/transform/resource/before/GetterSetterJavadoc.java +++ b/test/transform/resource/before/GetterSetterJavadoc.java @@ -3,11 +3,11 @@ class GetterSetterJavadoc1 { /** * Some text * - * @param fieldName Hello, World + * @param fieldName Hello, World1 * --- GETTER --- * Getter section * - * @return Sky is blue + * @return Sky is blue1 */ private int fieldName; } @@ -16,8 +16,8 @@ class GetterSetterJavadoc2 { /** * Some text * - * @param fieldName Hello, World - * @return Sky is blue + * @param fieldName Hello, World2 + * @return Sky is blue2 */ @lombok.Getter @lombok.Setter private int fieldName; } @@ -28,10 +28,10 @@ class GetterSetterJavadoc3 { * * **SETTER** * Setter section - * @param fieldName Hello, World + * @param fieldName Hello, World3 * **GETTER** * Getter section - * @return Sky is blue + * @return Sky is blue3 */ @lombok.Getter @lombok.Setter private int fieldName; } |