svn commit: r1514683 - /jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java

[se...@apache.org]

Author: sebb
Date: Fri Aug 16 12:43:00 2013
New Revision: 1514683

URL: http://svn.apache.org/r1514683
Log:
Need GUI Editor to process fields which are based on Enums with localised display strings
No need for caller to provide the ResourceBundle as we already have it
Bugzilla Id: 55421

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java?rev=1514683&r1=1514682&r2=1514683&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java Fri Aug 16 12:43:00 2013
@@ -187,15 +187,15 @@ public abstract class BeanInfoSupport ex
      * @param name
      *            property name
      * @param enumClass the enum class that is to be used by the editor
-     * @param rb the resource bundle to use for creating the display names
      * @return descriptor for a property of that name, or null if there's none
      */
     protected PropertyDescriptor property(final String name, 
-            final Class<? extends Enum<?>> enumClass, final ResourceBundle rb) {
+            final Class<? extends Enum<?>> enumClass) {
         PropertyDescriptor property = property(name);
         if (property != null) {
             property.setValue(GenericTestBeanCustomizer.GUITYPE, enumClass);
-            property.setValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE, rb);
+            // we also provide the resource bundle
+            property.setValue(GenericTestBeanCustomizer.RESOURCE_BUNDLE, getBeanDescriptor().getValue(RESOURCE_BUNDLE));
         }
         return property;
     }