Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 74573 invoked from network); 29 Dec 2001 20:21:41 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 29 Dec 2001 20:21:41 -0000 Received: (qmail 29668 invoked by uid 97); 29 Dec 2001 20:21:42 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 29652 invoked by uid 97); 29 Dec 2001 20:21:41 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 29641 invoked by uid 97); 29 Dec 2001 20:21:41 -0000 Date: 29 Dec 2001 20:21:34 -0000 Message-ID: <20011229202134.77988.qmail@icarus.apache.org> From: sbailliez@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/util StringUtilsTest.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N sbailliez 01/12/29 12:21:34 Modified: src/main/org/apache/tools/ant/util StringUtils.java Added: src/testcases/org/apache/tools/ant/util StringUtilsTest.java Log: Added additional methods to deal with strings. This is mostly to avoid the use of regexp for simple tasks. Revision Changes Path 1.2 +51 -0 jakarta-ant/src/main/org/apache/tools/ant/util/StringUtils.java Index: StringUtils.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/StringUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StringUtils.java 15 Dec 2001 00:15:16 -0000 1.1 +++ StringUtils.java 29 Dec 2001 20:21:34 -0000 1.2 @@ -55,6 +55,7 @@ import java.io.StringWriter; import java.io.PrintWriter; +import java.util.Vector; /** * A set of helper methods related to string manipulation. @@ -67,6 +68,55 @@ public final static String LINE_SEP = System.getProperty("line.separator"); /** + * Splits up a string into a list of lines. It is equivalent + * to split(data, '\n'). + * @param data the string to split up into lines. + * @return the list of lines available in the string. + */ + public static Vector lineSplit(String data){ + return split(data, '\n'); + } + + /** + * Splits up a string where elements are separated by a specific + * character and return all elements. + * @param data the string to split up. + * @param ch the separator character. + * @return the list of elements. + */ + public static Vector split(String data, int ch){ + Vector elems = new Vector(); + int pos = -1; + int i = 0; + while ( (pos = data.indexOf(ch, i) ) != -1 ){ + String elem = data.substring(i, pos); + elems.addElement(elem); + i = pos + 1; + } + elems.addElement( data.substring(i) ); + return elems; + } + + /** + * Replace occurrences into a string. + * @param data the string to replace occurrences into + * @param from the occurrence to replace. + * @param to the occurrence to be used as a replacement. + * @return the new string with replaced occurrences. + */ + public static String replace(String data, String from, String to){ + StringBuffer buf = new StringBuffer(data.length()); + int pos = -1; + int i = 0; + while ( (pos = data.indexOf(from, i)) != -1 ){ + buf.append( data.substring(i, pos) ).append(to); + i = pos + from.length(); + } + buf.append( data.substring(i) ); + return buf.toString(); + } + + /** * Convenient method to retrieve the full stacktrace from a given exception. * @param t the exception to get the stacktrace from. * @return the stacktrace from the given exception. @@ -79,4 +129,5 @@ pw.close(); return sw.toString(); } + } 1.1 jakarta-ant/src/testcases/org/apache/tools/ant/util/StringUtilsTest.java Index: StringUtilsTest.java =================================================================== /* * The Apache Software License, Version 1.1 * * Copyright (c) 2001 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", "Ant", 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 Group. * * 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 * . */ package org.apache.tools.ant.util; import java.util.Vector; import junit.framework.TestCase; /** * Test for StringUtils * @author Stephane Bailliez */ public class StringUtilsTest extends TestCase { public StringUtilsTest(String s) { super(s); } public void testSplit(){ final String data = "a,b,,"; Vector res = StringUtils.split(data, ','); assertEquals(4, res.size()); assertEquals("a", res.elementAt(0)); assertEquals("b", res.elementAt(1)); assertEquals("", res.elementAt(2)); assertEquals("", res.elementAt(3)); } public void testSplitLines(){ final String data = "a\r\nb\nc\nd\ne"; Vector res = StringUtils.lineSplit(data); assertEquals(5, res.size()); assertEquals("a\r", res.elementAt(0)); assertEquals("b", res.elementAt(1)); assertEquals("c", res.elementAt(2)); assertEquals("d", res.elementAt(3)); assertEquals("e", res.elementAt(4)); } public void testReplace() { final String data = "abcabcabca"; String res = StringUtils.replace(data, "a", ""); assertEquals("bcbcbc", res); } } -- To unsubscribe, e-mail: For additional commands, e-mail: