You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/08/17 12:12:33 UTC

svn commit: r1514976 - in /jmeter/trunk/src: components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java core/org/apache/jmeter/testbeans/gui/EnumEditor.java

Author: sebb
Date: Sat Aug 17 10:12:33 2013
New Revision: 1514976

URL: http://svn.apache.org/r1514976
Log:
EnumEditor operates Integer values so the DEFAULT should be an Integer

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java?rev=1514976&r1=1514975&r2=1514976&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java Sat Aug 17 10:12:33 2013
@@ -39,7 +39,7 @@ public class ConstantThroughputTimerBean
         p.setValue(DEFAULT, Double.valueOf(0.0));
 
         p = property("calcMode", ConstantThroughputTimer.Mode.class); //$NON-NLS-1$
-        p.setValue(DEFAULT, ConstantThroughputTimer.Mode.ThisThreadOnly);
+        p.setValue(DEFAULT, Integer.valueOf(ConstantThroughputTimer.Mode.ThisThreadOnly.ordinal()));
         p.setValue(NOT_UNDEFINED, Boolean.TRUE); // must be defined
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java?rev=1514976&r1=1514975&r2=1514976&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/EnumEditor.java Sat Aug 17 10:12:33 2013
@@ -49,9 +49,9 @@ class EnumEditor extends PropertyEditorS
         for(Enum<?> e : enumClazz.getEnumConstants()) {
             model.addElement(rb.getObject(e.toString()));
         }
-        Enum<?> def = (Enum<?>) descriptor.getValue(GenericTestBeanCustomizer.DEFAULT);
-        if (def != null) {
-            defaultIndex = def.ordinal();
+        Object def = descriptor.getValue(GenericTestBeanCustomizer.DEFAULT);
+        if (def instanceof Integer) {
+            defaultIndex = ((Integer) def).intValue();
         } else {
             defaultIndex = 0;
         }