commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject cvs commit: jakarta-commons-sandbox/lang/src/java/org/apache/commons/lang CharSetUtils.java CharSet.java
Date Wed, 17 Jul 2002 04:47:52 GMT
bayard      2002/07/16 21:47:52

  Modified:    lang/src/java/org/apache/commons/lang CharSet.java
  Added:       lang/src/java/org/apache/commons/lang CharSetUtils.java
  Log:
  Static methods pulled out of CharSet and into CharSetUtils.
  
  Revision  Changes    Path
  1.5       +2 -161    jakarta-commons-sandbox/lang/src/java/org/apache/commons/lang/CharSet.java
  
  Index: CharSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/lang/src/java/org/apache/commons/lang/CharSet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CharSet.java	16 Jul 2002 20:07:04 -0000	1.4
  +++ CharSet.java	17 Jul 2002 04:47:52 -0000	1.5
  @@ -59,172 +59,13 @@
   import java.util.LinkedList;
   /**
    * A set of characters. You can iterate over the characters in the 
  - * set. Also provided are numerous routines to manipulate a character set.
  + * set. 
    *
    * @author <a href="bayard@generationjava.com">Henri Yandell</a>
    * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
    * @version $Id$
    */
   public class CharSet {
  -
  -    /**
  -     * Creates a CharSet object which allows a certain amount of 
  -     * set logic to be performed upon the following syntax:
  -     *
  -     * "aeio" which implies 'a','e',..
  -     * "^e" implies not e. However it only negates, it's not 
  -     * a set in itself due to the size of that set in unicode.
  -     * "ej-m" implies e,j->m. e,j,k,l,m.
  -     */
  -    public static CharSet evaluateSet(String[] set) {
  -        return new CharSet(set); 
  -    }
  -
  -    /**
  -     * Squeezes any repititions of a character that is mentioned in the 
  -     * supplied set. An example is:
  -     *    squeeze("hello", "el")  => "helo"
  -     * See evaluateSet for set-syntax.
  -     * 
  -     * @param str  the string to work from
  -     * @param set  the character set to use for manipulation
  -     */
  -    public static String squeeze(String str, String set) {
  -        String[] strs = new String[1];
  -        strs[0] = set;
  -        return squeeze(str, strs);
  -    }
  -
  -    /**
  -     * Squeezes any repititions of a character that is mentioned in the 
  -     * supplied set. An example is:
  -     *    squeeze("hello", {"el"})  => "helo"
  -     * See evaluateSet for set-syntax.
  -     * 
  -     * @param str  the string to work from
  -     * @param set  the character set to use for manipulation
  -     */
  -    public static String squeeze(String str, String[] set) {
  -        CharSet chars = evaluateSet(set);
  -        StringBuffer buffer = new StringBuffer(str.length());
  -        char[] chrs = str.toCharArray();
  -        int sz = chrs.length;
  -        char lastChar = ' ';
  -        char ch = ' ';
  -        for (int i = 0; i < sz; i++) {
  -            ch = chrs[i];
  -            if (chars.contains(ch)) {
  -                if ((ch == lastChar) && (i != 0)) {
  -                    continue;
  -                }
  -            }
  -            buffer.append(ch);
  -            lastChar = ch;
  -        }
  -        return buffer.toString();
  -    }
  -
  -    /**
  -     * Takes an argument in set-syntax, see evaluateSet,
  -     * and returns the number of characters present in the specified string.
  -     * An example would be:   count("hello", {"c-f","o"}) returns 2.
  -     *
  -     * @param str  String target to count characters in
  -     * @param set  String set of characters to count
  -     */
  -    public static int count(String str, String set) {
  -        String[] strs = new String[1];
  -        strs[0] = set;
  -        return count(str, strs);
  -    }
  -    
  -    /**
  -     * Takes an argument in set-syntax, see evaluateSet,
  -     * and returns the number of characters present in the specified string.
  -     * An example would be:   count("hello", {"c-f","o"}) returns 2.
  -     *
  -     * @param str  String target to count characters in
  -     * @param set  String[] set of characters to count
  -     */
  -    public static int count(String str, String[] set) {
  -        CharSet chars = evaluateSet(set);
  -        int count = 0;
  -        char[] chrs = str.toCharArray();
  -        int sz = chrs.length;
  -        for(int i=0; i<sz; i++) {
  -            if(chars.contains(chrs[i])) {
  -                count++;
  -            }
  -        }
  -        return count;
  -    }
  -
  -    /**
  -     * Takes an argument in set-syntax, see evaluateSet,
  -     * and deletes any of characters present in the specified string.
  -     * An example would be:   delete("hello", {"c-f","o"}) returns "hll"
  -     *
  -     * @param str  String target to delete characters from
  -     * @param set  String set of characters to delete
  -     */
  -    public static String delete(String str, String set) {
  -        String[] strs = new String[1];
  -        strs[0] = set;
  -        return delete(str, strs);
  -    }
  -    
  -    /**
  -     * Takes an argument in set-syntax, see evaluateSet,
  -     * and deletes any of characters present in the specified string.
  -     * An example would be:   delete("hello", {"c-f","o"}) returns "hll"
  -     *
  -     * @param str  String target to delete characters from
  -     * @param set  String[] set of characters to delete
  -     */
  -    public static String delete(String str, String[] set) {
  -        CharSet chars = evaluateSet(set);
  -        StringBuffer buffer = new StringBuffer(str.length());
  -        char[] chrs = str.toCharArray();
  -        int sz = chrs.length;
  -        for(int i=0; i<sz; i++) {
  -            if(!chars.contains(chrs[i])) {
  -                buffer.append(chrs[i]);
  -            }
  -        }
  -        return buffer.toString();
  -    }
  -
  -    /**
  -     * NEEDS TO TAKE A CHAR-SET.
  -     * Translate characters in a String.
  -     * An example is:  translate("hello", "ho", "jy") => jelly
  -     * If the length of characters to search for is greater than the 
  -     * length of characters to replace, then the last character is 
  -     * used.
  -     *
  -     * @param target String to replace characters  in
  -     * @param repl String to find that will be replaced
  -     * @param with String to put into the target String
  -     */
  -    public static String translate(String target, String repl, String with) {
  -        StringBuffer buffer = new StringBuffer(target.length());
  -        char[] chrs = target.toCharArray();
  -        char[] withChrs = with.toCharArray();
  -        int sz = chrs.length;
  -        int withMax = with.length() - 1;
  -        for(int i=0; i<sz; i++) {
  -            int idx = repl.indexOf(chrs[i]);
  -            if(idx != -1) {
  -                if(idx > withMax) {
  -                    idx = withMax;
  -                }
  -                buffer.append(withChrs[idx]);
  -            } else {
  -                buffer.append(chrs[i]);
  -            }
  -        }
  -        return buffer.toString();
  -    }
   
       private LinkedList set = new LinkedList();
   
  
  
  
  1.1                  jakarta-commons-sandbox/lang/src/java/org/apache/commons/lang/CharSetUtils.java
  
  Index: CharSetUtils.java
  ===================================================================
  package org.apache.commons.lang;
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  import java.util.Iterator;
  import java.util.List;
  import java.util.LinkedList;
  
  /**
   * Numerous routines to manipulate a character set.
   *
   * @author <a href="bayard@generationjava.com">Henri Yandell</a>
   * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
   * @version $Id: CharSetUtils.java,v 1.1 2002/07/17 04:47:52 bayard Exp $
   */
  public class CharSetUtils {
  
      /**
       * Creates a CharSetUtils object which allows a certain amount of 
       * set logic to be performed upon the following syntax:
       *
       * "aeio" which implies 'a','e',..
       * "^e" implies not e. However it only negates, it's not 
       * a set in itself due to the size of that set in unicode.
       * "ej-m" implies e,j->m. e,j,k,l,m.
       */
      public static CharSet evaluateSet(String[] set) {
          return new CharSet(set); 
      }
  
      /**
       * Squeezes any repititions of a character that is mentioned in the 
       * supplied set. An example is:
       *    squeeze("hello", "el")  => "helo"
       * See evaluateSet for set-syntax.
       * 
       * @param str  the string to work from
       * @param set  the character set to use for manipulation
       */
      public static String squeeze(String str, String set) {
          String[] strs = new String[1];
          strs[0] = set;
          return squeeze(str, strs);
      }
  
      /**
       * Squeezes any repititions of a character that is mentioned in the 
       * supplied set. An example is:
       *    squeeze("hello", {"el"})  => "helo"
       * See evaluateSet for set-syntax.
       * 
       * @param str  the string to work from
       * @param set  the character set to use for manipulation
       */
      public static String squeeze(String str, String[] set) {
          CharSet chars = evaluateSet(set);
          StringBuffer buffer = new StringBuffer(str.length());
          char[] chrs = str.toCharArray();
          int sz = chrs.length;
          char lastChar = ' ';
          char ch = ' ';
          for (int i = 0; i < sz; i++) {
              ch = chrs[i];
              if (chars.contains(ch)) {
                  if ((ch == lastChar) && (i != 0)) {
                      continue;
                  }
              }
              buffer.append(ch);
              lastChar = ch;
          }
          return buffer.toString();
      }
  
      /**
       * Takes an argument in set-syntax, see evaluateSet,
       * and returns the number of characters present in the specified string.
       * An example would be:   count("hello", {"c-f","o"}) returns 2.
       *
       * @param str  String target to count characters in
       * @param set  String set of characters to count
       */
      public static int count(String str, String set) {
          String[] strs = new String[1];
          strs[0] = set;
          return count(str, strs);
      }
      
      /**
       * Takes an argument in set-syntax, see evaluateSet,
       * and returns the number of characters present in the specified string.
       * An example would be:   count("hello", {"c-f","o"}) returns 2.
       *
       * @param str  String target to count characters in
       * @param set  String[] set of characters to count
       */
      public static int count(String str, String[] set) {
          CharSet chars = evaluateSet(set);
          int count = 0;
          char[] chrs = str.toCharArray();
          int sz = chrs.length;
          for(int i=0; i<sz; i++) {
              if(chars.contains(chrs[i])) {
                  count++;
              }
          }
          return count;
      }
  
      /**
       * Takes an argument in set-syntax, see evaluateSet,
       * and deletes any of characters present in the specified string.
       * An example would be:   delete("hello", {"c-f","o"}) returns "hll"
       *
       * @param str  String target to delete characters from
       * @param set  String set of characters to delete
       */
      public static String delete(String str, String set) {
          String[] strs = new String[1];
          strs[0] = set;
          return delete(str, strs);
      }
      
      /**
       * Takes an argument in set-syntax, see evaluateSet,
       * and deletes any of characters present in the specified string.
       * An example would be:   delete("hello", {"c-f","o"}) returns "hll"
       *
       * @param str  String target to delete characters from
       * @param set  String[] set of characters to delete
       */
      public static String delete(String str, String[] set) {
          CharSet chars = evaluateSet(set);
          StringBuffer buffer = new StringBuffer(str.length());
          char[] chrs = str.toCharArray();
          int sz = chrs.length;
          for(int i=0; i<sz; i++) {
              if(!chars.contains(chrs[i])) {
                  buffer.append(chrs[i]);
              }
          }
          return buffer.toString();
      }
  
      /**
       * NEEDS TO TAKE A CHAR-SET.
       * Translate characters in a String.
       * An example is:  translate("hello", "ho", "jy") => jelly
       * If the length of characters to search for is greater than the 
       * length of characters to replace, then the last character is 
       * used.
       *
       * @param target String to replace characters  in
       * @param repl String to find that will be replaced
       * @param with String to put into the target String
       */
      public static String translate(String target, String repl, String with) {
          StringBuffer buffer = new StringBuffer(target.length());
          char[] chrs = target.toCharArray();
          char[] withChrs = with.toCharArray();
          int sz = chrs.length;
          int withMax = with.length() - 1;
          for(int i=0; i<sz; i++) {
              int idx = repl.indexOf(chrs[i]);
              if(idx != -1) {
                  if(idx > withMax) {
                      idx = withMax;
                  }
                  buffer.append(withChrs[idx]);
              } else {
                  buffer.append(chrs[i]);
              }
          }
          return buffer.toString();
      }
  
  }
  
  
  

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


Mime
View raw message