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/16 20:04:04 UTC
svn commit: r1514827 - in /jmeter/trunk:
src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
xdocs/changes.xml
Author: sebb
Date: Fri Aug 16 18:04:04 2013
New Revision: 1514827
URL: http://svn.apache.org/r1514827
Log:
ComboStringEditor should implement ClearGui
Bugzilla Id: 55436
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java?rev=1514827&r1=1514826&r2=1514827&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java Fri Aug 16 18:04:04 2013
@@ -25,6 +25,7 @@ import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.text.JTextComponent;
+import org.apache.jmeter.gui.ClearGui;
import org.apache.jmeter.util.JMeterUtils;
/**
@@ -42,7 +43,7 @@ import org.apache.jmeter.util.JMeterUtil
* </ul>
*
*/
-class ComboStringEditor extends PropertyEditorSupport implements ItemListener {
+class ComboStringEditor extends PropertyEditorSupport implements ItemListener, ClearGui {
private static final String[] EMPTY_STRING_ARRAY = new String[0];
@@ -207,10 +208,6 @@ class ComboStringEditor extends Property
}
}
- public String getInitialEditValue() {
- return initialEditValue;
- }
-
/**
* {@inheritDoc}
*/
@@ -244,4 +241,9 @@ class ComboStringEditor extends Property
return s;
}
}
+
+ @Override
+ public void clearGui() {
+ setAsText(initialEditValue);
+ }
}
\ No newline at end of file
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1514827&r1=1514826&r2=1514827&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Fri Aug 16 18:04:04 2013
@@ -756,9 +756,6 @@ public class GenericTestBeanCustomizer e
} else {
we.resetValue();
}
- } else if (propertyEditor instanceof ComboStringEditor) {
- ComboStringEditor cse = (ComboStringEditor) propertyEditor;
- cse.setAsText(cse.getInitialEditValue());
} else {
propertyEditor.setAsText("");
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1514827&r1=1514826&r2=1514827&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Aug 16 18:04:04 2013
@@ -406,6 +406,7 @@ Previously the default was 1, which coul
<li>Re-organised and simplified NOTICE and LICENSE files.</li>
<li><bugzilla>55411</bugzilla> - NativeCommand could be useful elsewhere. Copied code to o.a.jorphan.exec.</li>
<li><bugzilla>55435</bugzilla> - ComboStringEditor could be simplified to make most settings final</li>
+<li><bugzilla>55436</bugzilla> - ComboStringEditor should implement ClearGui</li>
</ul>
<h2>Thanks</h2>