diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2010-11-11 02:03:38 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2010-11-11 02:03:38 +0100 |
| commit | ddf54dcfaea71e50ae32b45785b8624b9137843b (patch) | |
| tree | b43f5733c138eb9602b0db2b0f88270ce5fc633b /test/pretty | |
| parent | 1c323332493148f0aaa936e668e1b0da5d09c8be (diff) | |
| parent | eae3e45ae7dd965cc642d7f03b833574e974fc1b (diff) | |
| download | lombok-ddf54dcfaea71e50ae32b45785b8624b9137843b.tar.gz lombok-ddf54dcfaea71e50ae32b45785b8624b9137843b.tar.bz2 lombok-ddf54dcfaea71e50ae32b45785b8624b9137843b.zip | |
Merge branch 'master' into lazyinit
Conflicts:
src/core/lombok/javac/handlers/HandleGetter.java
Diffstat (limited to 'test/pretty')
| -rw-r--r-- | test/pretty/resource/after/Annotation.java | 2 | ||||
| -rw-r--r-- | test/pretty/resource/before/Annotation.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/pretty/resource/after/Annotation.java b/test/pretty/resource/after/Annotation.java index 06fe62b3..6b3b35b8 100644 --- a/test/pretty/resource/after/Annotation.java +++ b/test/pretty/resource/after/Annotation.java @@ -6,7 +6,7 @@ class Annotation { } public void method(@SuppressWarnings("unused") int x) { } - public void method2(@SuppressWarnings(value = {"unused"}) int y) { + public void method2(@SuppressWarnings({"unused"}) int y) { } public void method3(@SuppressWarnings({"unused", "unchecked"}) int z) { } diff --git a/test/pretty/resource/before/Annotation.java b/test/pretty/resource/before/Annotation.java index 24868acd..edd1a5e7 100644 --- a/test/pretty/resource/before/Annotation.java +++ b/test/pretty/resource/before/Annotation.java @@ -1,4 +1,3 @@ -//ignore @SuppressWarnings("all") class Annotation { @Override |