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

[scolebourne]

scolebourne    2003/07/30 15:17:49

  Modified:    lang/src/java/org/apache/commons/lang StringUtils.java
  Log:
  Fixes arising from Clover report
  
  Revision  Changes    Path
  1.82      +12 -12    
jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java
  
  Index: StringUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- StringUtils.java  26 Jul 2003 15:35:35 -0000      1.81
  +++ StringUtils.java  30 Jul 2003 22:17:49 -0000      1.82
  @@ -2331,10 +2331,10 @@
           }
   
           if (str.length() == 1) {
  -            if ("\r".equals(str) || "\n".equals(str)) {
  +            char ch = str.charAt(0);
  +            if (ch == '\r' || ch == '\n') {
                   return "";
  -            }
  -            else {
  +            } else {
                   return str;
               }
           }
  @@ -2615,8 +2615,8 @@
           if (repeat <= 0) {
               return "";
           }
  -        int inputLength;
  -        if (repeat == 1 || (inputLength = str.length()) == 0) {
  +        int inputLength = str.length();
  +        if (repeat == 1 || inputLength == 0) {
               return str;
           }
           if (inputLength == 1 && repeat <= PAD_LIMIT) {
  @@ -2771,13 +2771,13 @@
           }
           int strLen = str.length();
           int pads = size - strLen;
  +        if (pads <= 0) {
  +            return str; // returns original String when possible
  +        }
           if (padLen == 1 && pads <= PAD_LIMIT) {
               return rightPad(str, size, padStr.charAt(0));
           }
           
  -        if (pads <= 0) {
  -            return str; // returns original String when possible
  -        }
           if (pads == padLen) {
               return str.concat(padStr);
           } else if (pads < padLen) {
  @@ -2884,13 +2884,13 @@
           }
           int strLen = str.length();
           int pads = size - strLen;
  +        if (pads <= 0) {
  +            return str; // returns original String when possible
  +        }
           if (padLen == 1 && pads <= PAD_LIMIT) {
               return leftPad(str, size, padStr.charAt(0));
           }
           
  -        if (pads <= 0) {
  -            return str; // returns original String when possible
  -        }
           if (pads == padLen) {
               return padStr.concat(str);
           } else if (pads < padLen) {
  
  
  

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