svn commit: r1815266 - in /jmeter/trunk: src/core/org/apache/jmeter/util/ScopePanel.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Tue Nov 14 21:11:24 2017
New Revision: 1815266

URL: http://svn.apache.org/viewvc?rev=1815266&view=rev
Log:
Bug 61758 - "Apply to:" field in Extractors, Assertions : When entering a JMeter Variable value, the radio box "JMeter Variable" should be selected by default
Bugzilla Id: 61758

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java?rev=1815266&r1=1815265&r2=1815266&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java Tue Nov 14 21:11:24 2017
@@ -21,6 +21,8 @@ package org.apache.jmeter.util;
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -35,7 +37,7 @@ import org.apache.jmeter.gui.util.Horizo
  * to apply the test element to the parent sample, the child samples or both.
  *
  */
-public class ScopePanel extends JPanel implements ActionListener {
+public class ScopePanel extends JPanel implements ActionListener, FocusListener {
 
     private static final long serialVersionUID = 240L;
 
@@ -102,6 +104,7 @@ public class ScopePanel extends JPanel i
             group.add(variableButton);
             buttonPanel.add(variableButton);
             buttonPanel.add(variableName);
+            variableName.addFocusListener(this);
         }
         add(buttonPanel);
     }
@@ -179,4 +182,14 @@ public class ScopePanel extends JPanel i
     public String getVariable() {
         return variableName.getText();
     }
+
+    @Override
+    public void focusGained(FocusEvent focusEvent) {
+        variableButton.setSelected(focusEvent.getSource() == variableName);
+    }
+
+    @Override
+    public void focusLost(FocusEvent focusEvent) {
+        // NOOP
+    }
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1815266&r1=1815265&r2=1815266&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Nov 14 21:11:24 2017
@@ -117,6 +117,7 @@ Summary
     <li><bug>61645</bug>Response Assertion : Add ability to assert on Request Data</li>
     <li><bug>61534</bug>Convert AssertionError to a failed assertion in the JSR223Assertion allowing users to use assert in their code</li>
     <li><bug>61756</bug>Extractors : Improve label name "Reference name" to make it clear what it makes</li>
+    <li><bug>61758</bug><code>Apply to:</code> field in Extractors, Assertions : When entering a value in <code>JMeter Variable Name</code>, the radio box <code>JMeter Variable Name</code> should be selected by default</li>
 </ul>
 
 <h3>Functions</h3>