Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed leftPad() and rightPad() to correctly handle multi letter pad strings 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137449 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-07-18 23:57:43 +00:00
parent b1a7e16922
commit 59b77af292
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/java/org/apache/commons/lang/StringUtils.java
View File

@ -99,7 +99,7 @@ import org.apache.commons.lang.math.NumberUtils;
* @author Arun Mammen Thomas
* @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
* @since 1.0
* @version $Id: StringUtils.java,v 1.62 2003/07/18 02:06:24 scolebourne Exp $
* @version $Id: StringUtils.java,v 1.63 2003/07/18 23:57:43 scolebourne Exp $
*/
public class StringUtils {
@ -1967,18 +1967,31 @@ public class StringUtils {
if (str == null) {
return null;
}
if (padStr == null || padStr.length() == 0) {
int padLen;
if (padStr == null || (padLen = padStr.length()) == 0) {
throw new IllegalArgumentException("Pad String must not be null or empty");
}
if (padStr.length() == 1 && size - str.length() <= PAD_LIMIT) {
int strLen = str.length();
int pads = size - strLen;
if (padLen == 1 && pads <= PAD_LIMIT) {
return rightPad(str, size, padStr.charAt(0));
}
size = (size - str.length()) / padStr.length();
if (size > 0) {
str += repeat(padStr, size);
if (pads <= 0) {
return str; // returns original String when possible
}
if (pads == padLen) {
return str.concat(padStr);
} else if (pads < padLen) {
return str.concat(padStr.substring(0, pads));
} else {
char[] padding = new char[pads];
char[] padChars = padStr.toCharArray();
for (int i = 0; i < pads; i++) {
padding[i] = padChars[i % padLen];
}
return str.concat(new String(padding));
}
return str;
}
/**
@ -2041,7 +2054,7 @@ public class StringUtils {
return str; // returns original String when possible
}
if (pads > PAD_LIMIT) {
return leftPad(str, size, ' ');
return leftPad(str, size, String.valueOf(padChar));
}
return padding(pads, padChar).concat(str);
}
@ -2073,17 +2086,31 @@ public class StringUtils {
if (str == null) {
return null;
}
if (padStr == null || padStr.length() == 0) {
int padLen;
if (padStr == null || (padLen = padStr.length()) == 0) {
throw new IllegalArgumentException("Pad String must not be null or empty");
}
if (padStr.length() == 1 && size - str.length() <= PAD_LIMIT) {
int strLen = str.length();
int pads = size - strLen;
if (padLen == 1 && pads <= PAD_LIMIT) {
return leftPad(str, size, padStr.charAt(0));
}
size = (size - str.length()) / padStr.length();
if (size > 0) {
str = repeat(padStr, size) + str;
if (pads <= 0) {
return str; // returns original String when possible
}
if (pads == padLen) {
return padStr.concat(str);
} else if (pads < padLen) {
return padStr.substring(0, pads).concat(str);
} else {
char[] padding = new char[pads];
char[] padChars = padStr.toCharArray();
for (int i = 0; i < pads; i++) {
padding[i] = padChars[i % padLen];
}
return new String(padding).concat(str);
}
return str;
}
// Centering

4
src/test/org/apache/commons/lang/StringUtilsTest.java
View File

@ -71,7 +71,7 @@ import junit.textui.TestRunner;
* @author <a href="mailto:fredrik@westermarck.com>Fredrik Westermarck</a>
* @author Holger Krauth
* @author <a href="hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id: StringUtilsTest.java,v 1.26 2003/07/18 02:06:23 scolebourne Exp $
* @version $Id: StringUtilsTest.java,v 1.27 2003/07/18 23:57:43 scolebourne Exp $
*/
public class StringUtilsTest extends TestCase {
@ -315,6 +315,7 @@ public class StringUtilsTest extends TestCase {
assertEquals(" ab ", StringUtils.center("ab", 4));
assertEquals("abcd", StringUtils.center("abcd", 2));
assertEquals(" a ", StringUtils.center("a", 4));
assertEquals(" a ", StringUtils.center("a", 5));
assertEquals(null, StringUtils.center(null, -1, " "));
assertEquals(null, StringUtils.center(null, 4, " "));
@ -323,6 +324,7 @@ public class StringUtilsTest extends TestCase {
assertEquals("abcd", StringUtils.center("abcd", 2, " "));
assertEquals(" a ", StringUtils.center("a", 4, " "));
assertEquals("yayz", StringUtils.center("a", 4, "yz"));
assertEquals("yzyayzy", StringUtils.center("a", 7, "yz"));
try {
StringUtils.center("abc", 4, null);
fail();