diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2015-11-17 00:01:29 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2015-11-17 00:01:29 +0100 |
| commit | 6a003350f61bbebc3a20d8b17b59df6d065ca648 (patch) | |
| tree | 8edcdb4fe1fd2b537e725048f8621d0569238ebd /test/transform/resource/before | |
| parent | 329202a37f1c4325117fe83eaf22368088254b60 (diff) | |
| parent | 22e1fb91d4699a0bacafcd9f74fdca6acd8b275b (diff) | |
| download | lombok-6a003350f61bbebc3a20d8b17b59df6d065ca648.tar.gz lombok-6a003350f61bbebc3a20d8b17b59df6d065ca648.tar.bz2 lombok-6a003350f61bbebc3a20d8b17b59df6d065ca648.zip | |
Merge branch 'master' of https://github.com/spacanowski/lombok into spacanowski-master
Conflicts:
test/transform/resource/after-delombok/BuilderSingularGuavaListsSets.java
test/transform/resource/after-ecj/BuilderSingularGuavaListsSets.java
Diffstat (limited to 'test/transform/resource/before')
| -rw-r--r-- | test/transform/resource/before/BuilderSingularGuavaListsSets.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/transform/resource/before/BuilderSingularGuavaListsSets.java b/test/transform/resource/before/BuilderSingularGuavaListsSets.java index 995c00e8..73e8018c 100644 --- a/test/transform/resource/before/BuilderSingularGuavaListsSets.java +++ b/test/transform/resource/before/BuilderSingularGuavaListsSets.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; +import com.google.common.collect.ImmutableTable; import lombok.Singular; @@ -11,4 +12,5 @@ class BuilderSingularGuavaListsSets<T> { @Singular private ImmutableCollection<? extends Number> frogs; @SuppressWarnings("all") @Singular("rawSet") private ImmutableSet rawSet; @Singular private ImmutableSortedSet<String> passes; + @Singular private ImmutableTable<? extends Number, ? extends Number, String> users; } |