cvs commit: jakarta-commons-sandbox/util/src/java/org/apache/commons/util StringUtils.java

[bayard]

bayard      01/12/18 10:36:55

  Modified:    util/src/java/org/apache/commons/util StringUtils.java
  Log:
  Fixed bugs in leftPad and rightPad which basically made them not work.
  My original code was crap.
  
  Revision  Changes    Path
  1.19      +7 -9      
jakarta-commons-sandbox/util/src/java/org/apache/commons/util/StringUtils.java
  
  Index: StringUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/util/src/java/org/apache/commons/util/StringUtils.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- StringUtils.java  2001/10/22 18:22:52     1.18
  +++ StringUtils.java  2001/12/18 18:36:55     1.19
  @@ -81,7 +81,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Greg Coladonato</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Bayard</a>
  - * @version $Id: StringUtils.java,v 1.18 2001/10/22 18:22:52 bayard Exp $
  + * @version $Id: StringUtils.java,v 1.19 2001/12/18 18:36:55 bayard Exp $
    */
   public class StringUtils
   {
  @@ -986,10 +986,9 @@
        * @param delim String to pad with
        */
       static public String rightPad(String str, int n, String delim) {
  -        int sz = str.length();
  -        n = n/delim.length();
  -        if(n > sz) {
  -            str += repeat(delim,n-sz);
  +        n = (n - str.length())/delim.length();
  +        if(n > 0) {
  +            str += repeat(delim,n);
           }
           return str;
       }
  @@ -1011,10 +1010,9 @@
        * @param delim String to pad with
        */
       static public String leftPad(String str, int n, String delim) {
  -        int sz = str.length();
  -        n = n/delim.length();
  -        if(n > sz) {
  -            str = repeat(delim,n-sz) + str;
  +        n = (n - str.length())/delim.length();
  +        if(n > 0) {
  +            str = repeat(delim,n) + str;
           }
           return str;
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>