commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang StringUtils.java
Date Sun, 23 Mar 2003 21:52:31 GMT
scolebourne    2003/03/23 13:52:31

  Modified:    lang/src/java/org/apache/commons/lang StringUtils.java
  Log:
  Update containsOnly 
  Add containsNone
  
  Revision  Changes    Path
  1.37      +82 -31    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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- StringUtils.java	23 Mar 2003 18:05:44 -0000	1.36
  +++ StringUtils.java	23 Mar 2003 21:52:31 -0000	1.37
  @@ -1705,6 +1705,87 @@
           return true;
       }
   
  +    /**
  +     * <p>Checks if the String contains only certain chars.</p>
  +     *
  +     * @param str  the string to check
  +     * @param validChars  a string of valid chars
  +     * @return true if it only contains valid chars and is non-null
  +     */
  +    public static boolean containsOnly(String str, String validChars) {
  +        if (str == null || validChars == null) {
  +            return false;
  +        }
  +        return containsOnly(str, validChars.toCharArray());
  +    }
  +    
  +    /**
  +     * <p>Checks if the String contains only certain chars.</p>
  +     *
  +     * @param str  the string to check
  +     * @param validChars  an array of valid chars
  +     * @return true if it only contains valid chars and is non-null
  +     */
  +    public static boolean containsOnly(String str, char[] validChars) {
  +        if (str == null || validChars == null) {
  +            return false;
  +        }
  +        int strSize = str.length();
  +        int validSize = validChars.length;
  +        for (int i = 0; i < strSize; i++) {
  +            char ch = str.charAt(i);
  +            boolean contains = false;
  +            for (int j = 0; j < validSize; j++) {
  +                if (validChars[j] == ch) {
  +                    contains = true;
  +                    break;
  +                }
  +            }
  +            if (contains == false) {
  +                return false;
  +            }
  +        }
  +        return true;
  +    }
  +
  +    /**
  +     * <p>Checks that the String does not contain certain chars.</p>
  +     *
  +     * @param str  the string to check
  +     * @param invalidChars  a string of invalid chars
  +     * @return true if it contains none of the invalid chars, or is null
  +     */
  +    public static boolean containsNone(String str, String invalidChars) {
  +        if (str == null || invalidChars == null) {
  +            return true;
  +        }
  +        return containsNone(str, invalidChars.toCharArray());
  +    }
  +    
  +    /**
  +     * <p>Checks that the String does not contain certain chars.</p>
  +     *
  +     * @param str  the string to check
  +     * @param invalidChars  an array of invalid chars
  +     * @return true if it contains none of the invalid chars, or is null
  +     */
  +    public static boolean containsNone(String str, char[] invalidChars) {
  +        if (str == null || invalidChars == null) {
  +            return true;
  +        }
  +        int strSize = str.length();
  +        int validSize = invalidChars.length;
  +        for (int i = 0; i < strSize; i++) {
  +            char ch = str.charAt(i);
  +            for (int j = 0; j < validSize; j++) {
  +                if (invalidChars[j] == ch) {
  +                    return false;
  +                }
  +            }
  +        }
  +        return true;
  +    }
  +
       // Defaults
       //--------------------------------------------------------------------------
       
  @@ -1934,34 +2015,4 @@
           return d[n][m];
       }
   
  -    /**
  -     * <p>Checks if the String contains only certain chars.</p>
  -     *
  -     * @param str the String to check
  -     * @param valid an array of valid chars
  -     * @return true if it only contains valid chars and is non-null
  -     */
  -    public static boolean containsOnly(String str, char[] valid) {
  -        if (str == null || valid == null) {
  -            return false;
  -        }
  -
  -        int strSize = str.length();
  -        int validSize = valid.length;
  -
  -        for (int i = 0; i < strSize; i++) {
  -            boolean contains = false;
  -            for (int j = 0; j < validSize; j++) {
  -                if (valid[j] == str.charAt(i)) {
  -                    contains = true;
  -                    break;
  -                }
  -            }
  -            if (!contains) {
  -                return false;
  -            }
  -        }
  -
  -        return true;
  -    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message