diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2010-11-10 01:52:07 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2010-11-10 01:52:07 +0100 |
| commit | 3d4b27d6d288ecb418a2a1a09ed43cae90ec548e (patch) | |
| tree | aae5dd4b466ff6e6f3390e6ab8eb16e5f6d4d9cf /test | |
| parent | fe7f0db2fce7b4c80853b9aed100908ff1f55f40 (diff) | |
| parent | 57de0c3f6636181541a7712e8d506828420c13d1 (diff) | |
| download | lombok-3d4b27d6d288ecb418a2a1a09ed43cae90ec548e.tar.gz lombok-3d4b27d6d288ecb418a2a1a09ed43cae90ec548e.tar.bz2 lombok-3d4b27d6d288ecb418a2a1a09ed43cae90ec548e.zip | |
Merge branch 'master' into annoGetSet
Conflicts:
src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
Diffstat (limited to 'test')
5 files changed, 22 insertions, 8 deletions
diff --git a/test/transform/resource/after-delombok/CleanupName.java b/test/transform/resource/after-delombok/CleanupName.java index 0201008e..37a8d117 100644 --- a/test/transform/resource/after-delombok/CleanupName.java +++ b/test/transform/resource/after-delombok/CleanupName.java @@ -4,7 +4,7 @@ class CleanupName { try { System.out.println(o); } finally { - if (o != null) { + if (lombok.Lombok.preventNullAnalysis(o) != null) { o.toString(); } } @@ -14,7 +14,7 @@ class CleanupName { try { System.out.println(o); } finally { - if (o != null) { + if (lombok.Lombok.preventNullAnalysis(o) != null) { o.toString(); } } diff --git a/test/transform/resource/after-delombok/CleanupPlain.java b/test/transform/resource/after-delombok/CleanupPlain.java index 1a19442f..67c82f60 100644 --- a/test/transform/resource/after-delombok/CleanupPlain.java +++ b/test/transform/resource/after-delombok/CleanupPlain.java @@ -9,12 +9,12 @@ class CleanupPlain { out.flush(); } } finally { - if (out != null) { + if (lombok.Lombok.preventNullAnalysis(out) != null) { out.close(); } } } finally { - if (in != null) { + if (lombok.Lombok.preventNullAnalysis(in) != null) { in.close(); } } diff --git a/test/transform/resource/after-ecj/CleanupName.java b/test/transform/resource/after-ecj/CleanupName.java index 4011721b..8948e91d 100644 --- a/test/transform/resource/after-ecj/CleanupName.java +++ b/test/transform/resource/after-ecj/CleanupName.java @@ -10,7 +10,7 @@ class CleanupName { } finally { - if ((o != null)) + if ((lombok.Lombok.preventNullAnalysis(o) != null)) { o.toString(); } @@ -24,7 +24,7 @@ class CleanupName { } finally { - if ((o != null)) + if ((lombok.Lombok.preventNullAnalysis(o) != null)) { o.toString(); } diff --git a/test/transform/resource/after-ecj/CleanupPlain.java b/test/transform/resource/after-ecj/CleanupPlain.java index fe8d7571..6eaa4377 100644 --- a/test/transform/resource/after-ecj/CleanupPlain.java +++ b/test/transform/resource/after-ecj/CleanupPlain.java @@ -18,7 +18,7 @@ class CleanupPlain { } finally { - if ((out != null)) + if ((lombok.Lombok.preventNullAnalysis(out) != null)) { out.close(); } @@ -26,7 +26,7 @@ class CleanupPlain { } finally { - if ((in != null)) + if ((lombok.Lombok.preventNullAnalysis(in) != null)) { in.close(); } diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java index 7cb60148..4dbac075 100644 --- a/test/transform/resource/after-ecj/DataPlain.java +++ b/test/transform/resource/after-ecj/DataPlain.java @@ -179,6 +179,13 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) { return (other instanceof Data5); } + public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + int result = 1; + return result; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return "Data5()"; + } } final @Data class Data6 { public @java.lang.SuppressWarnings("all") Data6() { @@ -191,4 +198,11 @@ final @Data class Data6 { return false; return true; } + public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() { + int result = 1; + return result; + } + public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { + return "Data6()"; + } }
\ No newline at end of file |