You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/01/22 08:07:46 UTC
svn commit: r1436768 [4/13] - in /commons/proper/lang/trunk/src:
main/java/org/apache/commons/lang3/
main/java/org/apache/commons/lang3/builder/
main/java/org/apache/commons/lang3/concurrent/
main/java/org/apache/commons/lang3/event/ main/java/org/apac...
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/LocaleUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/LocaleUtils.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/LocaleUtils.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/LocaleUtils.java Tue Jan 22 07:07:42 2013
@@ -161,7 +161,7 @@ public class LocaleUtils {
* @param locale the locale to start from
* @return the unmodifiable list of Locale objects, 0 being locale, not null
*/
- public static List<Locale> localeLookupList(Locale locale) {
+ public static List<Locale> localeLookupList(final Locale locale) {
return localeLookupList(locale, locale);
}
@@ -183,7 +183,7 @@ public class LocaleUtils {
* @param defaultLocale the default locale to use if no other is found
* @return the unmodifiable list of Locale objects, 0 being locale, not null
*/
- public static List<Locale> localeLookupList(Locale locale, Locale defaultLocale) {
+ public static List<Locale> localeLookupList(final Locale locale, final Locale defaultLocale) {
List<Locale> list = new ArrayList<Locale>(4);
if (locale != null) {
list.add(locale);
@@ -235,7 +235,7 @@ public class LocaleUtils {
* @param locale the Locale object to check if it is available
* @return true if the locale is a known locale
*/
- public static boolean isAvailableLocale(Locale locale) {
+ public static boolean isAvailableLocale(final Locale locale) {
return availableLocaleList().contains(locale);
}
@@ -249,7 +249,7 @@ public class LocaleUtils {
* @param countryCode the 2 letter country code, null returns empty
* @return an unmodifiable List of Locale objects, not null
*/
- public static List<Locale> languagesByCountry(String countryCode) {
+ public static List<Locale> languagesByCountry(final String countryCode) {
if (countryCode == null) {
return Collections.emptyList();
}
@@ -281,7 +281,7 @@ public class LocaleUtils {
* @param languageCode the 2 letter language code, null returns empty
* @return an unmodifiable List of Locale objects, not null
*/
- public static List<Locale> countriesByLanguage(String languageCode) {
+ public static List<Locale> countriesByLanguage(final String languageCode) {
if (languageCode == null) {
return Collections.emptyList();
}
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ObjectUtils.java Tue Jan 22 07:07:42 2013
@@ -90,7 +90,7 @@ public class ObjectUtils {
* @param defaultValue the default value to return, may be {@code null}
* @return {@code object} if it is not {@code null}, defaultValue otherwise
*/
- public static <T> T defaultIfNull(T object, T defaultValue) {
+ public static <T> T defaultIfNull(final T object, final T defaultValue) {
return object != null ? object : defaultValue;
}
@@ -116,7 +116,7 @@ public class ObjectUtils {
* or {@code null} if there are no non-null values
* @since 3.0
*/
- public static <T> T firstNonNull(T... values) {
+ public static <T> T firstNonNull(final T... values) {
if (values != null) {
for (T val : values) {
if (val != null) {
@@ -148,7 +148,7 @@ public class ObjectUtils {
* @param object2 the second object, may be {@code null}
* @return {@code true} if the values of both objects are the same
*/
- public static boolean equals(Object object1, Object object2) {
+ public static boolean equals(final Object object1, final Object object2) {
if (object1 == object2) {
return true;
}
@@ -177,7 +177,7 @@ public class ObjectUtils {
* @param object2 the second object, may be {@code null}
* @return {@code false} if the values of both objects are the same
*/
- public static boolean notEqual(Object object1, Object object2) {
+ public static boolean notEqual(final Object object1, final Object object2) {
return ObjectUtils.equals(object1, object2) == false;
}
@@ -194,7 +194,7 @@ public class ObjectUtils {
* @return the hash code of the object, or zero if null
* @since 2.1
*/
- public static int hashCode(Object obj) {
+ public static int hashCode(final Object obj) {
// hashCode(Object) retained for performance, as hash code is often critical
return obj == null ? 0 : obj.hashCode();
}
@@ -219,7 +219,7 @@ public class ObjectUtils {
* @return the hash code of the objects, or zero if null
* @since 3.0
*/
- public static int hashCodeMulti(Object... objects) {
+ public static int hashCodeMulti(final Object... objects) {
int hash = 1;
if (objects != null) {
for (Object object : objects) {
@@ -247,7 +247,7 @@ public class ObjectUtils {
* @return the default toString text, or {@code null} if
* {@code null} passed in
*/
- public static String identityToString(Object object) {
+ public static String identityToString(final Object object) {
if (object == null) {
return null;
}
@@ -271,7 +271,7 @@ public class ObjectUtils {
* @param object the object to create a toString for
* @since 2.4
*/
- public static void identityToString(StringBuffer buffer, Object object) {
+ public static void identityToString(final StringBuffer buffer, final Object object) {
if (object == null) {
throw new NullPointerException("Cannot get the toString of a null identity");
}
@@ -299,7 +299,7 @@ public class ObjectUtils {
* @return the passed in Object's toString, or {@code ""} if {@code null} input
* @since 2.0
*/
- public static String toString(Object obj) {
+ public static String toString(final Object obj) {
return obj == null ? "" : obj.toString();
}
@@ -322,7 +322,7 @@ public class ObjectUtils {
* @return the passed in Object's toString, or {@code nullStr} if {@code null} input
* @since 2.0
*/
- public static String toString(Object obj, String nullStr) {
+ public static String toString(final Object obj, final String nullStr) {
return obj == null ? nullStr : obj.toString();
}
@@ -341,7 +341,7 @@ public class ObjectUtils {
* <li>If all the comparables are null, null is returned.
* </ul>
*/
- public static <T extends Comparable<? super T>> T min(T... values) {
+ public static <T extends Comparable<? super T>> T min(final T... values) {
T result = null;
if (values != null) {
for (T value : values) {
@@ -366,7 +366,7 @@ public class ObjectUtils {
* <li>If all the comparables are null, null is returned.
* </ul>
*/
- public static <T extends Comparable<? super T>> T max(T... values) {
+ public static <T extends Comparable<? super T>> T max(final T... values) {
T result = null;
if (values != null) {
for (T value : values) {
@@ -388,7 +388,7 @@ public class ObjectUtils {
* @return a negative value if c1 < c2, zero if c1 = c2
* and a positive value if c1 > c2
*/
- public static <T extends Comparable<? super T>> int compare(T c1, T c2) {
+ public static <T extends Comparable<? super T>> int compare(final T c1, final T c2) {
return compare(c1, c2, false);
}
@@ -405,7 +405,7 @@ public class ObjectUtils {
* and a positive value if c1 > c2
* @see java.util.Comparator#compare(Object, Object)
*/
- public static <T extends Comparable<? super T>> int compare(T c1, T c2, boolean nullGreater) {
+ public static <T extends Comparable<? super T>> int compare(final T c1, final T c2, final boolean nullGreater) {
if (c1 == c2) {
return 0;
} else if (c1 == null) {
@@ -426,7 +426,7 @@ public class ObjectUtils {
* @throws IllegalArgumentException if items is empty or contains {@code null} values
* @since 3.0.1
*/
- public static <T extends Comparable<? super T>> T median(T... items) {
+ public static <T extends Comparable<? super T>> T median(final T... items) {
Validate.notEmpty(items);
Validate.noNullElements(items);
TreeSet<T> sort = new TreeSet<T>();
@@ -447,7 +447,7 @@ public class ObjectUtils {
* @throws IllegalArgumentException if items is empty or contains {@code null} values
* @since 3.0.1
*/
- public static <T> T median(Comparator<T> comparator, T... items) {
+ public static <T> T median(final Comparator<T> comparator, final T... items) {
Validate.notEmpty(items, "null/empty items");
Validate.noNullElements(items);
Validate.notNull(comparator, "null comparator");
@@ -468,7 +468,7 @@ public class ObjectUtils {
* @return most populous T, {@code null} if non-unique or no items supplied
* @since 3.0.1
*/
- public static <T> T mode(T... items) {
+ public static <T> T mode(final T... items) {
if (ArrayUtils.isNotEmpty(items)) {
HashMap<T, MutableInt> occurrences = new HashMap<T, MutableInt>(items.length);
for (T t : items) {
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/RandomStringUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/RandomStringUtils.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/RandomStringUtils.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/RandomStringUtils.java Tue Jan 22 07:07:42 2013
@@ -65,7 +65,7 @@ public class RandomStringUtils {
* @param count the length of random string to create
* @return the random string
*/
- public static String random(int count) {
+ public static String random(final int count) {
return random(count, false, false);
}
@@ -79,7 +79,7 @@ public class RandomStringUtils {
* @param count the length of random string to create
* @return the random string
*/
- public static String randomAscii(int count) {
+ public static String randomAscii(final int count) {
return random(count, 32, 127, false, false);
}
@@ -93,7 +93,7 @@ public class RandomStringUtils {
* @param count the length of random string to create
* @return the random string
*/
- public static String randomAlphabetic(int count) {
+ public static String randomAlphabetic(final int count) {
return random(count, true, false);
}
@@ -107,7 +107,7 @@ public class RandomStringUtils {
* @param count the length of random string to create
* @return the random string
*/
- public static String randomAlphanumeric(int count) {
+ public static String randomAlphanumeric(final int count) {
return random(count, true, true);
}
@@ -121,7 +121,7 @@ public class RandomStringUtils {
* @param count the length of random string to create
* @return the random string
*/
- public static String randomNumeric(int count) {
+ public static String randomNumeric(final int count) {
return random(count, false, true);
}
@@ -139,7 +139,7 @@ public class RandomStringUtils {
* numeric characters
* @return the random string
*/
- public static String random(int count, boolean letters, boolean numbers) {
+ public static String random(final int count, final boolean letters, final boolean numbers) {
return random(count, 0, 0, letters, numbers);
}
@@ -159,7 +159,7 @@ public class RandomStringUtils {
* numeric characters
* @return the random string
*/
- public static String random(int count, int start, int end, boolean letters, boolean numbers) {
+ public static String random(final int count, final int start, final int end, final boolean letters, final boolean numbers) {
return random(count, start, end, letters, numbers, null, RANDOM);
}
@@ -183,7 +183,7 @@ public class RandomStringUtils {
* @throws ArrayIndexOutOfBoundsException if there are not
* {@code (end - start) + 1} characters in the set array.
*/
- public static String random(int count, int start, int end, boolean letters, boolean numbers, char... chars) {
+ public static String random(final int count, final int start, final int end, final boolean letters, final boolean numbers, final char... chars) {
return random(count, start, end, letters, numbers, chars, RANDOM);
}
@@ -220,8 +220,8 @@ public class RandomStringUtils {
* @throws IllegalArgumentException if {@code count} < 0 or the provided chars array is empty.
* @since 2.0
*/
- public static String random(int count, int start, int end, boolean letters, boolean numbers,
- char[] chars, Random random) {
+ public static String random(int count, int start, int end, final boolean letters, final boolean numbers,
+ final char[] chars, final Random random) {
if (count == 0) {
return "";
} else if (count < 0) {
@@ -306,7 +306,7 @@ public class RandomStringUtils {
* @return the random string
* @throws IllegalArgumentException if {@code count} < 0 or the string is empty.
*/
- public static String random(int count, String chars) {
+ public static String random(final int count, final String chars) {
if (chars == null) {
return random(count, 0, 0, false, false, null, RANDOM);
}
@@ -325,7 +325,7 @@ public class RandomStringUtils {
* @return the random string
* @throws IllegalArgumentException if {@code count} < 0.
*/
- public static String random(int count, char... chars) {
+ public static String random(final int count, final char... chars) {
if (chars == null) {
return random(count, 0, 0, false, false, null, RANDOM);
}
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Range.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Range.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Range.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/Range.java Tue Jan 22 07:07:42 2013
@@ -72,7 +72,7 @@ public final class Range<T> implements S
* @throws IllegalArgumentException if the element is null
* @throws ClassCastException if the element is not {@code Comparable}
*/
- public static <T extends Comparable<T>> Range<T> is(T element) {
+ public static <T extends Comparable<T>> Range<T> is(final T element) {
return between(element, element, null);
}
@@ -90,7 +90,7 @@ public final class Range<T> implements S
* @throws IllegalArgumentException if the element is null
* @throws ClassCastException if using natural ordering and the elements are not {@code Comparable}
*/
- public static <T> Range<T> is(T element, Comparator<T> comparator) {
+ public static <T> Range<T> is(final T element, final Comparator<T> comparator) {
return between(element, element, comparator);
}
@@ -110,7 +110,7 @@ public final class Range<T> implements S
* @throws IllegalArgumentException if either element is null
* @throws ClassCastException if the elements are not {@code Comparable}
*/
- public static <T extends Comparable<T>> Range<T> between(T fromInclusive, T toInclusive) {
+ public static <T extends Comparable<T>> Range<T> between(final T fromInclusive, final T toInclusive) {
return between(fromInclusive, toInclusive, null);
}
@@ -131,7 +131,7 @@ public final class Range<T> implements S
* @throws IllegalArgumentException if either element is null
* @throws ClassCastException if using natural ordering and the elements are not {@code Comparable}
*/
- public static <T> Range<T> between(T fromInclusive, T toInclusive, Comparator<T> comparator) {
+ public static <T> Range<T> between(final T fromInclusive, final T toInclusive, final Comparator<T> comparator) {
return new Range<T>(fromInclusive, toInclusive, comparator);
}
@@ -143,7 +143,7 @@ public final class Range<T> implements S
* @param comparator the comparator to be used, null for natural ordering
*/
@SuppressWarnings("unchecked")
- private Range(T element1, T element2, Comparator<T> comparator) {
+ private Range(final T element1, final T element2, Comparator<T> comparator) {
if (element1 == null || element2 == null) {
throw new IllegalArgumentException("Elements in a range must not be null: element1=" +
element1 + ", element2=" + element2);
@@ -215,7 +215,7 @@ public final class Range<T> implements S
* @param element the element to check for, null returns false
* @return true if the specified element occurs within this range
*/
- public boolean contains(T element) {
+ public boolean contains(final T element) {
if (element == null) {
return false;
}
@@ -228,7 +228,7 @@ public final class Range<T> implements S
* @param element the element to check for, null returns false
* @return true if this range is entirely after the specified element
*/
- public boolean isAfter(T element) {
+ public boolean isAfter(final T element) {
if (element == null) {
return false;
}
@@ -241,7 +241,7 @@ public final class Range<T> implements S
* @param element the element to check for, null returns false
* @return true if the specified element occurs within this range
*/
- public boolean isStartedBy(T element) {
+ public boolean isStartedBy(final T element) {
if (element == null) {
return false;
}
@@ -254,7 +254,7 @@ public final class Range<T> implements S
* @param element the element to check for, null returns false
* @return true if the specified element occurs within this range
*/
- public boolean isEndedBy(T element) {
+ public boolean isEndedBy(final T element) {
if (element == null) {
return false;
}
@@ -267,7 +267,7 @@ public final class Range<T> implements S
* @param element the element to check for, null returns false
* @return true if this range is entirely before the specified element
*/
- public boolean isBefore(T element) {
+ public boolean isBefore(final T element) {
if (element == null) {
return false;
}
@@ -284,7 +284,7 @@ public final class Range<T> implements S
* @param element the element to check for, not null
* @return -1, 0 or +1 depending on the element's location relative to the range
*/
- public int elementCompareTo(T element) {
+ public int elementCompareTo(final T element) {
if (element == null) {
// Comparable API says throw NPE on null
throw new NullPointerException("Element is null");
@@ -310,7 +310,7 @@ public final class Range<T> implements S
* @return true if this range contains the specified range
* @throws RuntimeException if ranges cannot be compared
*/
- public boolean containsRange(Range<T> otherRange) {
+ public boolean containsRange(final Range<T> otherRange) {
if (otherRange == null) {
return false;
}
@@ -327,7 +327,7 @@ public final class Range<T> implements S
* @return true if this range is completely after the specified range
* @throws RuntimeException if ranges cannot be compared
*/
- public boolean isAfterRange(Range<T> otherRange) {
+ public boolean isAfterRange(final Range<T> otherRange) {
if (otherRange == null) {
return false;
}
@@ -346,7 +346,7 @@ public final class Range<T> implements S
* range; otherwise, {@code false}
* @throws RuntimeException if ranges cannot be compared
*/
- public boolean isOverlappedBy(Range<T> otherRange) {
+ public boolean isOverlappedBy(final Range<T> otherRange) {
if (otherRange == null) {
return false;
}
@@ -364,7 +364,7 @@ public final class Range<T> implements S
* @return true if this range is completely before the specified range
* @throws RuntimeException if ranges cannot be compared
*/
- public boolean isBeforeRange(Range<T> otherRange) {
+ public boolean isBeforeRange(final Range<T> otherRange) {
if (otherRange == null) {
return false;
}
@@ -378,7 +378,7 @@ public final class Range<T> implements S
* @throws IllegalArgumentException if {@code other} does not overlap {@code this}
* @since 3.0.1
*/
- public Range<T> intersectionWith(Range<T> other) {
+ public Range<T> intersectionWith(final Range<T> other) {
if (!this.isOverlappedBy(other)) {
throw new IllegalArgumentException(String.format(
"Cannot calculate intersection with non-overlapping range %s", other));
@@ -404,7 +404,7 @@ public final class Range<T> implements S
* @return true if this object is equal
*/
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
} else if (obj == null || obj.getClass() != getClass()) {
@@ -470,7 +470,7 @@ public final class Range<T> implements S
* @param format the format string, optionally containing {@code %1$s}, {@code %2$s} and {@code %3$s}, not null
* @return the formatted string, not null
*/
- public String toString(String format) {
+ public String toString(final String format) {
return String.format(format, minimum, maximum, comparator);
}
@@ -486,7 +486,7 @@ public final class Range<T> implements S
* @return negative, 0, positive comparison value
*/
@Override
- public int compare(Object obj1, Object obj2) {
+ public int compare(final Object obj1, final Object obj2) {
return ((Comparable) obj1).compareTo(obj2);
}
}
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationException.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationException.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationException.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationException.java Tue Jan 22 07:07:42 2013
@@ -48,7 +48,7 @@ public class SerializationException exte
*
* @param msg The error message.
*/
- public SerializationException(String msg) {
+ public SerializationException(final String msg) {
super(msg);
}
@@ -59,7 +59,7 @@ public class SerializationException exte
* @param cause The {@code Exception} or {@code Error}
* that caused this exception to be thrown.
*/
- public SerializationException(Throwable cause) {
+ public SerializationException(final Throwable cause) {
super(cause);
}
@@ -71,7 +71,7 @@ public class SerializationException exte
* @param cause The {@code Exception} or {@code Error}
* that caused this exception to be thrown.
*/
- public SerializationException(String msg, Throwable cause) {
+ public SerializationException(final String msg, final Throwable cause) {
super(msg, cause);
}
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/SerializationUtils.java Tue Jan 22 07:07:42 2013
@@ -75,7 +75,7 @@ public class SerializationUtils {
* @return the cloned object
* @throws SerializationException (runtime) if the serialization fails
*/
- public static <T extends Serializable> T clone(T object) {
+ public static <T extends Serializable> T clone(final T object) {
if (object == null) {
return null;
}
@@ -127,7 +127,7 @@ public class SerializationUtils {
* @throws IllegalArgumentException if {@code outputStream} is {@code null}
* @throws SerializationException (runtime) if the serialization fails
*/
- public static void serialize(Serializable obj, OutputStream outputStream) {
+ public static void serialize(final Serializable obj, final OutputStream outputStream) {
if (outputStream == null) {
throw new IllegalArgumentException("The OutputStream must not be null");
}
@@ -158,7 +158,7 @@ public class SerializationUtils {
* @return a byte[] with the converted Serializable
* @throws SerializationException (runtime) if the serialization fails
*/
- public static byte[] serialize(Serializable obj) {
+ public static byte[] serialize(final Serializable obj) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
serialize(obj, baos);
return baos.toByteArray();
@@ -197,7 +197,7 @@ public class SerializationUtils {
*/
@SuppressWarnings("unchecked")
// Don't warn about "(T) deserialize" because we want the avoid type casting call sites.
- public static <T> T deserialize(InputStream inputStream) {
+ public static <T> T deserialize(final InputStream inputStream) {
if (inputStream == null) {
throw new IllegalArgumentException("The InputStream must not be null");
}
@@ -243,7 +243,7 @@ public class SerializationUtils {
*/
@SuppressWarnings("unchecked")
// Don't warn about "(T) deserialize" because we want the avoid type casting call sites.
- public static <T> T deserialize(byte[] objectData) {
+ public static <T> T deserialize(final byte[] objectData) {
if (objectData == null) {
throw new IllegalArgumentException("The byte[] must not be null");
}
@@ -275,7 +275,7 @@ public class SerializationUtils {
* @throws IOException if an I/O error occurs while reading stream header.
* @see java.io.ObjectInputStream
*/
- public ClassLoaderAwareObjectInputStream(InputStream in, ClassLoader classLoader) throws IOException {
+ public ClassLoaderAwareObjectInputStream(final InputStream in, final ClassLoader classLoader) throws IOException {
super(in);
this.classLoader = classLoader;
@@ -299,7 +299,7 @@ public class SerializationUtils {
* @throws ClassNotFoundException If class of a serialized object cannot be found.
*/
@Override
- protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+ protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
String name = desc.getName();
try {
return Class.forName(name, false, classLoader);
Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java?rev=1436768&r1=1436767&r2=1436768&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java Tue Jan 22 07:07:42 2013
@@ -151,7 +151,7 @@ public class StringEscapeUtils {
new char[] {CSV_DELIMITER, CSV_QUOTE, CharUtils.CR, CharUtils.LF};
@Override
- public int translate(CharSequence input, int index, Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final Writer out) throws IOException {
if(index != 0) {
throw new IllegalStateException("CsvEscaper should never reach the [1] index");
@@ -274,7 +274,7 @@ public class StringEscapeUtils {
new char[] {CSV_DELIMITER, CSV_QUOTE, CharUtils.CR, CharUtils.LF};
@Override
- public int translate(CharSequence input, int index, Writer out) throws IOException {
+ public int translate(final CharSequence input, final int index, final Writer out) throws IOException {
if(index != 0) {
throw new IllegalStateException("CsvUnescaper should never reach the [1] index");
@@ -337,7 +337,7 @@ public class StringEscapeUtils {
* @param input String to escape values in, may be null
* @return String with escaped values, {@code null} if null string input
*/
- public static final String escapeJava(String input) {
+ public static final String escapeJava(final String input) {
return ESCAPE_JAVA.translate(input);
}
@@ -366,7 +366,7 @@ public class StringEscapeUtils {
*
* @since 3.0
*/
- public static final String escapeEcmaScript(String input) {
+ public static final String escapeEcmaScript(final String input) {
return ESCAPE_ECMASCRIPT.translate(input);
}
@@ -379,7 +379,7 @@ public class StringEscapeUtils {
* @param input the {@code String} to unescape, may be null
* @return a new unescaped {@code String}, {@code null} if null string input
*/
- public static final String unescapeJava(String input) {
+ public static final String unescapeJava(final String input) {
return UNESCAPE_JAVA.translate(input);
}
@@ -396,7 +396,7 @@ public class StringEscapeUtils {
*
* @since 3.0
*/
- public static final String unescapeEcmaScript(String input) {
+ public static final String unescapeEcmaScript(final String input) {
return UNESCAPE_ECMASCRIPT.translate(input);
}
@@ -429,7 +429,7 @@ public class StringEscapeUtils {
*
* @since 3.0
*/
- public static final String escapeHtml4(String input) {
+ public static final String escapeHtml4(final String input) {
return ESCAPE_HTML4.translate(input);
}
@@ -442,7 +442,7 @@ public class StringEscapeUtils {
*
* @since 3.0
*/
- public static final String escapeHtml3(String input) {
+ public static final String escapeHtml3(final String input) {
return ESCAPE_HTML3.translate(input);
}
@@ -464,7 +464,7 @@ public class StringEscapeUtils {
*
* @since 3.0
*/
- public static final String unescapeHtml4(String input) {
+ public static final String unescapeHtml4(final String input) {
return UNESCAPE_HTML4.translate(input);
}
@@ -478,7 +478,7 @@ public class StringEscapeUtils {
*
* @since 3.0
*/
- public static final String unescapeHtml3(String input) {
+ public static final String unescapeHtml3(final String input) {
return UNESCAPE_HTML3.translate(input);
}
@@ -502,7 +502,7 @@ public class StringEscapeUtils {
* @return a new escaped {@code String}, {@code null} if null string input
* @see #unescapeXml(java.lang.String)
*/
- public static final String escapeXml(String input) {
+ public static final String escapeXml(final String input) {
return ESCAPE_XML.translate(input);
}
@@ -523,7 +523,7 @@ public class StringEscapeUtils {
* @return a new unescaped {@code String}, {@code null} if null string input
* @see #escapeXml(String)
*/
- public static final String unescapeXml(String input) {
+ public static final String unescapeXml(final String input) {
return UNESCAPE_XML.translate(input);
}
@@ -552,7 +552,7 @@ public class StringEscapeUtils {
* newline or double quote, {@code null} if null string input
* @since 2.4
*/
- public static final String escapeCsv(String input) {
+ public static final String escapeCsv(final String input) {
return ESCAPE_CSV.translate(input);
}
@@ -578,7 +578,7 @@ public class StringEscapeUtils {
* quotes unescaped, {@code null} if null string input
* @since 2.4
*/
- public static final String unescapeCsv(String input) {
+ public static final String unescapeCsv(final String input) {
return UNESCAPE_CSV.translate(input);
}