svn commit: r1796684 - in /jmeter/trunk: src/core/org/apache/jmeter/control/gui/IfControllerPanel.java src/core/org/apache/jmeter/control/gui/WhileControllerGui.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Mon May 29 19:40:57 2017
New Revision: 1796684

URL: http://svn.apache.org/viewvc?rev=1796684&view=rev
Log:
Bug 61131 - IfController and WhileController : Improve UX
Bugzilla Id: 61131

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
    jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java?rev=1796684&r1=1796683&r2=1796684&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java Mon May 29 19:40:57 2017
@@ -19,13 +19,15 @@
 package org.apache.jmeter.control.gui;
 
 import java.awt.BorderLayout;
+
 import javax.swing.Box;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 import org.apache.jmeter.control.IfController;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -44,7 +46,7 @@ public class IfControllerPanel extends A
      * A field allowing the user to specify the number of times the controller
      * should loop.
      */
-    private JTextField theCondition;
+    private JSyntaxTextArea theCondition;
 
     private JCheckBox useExpression;
 
@@ -172,11 +174,11 @@ public class IfControllerPanel extends A
         JLabel conditionLabel = new JLabel(JMeterUtils.getResString("if_controller_label")); // $NON-NLS-1$
         conditionPanel.add(conditionLabel, BorderLayout.WEST);
 
-        // TEXT FIELD
-        theCondition = new JTextField(""); // $NON-NLS-1$
+        // Condition
+        theCondition = JSyntaxTextArea.getInstance(5, 50); // $NON-NLS-1$
         theCondition.setToolTipText(JMeterUtils.getResString("if_controller_performance")); // $NON-NLS-1$
         conditionLabel.setLabelFor(theCondition);
-        conditionPanel.add(theCondition, BorderLayout.CENTER);
+        conditionPanel.add(JTextScrollPane.getInstance(theCondition), BorderLayout.CENTER);
        
         conditionPanel.add(Box.createHorizontalStrut(conditionLabel.getPreferredSize().width
                 + theCondition.getPreferredSize().width), BorderLayout.NORTH);

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java?rev=1796684&r1=1796683&r2=1796684&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java Mon May 29 19:40:57 2017
@@ -23,9 +23,10 @@ import java.awt.BorderLayout;
 import javax.swing.Box;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
 
 import org.apache.jmeter.control.WhileController;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
@@ -38,7 +39,7 @@ public class WhileControllerGui extends
     /**
      * A field allowing the user to specify the condition (not yet used).
      */
-    private JTextField theCondition;
+    private JSyntaxTextArea theCondition;
 
     /** The name of the condition field component. */
     private static final String CONDITION = "While_Condition"; // $NON-NLS-1$
@@ -133,12 +134,12 @@ public class WhileControllerGui extends
         JLabel conditionLabel = new JLabel(JMeterUtils.getResString(CONDITION_LABEL));
         conditionPanel.add(conditionLabel, BorderLayout.WEST);
 
-        // TEXT FIELD
+        // Condition
         // This means exit if last sample failed
-        theCondition = new JTextField("");  // $NON-NLS-1$
+        theCondition = JSyntaxTextArea.getInstance(5, 50);  // $NON-NLS-1$
         theCondition.setName(CONDITION);
         conditionLabel.setLabelFor(theCondition);
-        conditionPanel.add(theCondition, BorderLayout.CENTER);
+        conditionPanel.add(JTextScrollPane.getInstance(theCondition), BorderLayout.CENTER);
         
         conditionPanel.add(Box.createHorizontalStrut(conditionLabel.getPreferredSize().width
                 + theCondition.getPreferredSize().width), BorderLayout.NORTH);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1796684&r1=1796683&r2=1796684&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon May 29 19:40:57 2017
@@ -96,6 +96,7 @@ Summary
 
 <h3>Controllers</h3>
 <ul>
+    <li><bug>61131</bug>IfController and WhileController : Improve UX</li>
 </ul>
 
 <h3>Listeners</h3>