[jmeter] branch master updated: Increase visible lines of code in IfController and WhileController

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 78425299 Increase visible lines of code in IfController and WhileController
78425299 is described below

commit 7842529941b5f2cb988d85554bcec718aac1dfde
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun May 23 17:57:15 2021 +0200

    Increase visible lines of code in IfController and WhileController
    
    Closes #665
---
 .../main/java/org/apache/jmeter/control/gui/IfControllerPanel.java    | 4 ++--
 .../main/java/org/apache/jmeter/control/gui/WhileControllerGui.java   | 4 ++--
 xdocs/changes.xml                                                     | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
index c40943d..f4a3802 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/IfControllerPanel.java
@@ -197,13 +197,13 @@ public class IfControllerPanel extends AbstractControllerGui implements ChangeLi
 
         // Condition LABEL
         conditionLabel = new JLabel(JMeterUtils.getResString("if_controller_label")); // $NON-NLS-1$
-        conditionPanel.add(conditionLabel);
+        conditionPanel.add(conditionLabel, "top");
         conditionLabel.setName("if_controller_label"); // $NON-NLS-1$
 
         // Condition
         theCondition = JSyntaxTextArea.getInstance(5, 50);
         conditionLabel.setLabelFor(theCondition);
-        conditionPanel.add(JTextScrollPane.getInstance(theCondition));
+        conditionPanel.add(JTextScrollPane.getInstance(theCondition), "push, grow");
 
         JLabel ifControllerTipLabel = new JLabel(JMeterUtils.getResString("if_controller_tip")); // $NON-NLS-1$
         useLastSampleStatusButton = new JButton(JMeterUtils.getResString("if_controller_use_last_sample_ok")); // $NON-NLS-1$
diff --git a/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
index 42bd95e..81a8ed2 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/gui/WhileControllerGui.java
@@ -131,9 +131,9 @@ public class WhileControllerGui extends AbstractControllerGui {
         // This means exit if last sample failed
         theCondition = JSyntaxTextArea.getInstance(5, 50);
         JTextScrollPane theConditionJSP = JTextScrollPane.getInstance(theCondition);
-        conditionPanel.add(JMeterUtils.labelFor(theConditionJSP, "while_controller_label"));
+        conditionPanel.add(JMeterUtils.labelFor(theConditionJSP, "while_controller_label"), "top");
         theCondition.setName(CONDITION);
-        conditionPanel.add(theConditionJSP);
+        conditionPanel.add(theConditionJSP, "push, grow");
 
         return conditionPanel;
     }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 692132b..ec0ea04 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -93,6 +93,8 @@ Summary
 
 <h3>Controllers</h3>
 <ul>
+  <li><pr>665</pr>Increase visible lines of code in <code>IfController</code> and <code>WhileController</code>.
+    Based on an idea by David Getzlaff (david.getzlaff at t-systems.com>).</li>
 </ul>
 
 <h3>Listeners</h3>