Tab and trailing space removal

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1060137 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2011-01-17 23:46:03 +00:00
parent 345b4836f6
commit 3c10434631
2 changed files with 7 additions and 7 deletions

View File

@ -163,7 +163,7 @@ public class StringUtils {
* A regex pattern for recognizing blocks of whitespace characters.
*/
private static final Pattern WHITESPACE_BLOCK = Pattern.compile("\\s+");
/**
* <p><code>StringUtils</code> instances should NOT be constructed in
* standard programming. Instead, the class should be used as
@ -653,7 +653,7 @@ public class StringUtils {
} else if (sunAvailable) {
result = removeAccentsSUN(input);
} else {
throw new UnsupportedOperationException("The stripAccents(CharSequence) method requires at least Java 1.6 or a Sun JVM");
throw new UnsupportedOperationException("The stripAccents(CharSequence) method requires at least Java 1.6 or a Sun JVM");
}
// Note that none of the above methods correctly remove ligatures...
return result;
@ -3191,7 +3191,7 @@ public class StringUtils {
}
/**
* <p>Joins the provided elements into a single String, with the specified
* <p>Joins the provided elements into a single String, with the specified
* separator between each element. </p>
*
* <p>No separator is added before or after the joined String.
@ -6372,21 +6372,21 @@ public class StringUtils {
* normalize. Additonally <code>{@link #trim(String)}</code> removes control characters (char &lt;= 32) from both
* ends of this String.
* </p>
*
*
* @see Pattern
* @see #trim(String)
* @see <a
* href="http://www.w3.org/TR/xpath/#function-normalize-space">http://www.w3.org/TR/xpath/#function-normalize-space</a>
* @param str the source String to normalize whitespaces from, may be null
* @return the modified string with whitespace normalized, <code>null</code> if null String input
*
*
* @since 3.0
*/
public static String normalizeSpace(String str) {
if(str == null) {
return null;
}
return WHITESPACE_BLOCK.matcher(trim(str)).replaceAll(" ");
return WHITESPACE_BLOCK.matcher(trim(str)).replaceAll(" ");
}
/**

View File

@ -468,7 +468,7 @@ public class StrSubstitutorTest extends TestCase {
* Test the replace of a properties object
*/
public void testSubstitutetDefaultProperties(){
String org = "${doesnotwork}";
String org = "${doesnotwork}";
System.setProperty("doesnotwork", "It work's!");
// create a new Properties object with the System.getProperties as default