Checkstyle and trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1083200 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oliver Heger 2011-03-19 16:01:06 +00:00
parent cd23f77879
commit 210709ed3d
1 changed files with 28 additions and 22 deletions

View File

@ -86,6 +86,7 @@ public ObjectUtils() {
* ObjectUtils.defaultIfNull(Boolean.TRUE, *) = Boolean.TRUE * ObjectUtils.defaultIfNull(Boolean.TRUE, *) = Boolean.TRUE
* </pre> * </pre>
* *
* @param <T> the type of the object
* @param object the {@code Object} to test, may be {@code null} * @param object the {@code Object} to test, may be {@code null}
* @param defaultValue the default value to return, may be {@code null} * @param defaultValue the default value to return, may be {@code null}
* @return {@code object} if it is not {@code null}, defaultValue otherwise * @return {@code object} if it is not {@code null}, defaultValue otherwise
@ -110,6 +111,7 @@ public static <T> T defaultIfNull(T object, T defaultValue) {
* ObjectUtils.firstNonNull() = null * ObjectUtils.firstNonNull() = null
* </pre> * </pre>
* *
* @param <T> the component type of the array
* @param values the values to test, may be {@code null} or empty * @param values the values to test, may be {@code null} or empty
* @return the first value from {@code values} which is not {@code null}, * @return the first value from {@code values} which is not {@code null},
* or {@code null} if there are no non-null values * or {@code null} if there are no non-null values
@ -299,6 +301,7 @@ public static String toString(Object obj, String nullStr) {
/** /**
* <p>Null safe comparison of Comparables.</p> * <p>Null safe comparison of Comparables.</p>
* *
* @param <T> type of the values processed by this method
* @param values the set of comparable values, may be null * @param values the set of comparable values, may be null
* @return * @return
* <ul> * <ul>
@ -323,6 +326,7 @@ public static <T extends Comparable<? super T>> T min(T... values) {
/** /**
* <p>Null safe comparison of Comparables.</p> * <p>Null safe comparison of Comparables.</p>
* *
* @param <T> type of the values processed by this method
* @param values the set of comparable values, may be null * @param values the set of comparable values, may be null
* @return * @return
* <ul> * <ul>
@ -348,6 +352,7 @@ public static <T extends Comparable<? super T>> T max(T... values) {
* <p>Null safe comparison of Comparables. * <p>Null safe comparison of Comparables.
* {@code null} is assumed to be less than a non-{@code null} value.</p> * {@code null} is assumed to be less than a non-{@code null} value.</p>
* *
* @param <T> type of the values processed by this method
* @param c1 the first comparable, may be null * @param c1 the first comparable, may be null
* @param c2 the second comparable, may be null * @param c2 the second comparable, may be null
* @return a negative value if c1 < c2, zero if c1 = c2 * @return a negative value if c1 < c2, zero if c1 = c2
@ -360,6 +365,7 @@ public static <T extends Comparable<? super T>> int compare(T c1, T c2) {
/** /**
* <p>Null safe comparison of Comparables.</p> * <p>Null safe comparison of Comparables.</p>
* *
* @param <T> type of the values processed by this method
* @param c1 the first comparable, may be null * @param c1 the first comparable, may be null
* @param c2 the second comparable, may be null * @param c2 the second comparable, may be null
* @param nullGreater if true {@code null} is considered greater * @param nullGreater if true {@code null} is considered greater