jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1763632 - in /jmeter/trunk: src/components/org/apache/jmeter/assertions/gui/ xdocs/ xdocs/images/screenshots/ xdocs/usermanual/
Date Thu, 06 Oct 2016 17:04:14 GMT
Author: fschumacher
Date: Thu Oct  6 17:04:13 2016
New Revision: 1763632

URL: http://svn.apache.org/viewvc?rev=1763632&view=rev
Log:
Use more available space for textarea in XPath Assertion.

Bugzilla Id: 60203

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
    jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/images/screenshots/xpath_assertion.png
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java?rev=1763632&r1=1763631&r2=1763632&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java Thu
Oct  6 17:04:13 2016
@@ -27,7 +27,6 @@ import javax.swing.JPanel;
 import org.apache.jmeter.assertions.XPathAssertion;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.gui.layout.VerticalLayout;
 
 public class XPathAssertionGui extends AbstractAssertionGui {
 
@@ -76,14 +75,22 @@ public class XPathAssertionGui extends A
     }
 
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must
be private or final)
-        setLayout(new VerticalLayout(5, VerticalLayout.BOTH, VerticalLayout.TOP));
+        setLayout(new BorderLayout());
         setBorder(makeBorder());
 
-        add(makeTitlePanel());
-        Box box = Box.createVerticalBox();
-        box.add(createScopePanel(true));
-        add(box);
-        
+        Box topBox = Box.createVerticalBox();
+
+        topBox.add(makeTitlePanel());
+
+        topBox.add(createScopePanel(true));
+
+        xml = new XMLConfPanel();
+        xml.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils
+                .getResString("xpath_assertion_option"))); //$NON-NLS-1$
+        topBox.add(xml);
+
+        add(topBox, BorderLayout.NORTH);
+
         // USER_INPUT
         JPanel sizePanel = new JPanel(new BorderLayout());
         sizePanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
@@ -91,13 +98,7 @@ public class XPathAssertionGui extends A
                 getXPathAttributesTitle()));
         xpath = new XPathPanel();
         sizePanel.add(xpath);
-
-        xml = new XMLConfPanel();
-        xml.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils
-                .getResString("xpath_assertion_option"))); //$NON-NLS-1$
-        add(xml);
-
-        add(sizePanel);
+        add(sizePanel, BorderLayout.CENTER);
     }
 
     /**

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?rev=1763632&r1=1763631&r2=1763632&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java Thu Oct 
6 17:04:13 2016
@@ -20,6 +20,7 @@ package org.apache.jmeter.assertions.gui
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.BorderLayout;
 
 import javax.swing.Box;
 import javax.swing.JButton;
@@ -62,18 +63,18 @@ public class XPathPanel extends JPanel {
     }
 
     private void init() { // WARNING: called from ctor so must not be overridden (i.e. must
be private or final)
+        setLayout(new BorderLayout());
+
         Box hbox = Box.createHorizontalBox();
+
         hbox.add(Box.createHorizontalGlue());
-        hbox.add(JTextScrollPane.getInstance(getXPathField()));
+        hbox.add(getNegatedCheckBox());
         hbox.add(Box.createHorizontalGlue());
         hbox.add(getCheckXPathButton());
+        hbox.add(Box.createHorizontalGlue());
 
-        Box vbox = Box.createVerticalBox();
-        vbox.add(hbox);
-        vbox.add(Box.createVerticalGlue());
-        vbox.add(getNegatedCheckBox());
-
-        add(vbox);
+        add(JTextScrollPane.getInstance(getXPathField()), BorderLayout.CENTER);
+        add(hbox, BorderLayout.SOUTH);
 
         setDefaultValues();
     }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1763632&r1=1763631&r2=1763632&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Oct  6 17:04:13 2016
@@ -128,6 +128,7 @@ Summary
     <li><bug>60050</bug>CSV Data Set : Make it clear in the logs when a
thread will exit due to this configuration</li>
     <li><bug>59962</bug>Cache Manager does not update expires date when
response code is <code>304</code>.</li>
     <li><bug>60018</bug>Timer : Add a factor to apply on pauses. Partly
based on a patch by Ubik Load Pack (support at ubikloadpack.com)</li>
+    <li><bug>60203</bug>Use more available space for textarea in XPath
Assertion.</li>
 </ul>
 
 <h3>Functions</h3>

Modified: jmeter/trunk/xdocs/images/screenshots/xpath_assertion.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/xpath_assertion.png?rev=1763632&r1=1763631&r2=1763632&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1763632&r1=1763631&r2=1763632&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Thu Oct  6 17:04:13 2016
@@ -4718,7 +4718,7 @@ props.put("PROP1","1234");</source></li>
 
 </properties>
 </component>
-<component name="XPath Assertion" index="&sect-num;.5.8"  width="800" height="317"
screenshot="xpath_assertion.png">
+<component name="XPath Assertion" index="&sect-num;.5.8"  width="871" height="615"
screenshot="xpath_assertion.png">
 <description><p>The XPath Assertion tests a document for well formedness, has
the option
 of validating against a DTD, or putting the document through JTidy and testing for an
 XPath.  If that XPath exists, the Assertion is true.  Using "<code>/</code>"
will match any well-formed



Mime
View raw message