Fix conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/c04b1611 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/c04b1611 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/c04b1611 Branch: refs/heads/master Commit: c04b1611a671367ad90dde7fe24818cbc6c402be Parents: ceeb673 Author: jamesbognar <[email protected]> Authored: Sun Aug 28 12:22:19 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Sun Aug 28 12:22:19 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/juneau/transform/BeanFilter.java | 4 ++-- .../src/main/java/org/apache/juneau/transform/PojoSwap.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/c04b1611/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java index f9c7b37..80d8fd7 100644 --- a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java +++ b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java @@ -34,8 +34,8 @@ import org.apache.juneau.internal.*; * * <h6 class='topic'>Example</h6> * <p class='bcode'> - * <jc>// Create our serializer with a bean filter.</jc> - * WriterSerializer s = <jk>new</jk> JsonSerializer().addBeanFilters(AddressFilter.<jk>class</jk>); + * <jc>// Create our serializer with a bean filter.</jc> + * WriterSerializer s = <jk>new</jk> JsonSerializer().addBeanFilters(AddressFilter.<jk>class</jk>); * * Address a = <jk>new</jk> Address(); * String json = s.serialize(a); <jc>// Serializes only street, city, state.</jc> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/c04b1611/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java b/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java index f9aba47..6e846dc 100644 --- a/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java +++ b/juneau-core/src/main/java/org/apache/juneau/transform/PojoSwap.java @@ -199,7 +199,7 @@ public abstract class PojoSwap<T,S> { } /** - * Same as {@link #unswap(Object)}, but override this method if you need access to the real class type or the bean context that created this swap. + * Same as {@link #unswap(Object)}, but override this method if you need access to the real class type or the bean context that created this swap. * * @param f The transformed object. * @param hint If possible, the parser will try to tell you the object type being created. For example,
