// $Header$
/*
 * Copyright 2003-2004 The Apache Software Foundation.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * 
 */

/*
 * Created on Jun 13, 2003
 */
package org.apache.jmeter.util;

import java.io.FileInputStream;
import java.util.Properties;

import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;

/**
 * @author ano ano
 * @version $Revision$
 */
public final class NameUpdater {
	private static Properties nameMap;

	private static Logger log = LoggingManager.getLoggerForClass();

	static {
		nameMap = new Properties();
		try {
			nameMap.load(new FileInputStream(JMeterUtils.getJMeterHome()
					+ JMeterUtils.getPropDefault("upgrade_properties", "/bin/upgrade.properties")));
		} catch (Exception e) {
			log.error("Bad upgrade file", e);
		}
	}

	public static String getCurrentName(String className) {
		if (nameMap.containsKey(className)) {
			String newName = nameMap.getProperty(className);
			log.info("Upgrading class " + className + " to " + newName);
			return newName;
		}
		return className;
	}

	public static String getCurrentName(String propertyName, String className) {
		String key = className + "/" + propertyName;
		if (nameMap.containsKey(key)) {
			String newName = nameMap.getProperty(key);
			log.info("Upgrading property " + propertyName + " to " + newName);
			return newName;
		}
		return propertyName;
	}

	public static String getCurrentName(String value, String propertyName, String className) {
		String key = className + "." + propertyName + "/" + value;
		if (nameMap.containsKey(key)) {
			String newValue = nameMap.getProperty(key);
			log.info("Upgrading value " + value + " to " + newValue);
			return newValue;
		}
		return value;
	}

	/**
	 * Private constructor to prevent instantiation.
	 */
	private NameUpdater() {
	}
}

@@ -1543,32 +1543,722 @@
 rn className;%0A%09%7D
+%0A    /**%0A     * Looks up test element / gui class combination; if that%0A     * does not exist in the map, then defaults to getCurrentName.%0A     * %0A     * @param testClassName - test element class name%0A     * @param guiClassName - associated gui class name%0A     * @return new test class name%0A     */%0A%0A    public static String getCurrentTestName(String testClassName, String guiClassName) %7B%0A        String key = testClassName + %22%7C%22 + guiClassName;%0A        if (nameMap.containsKey(key)) %7B%0A            String newName = nameMap.getProperty(key);%0A            log.info(%22Upgrading %22 + key + %22 to %22 + newName);%0A            return newName;%0A        %7D%0A        return getCurrentName(testClassName);%0A    %7D
 %0A%0A%09public static

Add getCurrentTestName() method for handling changes of test class