diff options
| author | Jan Rieke <rieke@subshell.com> | 2017-03-13 16:49:20 +0100 |
|---|---|---|
| committer | Jan Rieke <rieke@subshell.com> | 2017-03-13 16:49:20 +0100 |
| commit | 2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8 (patch) | |
| tree | 238b9877ce1daa83b3e8d422eb4d2f7ab89f3864 /test/transform/resource/after-ecj/WitherWithGenerics.java | |
| parent | f51bbce3e396a0151bc0242d00e250f2bc720316 (diff) | |
| parent | a2c10c70fa8e2c8736464a5c3d445e2ca6e8a296 (diff) | |
| download | lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.tar.gz lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.tar.bz2 lombok-2346b15c8d2809b6efa9fc94f4f6cc56dcaa54b8.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/core/lombok/eclipse/handlers/HandleBuilder.java
# src/core/lombok/eclipse/handlers/HandleConstructor.java
# src/core/lombok/javac/handlers/HandleBuilder.java
# src/core/lombok/javac/handlers/HandleConstructor.java
Diffstat (limited to 'test/transform/resource/after-ecj/WitherWithGenerics.java')
| -rw-r--r-- | test/transform/resource/after-ecj/WitherWithGenerics.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/transform/resource/after-ecj/WitherWithGenerics.java b/test/transform/resource/after-ecj/WitherWithGenerics.java index 904e005a..66d8a8f8 100644 --- a/test/transform/resource/after-ecj/WitherWithGenerics.java +++ b/test/transform/resource/after-ecj/WitherWithGenerics.java @@ -6,13 +6,13 @@ class WitherWithGenerics<T, J extends T, L extends java.lang.Number> { public WitherWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) { super(); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest(final J test) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest(final J test) { return ((this.test == test) ? this : new WitherWithGenerics<T, J, L>(test, this.test2, this.test3)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) { return ((this.test2 == test2) ? this : new WitherWithGenerics<T, J, L>(this.test, test2, this.test3)); } - public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { + public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") WitherWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) { return ((this.test3 == test3) ? this : new WitherWithGenerics<T, J, L>(this.test, this.test2, test3)); } } |