jsalvata 2003/12/16 06:30:17 Modified: src/core/org/apache/jmeter/engine/util ValueReplacer.java Log: * New public method to add a collection of variables. * Added Apache license Revision Changes Path 1.12 +69 -4 jakarta-jmeter/src/core/org/apache/jmeter/engine/util/ValueReplacer.java Index: ValueReplacer.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/ValueReplacer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ValueReplacer.java 15 Dec 2003 08:10:30 -0000 1.11 +++ ValueReplacer.java 16 Dec 2003 14:30:17 -0000 1.12 @@ -1,4 +1,62 @@ -package org.apache.jmeter.engine.util; +/* + * ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001-2003 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 acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache JMeter" must not be used to endorse or promote products + * derived from this software without prior written permission. For + * written permission, please contact [EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called "Apache", + * "Apache JMeter", nor may "Apache" appear in their name, 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/>. + * + * @author Michael Stover + * @author <a href="mailto:[EMAIL PROTECTED]">Jordi Salvat i Alabart</a> + * @version $Id$ + */ + package org.apache.jmeter.engine.util; import java.util.ArrayList; import java.util.Collection; @@ -24,9 +82,6 @@ import org.apache.jorphan.logging.LoggingManager; import org.apache.log.Logger; -/** - * @version $Revision$ - */ public class ValueReplacer { transient private static Logger log = LoggingManager.getLoggerForClass(); @@ -88,6 +143,16 @@ public void addVariable(String name, String value) { variables.put(name, value); + } + + /** + * Add all the given variables to this replacer's variables map. + * + * @param vars A map of variable name-value pairs (String-to-String). + */ + public void addVariables(Map vars) + { + variables.putAll(vars); } private Collection replaceValues(
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
