diff options
Diffstat (limited to 'guava/src/com/google/common/base/Joiner.java')
-rw-r--r-- | guava/src/com/google/common/base/Joiner.java | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/guava/src/com/google/common/base/Joiner.java b/guava/src/com/google/common/base/Joiner.java index 8a2e9a2..048e477 100644 --- a/guava/src/com/google/common/base/Joiner.java +++ b/guava/src/com/google/common/base/Joiner.java @@ -56,9 +56,6 @@ import javax.annotation.Nullable; * joiner.skipNulls(); // does nothing! * return joiner.join("wrong", null, "wrong");}</pre> * - * <p>See the Guava User Guide article on <a href= - * "http://code.google.com/p/guava-libraries/wiki/StringsExplained#Joiner">{@code Joiner}</a>. - * * @author Kevin Bourrillion * @since 2.0 (imported from Google Collections Library) */ @@ -98,8 +95,7 @@ public class Joiner { */ @Beta @Deprecated - public - final <A extends Appendable, I extends Object & Iterable<?> & Iterator<?>> A + public final <A extends Appendable, I extends Object & Iterable<?> & Iterator<?>> A appendTo(A appendable, I parts) throws IOException { return appendTo(appendable, (Iterator<?>) parts); } @@ -118,6 +114,7 @@ public class Joiner { * * @since 11.0 */ + @Beta public <A extends Appendable> A appendTo(A appendable, Iterator<?> parts) throws IOException { checkNotNull(appendable); if (parts.hasNext()) { @@ -157,8 +154,7 @@ public class Joiner { */ @Beta @Deprecated - public - final <I extends Object & Iterable<?> & Iterator<?>> StringBuilder + public final <I extends Object & Iterable<?> & Iterator<?>> StringBuilder appendTo(StringBuilder builder, I parts) { return appendTo(builder, (Iterator<?>) parts); } @@ -179,6 +175,7 @@ public class Joiner { * * @since 11.0 */ + @Beta public final StringBuilder appendTo(StringBuilder builder, Iterator<?> parts) { try { appendTo((Appendable) builder, parts); @@ -217,8 +214,7 @@ public class Joiner { */ @Beta @Deprecated - public - final <I extends Object & Iterable<?> & Iterator<?>> String join(I parts) { + public final <I extends Object & Iterable<?> & Iterator<?>> String join(I parts) { return join((Iterator<?>) parts); } @@ -236,6 +232,7 @@ public class Joiner { * * @since 11.0 */ + @Beta public final String join(Iterator<?> parts) { return appendTo(new StringBuilder(), parts).toString(); } @@ -264,7 +261,7 @@ public class Joiner { public Joiner useForNull(final String nullText) { checkNotNull(nullText); return new Joiner(this) { - @Override CharSequence toString(@Nullable Object part) { + @Override CharSequence toString(Object part) { return (part == null) ? nullText : Joiner.this.toString(part); } @@ -391,8 +388,7 @@ public class Joiner { */ @Beta @Deprecated - public - <A extends Appendable, + public <A extends Appendable, I extends Object & Iterable<? extends Entry<?, ?>> & Iterator<? extends Entry<?, ?>>> A appendTo(A appendable, I entries) throws IOException { Iterator<? extends Entry<?, ?>> iterator = entries; @@ -448,8 +444,7 @@ public class Joiner { */ @Beta @Deprecated - public - <I extends Object & Iterable<? extends Entry<?, ?>> & Iterator<? extends Entry<?, ?>>> + public <I extends Object & Iterable<? extends Entry<?, ?>> & Iterator<? extends Entry<?, ?>>> StringBuilder appendTo(StringBuilder builder, I entries) throws IOException { Iterator<? extends Entry<?, ?>> iterator = entries; return appendTo(builder, iterator); @@ -495,8 +490,7 @@ public class Joiner { */ @Beta @Deprecated - public - <I extends Object & Iterable<? extends Entry<?, ?>> & Iterator<? extends Entry<?, ?>>> + public <I extends Object & Iterable<? extends Entry<?, ?>> & Iterator<? extends Entry<?, ?>>> String join(I entries) throws IOException { Iterator<? extends Entry<?, ?>> iterator = entries; return join(iterator); |