jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1814963 - in /jmeter/trunk: src/core/org/apache/jmeter/testbeans/gui/FileEditor.java xdocs/changes.xml
Date Sat, 11 Nov 2017 17:35:16 GMT
Author: pmouawad
Date: Sat Nov 11 17:35:16 2017
New Revision: 1814963

URL: http://svn.apache.org/viewvc?rev=1814963&view=rev
Log:
Bug 61625 - File Editor used in BeanInfo behaves strangely under all LAFs with impact on CSVDataSet,
JSR223, BSF, Beanshell Element
Bugzilla Id: 61625

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java?rev=1814963&r1=1814962&r2=1814963&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java Sat Nov 11 17:35:16
2017
@@ -91,12 +91,12 @@ public class FileEditor implements Prope
         boolean notExpression = GenericTestBeanCustomizer.notExpression(descriptor);
         boolean notOther = GenericTestBeanCustomizer.notOther(descriptor);
         Object defaultValue = descriptor.getValue(GenericTestBeanCustomizer.DEFAULT);
-        ComboStringEditor cse = new ComboStringEditor(null, notExpression && notOther,
notNull);
+        FieldStringEditor cse = new FieldStringEditor();
         editor = new WrapperEditor(this, new SimpleFileEditor(), cse,
                 !notNull, // acceptsNull
                 !notExpression, // acceptsExpressions
                 !notOther, // acceptsOther
-                defaultValue); // default
+                defaultValue == null ? "":defaultValue); // default // //$NON-NLS-1$
 
         // Create a panel containing the combo and the button:
         panel = new JPanel(new BorderLayout(5, 0));

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1814963&r1=1814962&r2=1814963&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Nov 11 17:35:16 2017
@@ -217,6 +217,7 @@ Summary
 <h3>General</h3>
 <ul>
     <li><bug>61661</bug>Avoid startup/shutdown problems due to 3rd party
Thread Listener plugins throwing RuntimeException</li>
+    <li><bug>61625</bug>File Editor used in BeanInfo behaves strangely
under all LAFs with impact on CSVDataSet, JSR223, BSF, Beanshell Element</li>
 </ul>
 
  <!--  =================== Thanks =================== -->



Mime
View raw message