Author: sebb
Date: Thu Aug 30 16:56:23 2007
New Revision: 571348

URL: http://svn.apache.org/viewvc?rev=571348&view=rev
Log:
Bug 42947 - TestBeanGUI fields not being updated for short-cut keys

Modified:
    
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
    
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=571348&r1=571347&r2=571348&view=diff
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
 Thu Aug 30 16:56:23 2007
@@ -571,8 +571,10 @@
         * @see 
java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
         */
        public void propertyChange(PropertyChangeEvent evt) {
+               // evt will be null only when called from 
TestBeanGUI.modifyTestElement()
+               // TODO - is the propertyChange event needed, now that 
modifyTestElement calls this?
                for (int i = 0; i < editors.length; i++) {
-                       if (editors[i] == evt.getSource()) {
+                       if (evt == null || editors[i] == evt.getSource()) {
                                Object value = editors[i].getValue();
                                String name = descriptors[i].getName();
                                if (value == null) {
@@ -582,7 +584,9 @@
                                        propertyMap.put(name, value);
                                        log.debug("Set " + name + "= " + value);
                                }
-                               firePropertyChange(name, evt.getOldValue(), 
value);
+                               if (evt != null ) {
+                                       firePropertyChange(name, 
evt.getOldValue(), value);
+                               }
                                return;
                        }
                }

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=571348&r1=571347&r2=571348&view=diff
==============================================================================
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
 Thu Aug 30 16:56:23 2007
@@ -225,6 +225,13 @@
         * @see 
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(org.apache.jmeter.testelement.TestElement)
         */
        public void modifyTestElement(TestElement element) {
+               // Fetch data from screen fields
+               if (customizer instanceof GenericTestBeanCustomizer) {
+                       GenericTestBeanCustomizer gtbc = 
(GenericTestBeanCustomizer) customizer;
+                       gtbc.propertyChange(null); 
+                       // TODO - is this the best way to do this?
+                       // Is the original property change Listener still 
needed?
+               }
                configureTestElement(element);
 
                // Copy all property values from the map into the element:



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to