You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ba...@apache.org on 2006/07/05 08:14:14 UTC
svn commit: r419174 - in
/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang: ./
builder/ text/ time/
Author: bayard
Date: Tue Jul 4 23:14:13 2006
New Revision: 419174
URL: http://svn.apache.org/viewvc?rev=419174&view=rev
Log:
Minor style fixes suggested by checkstyle
Modified:
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ReflectionToStringBuilder.java
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/StrTokenizer.java
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/VariableFormatter.java
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/DateUtils.java
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java Tue Jul 4 23:14:13 2006
@@ -573,6 +573,7 @@
* @param str the <code>String</code> to escape, may be null
* @return a new escaped <code>String</code>, <code>null</code> if null string input
* @throws IllegalArgumentException if the writer is null
+ * @throws IOException if there is a problem writing
* @see #unescapeXml(java.lang.String)
*/
public static void escapeXml(Writer writer, String str) throws IOException {
@@ -625,6 +626,7 @@
* @param str the <code>String</code> to unescape, may be null
* @return a new unescaped <code>String</code>, <code>null</code> if null string input
* @throws IllegalArgumentException if the writer is null
+ * @throws IOException if there is a problem writing
* @see #escapeXml(String)
*/
public static void unescapeXml(Writer writer, String str) throws IOException {
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java Tue Jul 4 23:14:13 2006
@@ -260,6 +260,7 @@
* @param rhs right-hand object
* @param compareTransients whether to compare transient fields
* @param reflectUpToClass last superclass for which fields are compared
+ * @param excludeFields fields to exclude
* @return a negative integer, zero, or a positive integer as <code>lhs</code>
* is less than, equal to, or greater than <code>rhs</code>
* @throws NullPointerException if either <code>lhs</code> or <code>rhs</code>
@@ -268,7 +269,13 @@
* with <code>lhs</code>
* @since 2.0
*/
- public static int reflectionCompare(Object lhs, Object rhs, boolean compareTransients, Class reflectUpToClass, String[] excludeFields) {
+ public static int reflectionCompare(
+ Object lhs,
+ Object rhs,
+ boolean compareTransients,
+ Class reflectUpToClass,
+ String[] excludeFields) {
+
if (lhs == rhs) {
return 0;
}
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java Tue Jul 4 23:14:13 2006
@@ -288,7 +288,9 @@
public static int reflectionHashCode(
int initialNonZeroOddNumber, int multiplierNonZeroOddNumber,
Object object, boolean testTransients) {
- return reflectionHashCode(initialNonZeroOddNumber, multiplierNonZeroOddNumber, object, testTransients, null, null);
+ return reflectionHashCode(initialNonZeroOddNumber, multiplierNonZeroOddNumber,
+ object, testTransients, null, null
+ );
}
/**
@@ -352,6 +354,7 @@
* @param clazz the class to append details of
* @param builder the builder to append to
* @param useTransients whether to use transient fields
+ * @param excludeFields Collection of String field names to exclude from use in calculation of hash code
*/
private static void reflectionAppend(
Object object,
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ReflectionToStringBuilder.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ReflectionToStringBuilder.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ReflectionToStringBuilder.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ReflectionToStringBuilder.java Tue Jul 4 23:14:13 2006
@@ -379,7 +379,9 @@
* if the Object is <code>null</code>
* @since 2.0
*/
- public static String toString(Object object, ToStringStyle style, boolean outputTransients, Class reflectUpToClass) {
+ public static String toString(Object object, ToStringStyle style,
+ boolean outputTransients, Class reflectUpToClass)
+ {
return new ReflectionToStringBuilder(object, style, null, reflectUpToClass, outputTransients).toString();
}
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/StrTokenizer.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/StrTokenizer.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/StrTokenizer.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/StrTokenizer.java Tue Jul 4 23:14:13 2006
@@ -716,7 +716,9 @@
* immediately after the delimiter, or if end of string found,
* then the length of string
*/
- private int readWithQuotes(char[] chars, int start, int len, StrBuilder workArea, List tokens, int quoteStart, int quoteLen) {
+ private int readWithQuotes(char[] chars, int start, int len, StrBuilder workArea,
+ List tokens, int quoteStart, int quoteLen)
+ {
// Loop until we've found the end of the quoted
// string or the end of the input
workArea.clear();
@@ -1068,6 +1070,7 @@
* list.
*
* @return a new instance of this Tokenizer which has been reset.
+ * @throws CloneNotSupportedException if there is a problem cloning
*/
Object cloneReset() throws CloneNotSupportedException {
StrTokenizer cloned = (StrTokenizer) super.clone();
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/VariableFormatter.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/VariableFormatter.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/VariableFormatter.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/VariableFormatter.java Tue Jul 4 23:14:13 2006
@@ -365,7 +365,10 @@
checkTextToken(startPos);
setPos(getPos() + tokenLen);
int varStart = getPos(), endLen = 0;
- while (hasNext() && (endLen = getVarEndMatcher().isMatch(data, getPos(), 0, getLength())) <= 0) {
+ while ( hasNext() &&
+ (endLen = getVarEndMatcher().isMatch(data, getPos(), 0, getLength())) <= 0
+ )
+ {
setPos(getPos() + 1);
}
if (endLen <= 0) {
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/DateUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/DateUtils.java?rev=419174&r1=419173&r2=419174&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/DateUtils.java (original)
+++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/time/DateUtils.java Tue Jul 4 23:14:13 2006
@@ -688,6 +688,7 @@
//Set roundUp if this is more than half way between the minimum and maximum
roundUp = offset > ((max - min) / 2);
}
+System.err.println("DST: " + val.get(Calendar.DST_OFFSET));
//We need to remove this field
val.set(fields[i][0], val.get(fields[i][0]) - offset);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org