jsalvata 2004/02/01 15:49:02
Modified: src/components/org/apache/jmeter/timers
ConstantThroughputTimerBeanInfo.java
Added: src/core/org/apache/jmeter/testbeans BeanInfoSupport.java
Removed: src/core/org/apache/jmeter/testbeans/gui
BeanInfoSupport.java
Log:
Moving BeanInfoSupport from jmeter.testbeans.gui to
jmeter.testbeans, which is where it belongs.
Revision Changes Path
1.1
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
Index: BeanInfoSupport.java
===================================================================
/*
* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2004 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 <a href="mailto:[EMAIL PROTECTED]">Jordi Salvat i Alabart</a>
* @version $Id: BeanInfoSupport.java,v 1.1 2004/02/01 23:49:02 jsalvata Exp $
*/
package org.apache.jmeter.testbeans;
import java.awt.Image;
import java.beans.BeanDescriptor;
import java.beans.BeanInfo;
import java.beans.EventSetDescriptor;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.MethodDescriptor;
import java.beans.PropertyDescriptor;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.LocaleChangeEvent;
import org.apache.jmeter.util.LocaleChangeListener;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
/**
* Support class for test bean beanInfo objects. It will help using the
* introspector to get most of the information, to then modify it at will.
* <p>
* To use, subclass it, create a subclass with a parameter-less constructor
* that:
* <ol>
* <li>Calls super(beanClass)
* <li>Modifies the property descriptors, bean descriptor, etc. at will.
* </ol>
* <p>
* Even before any such modifications, a resource bundle named xxxResources
* (where xxx is the fully qualified bean class name) will be obtained if
* available and used to localize the following:
* <ul>
* <li>Bean's display name -- from property <b>displayName</b>.
* <li>Properties' display names -- from properties
* <b><i>propertyName</i>.displayName</b>.
* <li>Properties' short descriptions -- from properties
* <b><i>propertyName</i>.shortDescription</b>.
* </ul>
* <p>
* The resource bundle will be stored as the bean descriptor's "resourceBundle"
* attribute, so that it can be used for further localization. TestBeanGUI, for
* example, uses it to obtain the group's display names from properties
* <b><i>groupName</i>.displayName</b>.
*/
public abstract class BeanInfoSupport
implements BeanInfo, LocaleChangeListener
{
private static transient Logger log = LoggingManager.getLoggerForClass();
// Some known attribute names, just for convenience:
public static final String TAGS=
GenericTestBeanCustomizer.TAGS;
public static final String NOT_UNDEFINED=
GenericTestBeanCustomizer.NOT_UNDEFINED;
public static final String NOT_EXPRESSION=
GenericTestBeanCustomizer.NOT_EXPRESSION;
public static final String NOT_OTHER=
GenericTestBeanCustomizer.NOT_OTHER;
public static final String DEFAULT=
GenericTestBeanCustomizer.DEFAULT;
public static final String RESOURCE_BUNDLE=
GenericTestBeanCustomizer.RESOURCE_BUNDLE;
/**
* The class for which we're providing the bean info.
*/
private Class beanClass;
/**
* The BeanInfo for our class as obtained by the introspector.
*/
private BeanInfo rootBeanInfo;
/**
* Construct a BeanInfo for the given class.
*/
protected BeanInfoSupport(Class beanClass) {
this.beanClass= beanClass;
try {
rootBeanInfo= Introspector.getBeanInfo(
beanClass,
Introspector.IGNORE_IMMEDIATE_BEANINFO);
} catch (IntrospectionException e) {
log.error("Can't introspect.", e);
throw new Error(e.toString()); // Programming error: bail out.
}
try{
ResourceBundle resourceBundle= ResourceBundle.getBundle(
beanClass.getName()+"Resources",
JMeterUtils.getLocale());
// Store the resource bundle as an attribute of the
BeanDescriptor:
getBeanDescriptor().setValue(RESOURCE_BUNDLE, resourceBundle);
// Localize the bean name
try
{
getBeanDescriptor().setDisplayName(
resourceBundle.getString("displayName"));
}
catch (MissingResourceException e)
{
log.debug(
"Localized display name not available for bean
"
+beanClass.getName());
}
// Localize the property names and descriptions:
PropertyDescriptor[] properties= getPropertyDescriptors();
for (int i=0; i<properties.length; i++)
{
String name= properties[i].getName();
try
{
properties[i].setDisplayName(
resourceBundle.getString(name+".displayName"));
}
catch (MissingResourceException e)
{
log.debug(
"Localized display name not available
for property "
+name);
}
try
{
properties[i].setShortDescription(
resourceBundle.getString(name+".shortDescription"));
}
catch (MissingResourceException e)
{
log.debug(
"Localized short description not
available for property "
+name);
}
}
}
catch (MissingResourceException e)
{
log.warn("Localized strings not available for bean
"+beanClass);
}
JMeterUtils.addLocaleChangeListener(this);
}
/**
* Get the property descriptor for the property of the given name.
*
* @param name property name
* @return descriptor for a property of that name, or null if there's none
*/
protected PropertyDescriptor property(String name) {
PropertyDescriptor[] properties= getPropertyDescriptors();
for (int i=0; i<properties.length; i++)
{
if (properties[i].getName().equals(name)) {
return properties[i];
}
}
return null;
}
private int numCreatedGroups= 0;
/**
* Utility method to group and order properties.
* <p>
* It will assing the given group name to each of the named properties,
* and set their order attribute so that they are shown in the given order.
* <p>
* The created groups will get order 1, 2, 3,... in the order in which they
* are created.
*
* @param group name of the group
* @param names property names in the desired order
*/
protected void createPropertyGroup(String group, String[] names)
{
for (int i=0; i<names.length; i++)
{
PropertyDescriptor p= property(names[i]);
p.setValue(GenericTestBeanCustomizer.GROUP, group);
p.setValue(GenericTestBeanCustomizer.ORDER, new Integer(i));
}
numCreatedGroups++;
getBeanDescriptor().setValue(
GenericTestBeanCustomizer.ORDER(group),
new Integer(numCreatedGroups));
}
public BeanInfo[] getAdditionalBeanInfo() {
return rootBeanInfo.getAdditionalBeanInfo();
}
public BeanDescriptor getBeanDescriptor() {
return rootBeanInfo.getBeanDescriptor();
}
public int getDefaultEventIndex() {
return rootBeanInfo.getDefaultEventIndex();
}
public int getDefaultPropertyIndex() {
return rootBeanInfo.getDefaultPropertyIndex();
}
public EventSetDescriptor[] getEventSetDescriptors() {
return rootBeanInfo.getEventSetDescriptors();
}
public Image getIcon(int iconKind) {
return rootBeanInfo.getIcon(iconKind);
}
public MethodDescriptor[] getMethodDescriptors() {
return rootBeanInfo.getMethodDescriptors();
}
public PropertyDescriptor[] getPropertyDescriptors() {
return rootBeanInfo.getPropertyDescriptors();
}
/* (non-Javadoc)
* @see
org.apache.jmeter.util.LocaleChangeListener#localeChanged(org.apache.jmeter.util.LocaleChangeEvent)
*/
public void localeChanged(LocaleChangeEvent event)
{
// This object is locale-dependent, so if the locale changes, we need
// to remove it from the Introspector's BeanInfo cache:
Introspector.flushFromCaches(beanClass);
// Now this instance is no longer useful -- no more need to listen to
// this events (and prevent being GCd):
JMeterUtils.removeLocaleChangeListener(this);
// Note: another option --just as easy to implement-- would be to
// regenerate the locale-dependent information. But this would require
// any subclasses grabbing additional locale-dependent information to
// override this method, while this solution will work without that.
}
}
1.2 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
Index: ConstantThroughputTimerBeanInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConstantThroughputTimerBeanInfo.java 16 Jan 2004 02:31:35 -0000 1.1
+++ ConstantThroughputTimerBeanInfo.java 1 Feb 2004 23:49:02 -0000 1.2
@@ -59,7 +59,7 @@
import java.beans.PropertyDescriptor;
-import org.apache.jmeter.testbeans.gui.BeanInfoSupport;
+import org.apache.jmeter.testbeans.BeanInfoSupport;
public class ConstantThroughputTimerBeanInfo extends BeanInfoSupport
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
