svn commit: r1509878 - in /jmeter/trunk: src/components/org/apache/jmeter/assertions/gui/XPathPanel.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Fri Aug  2 21:53:41 2013
New Revision: 1509878

URL: http://svn.apache.org/r1509878
Log:
Bug 54789 - XPath Assertion - GUI enhancements to increase readability and ease of use
Bugzilla Id: 54789

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
    jmeter/trunk/xdocs/changes.xml

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=1509878&r1=1509877&r2=1509878&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 Fri Aug  2 21:53:41 2013
@@ -26,10 +26,11 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JTextField;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.util.XPathUtil;
 import org.apache.jorphan.logging.LoggingManager;
@@ -44,7 +45,7 @@ public class XPathPanel extends JPanel {
 
     private JCheckBox negated;
 
-    private JTextField xpath;
+    private JSyntaxTextArea xpath;
 
     private JButton checkXPath;
 
@@ -59,7 +60,7 @@ public class XPathPanel extends JPanel {
     private void init() {
         Box hbox = Box.createHorizontalBox();
         hbox.add(Box.createHorizontalGlue());
-        hbox.add(getXPathTextField());
+        hbox.add(new JTextScrollPane(getXPathField()));
         hbox.add(Box.createHorizontalGlue());
         hbox.add(getCheckXPathButton());
 
@@ -145,9 +146,10 @@ public class XPathPanel extends JPanel {
         return checkXPath;
     }
 
-    public JTextField getXPathTextField() {
+    public JSyntaxTextArea getXPathField() {
         if (xpath == null) {
-            xpath = new JTextField(50);
+            xpath = new JSyntaxTextArea(20, 80);
+            xpath.setLanguage("xpath"); //$NON-NLS-1$
         }
         return xpath;
     }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1509878&r1=1509877&r2=1509878&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Aug  2 21:53:41 2013
@@ -316,6 +316,7 @@ Previously the default was 1, which coul
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
+<li><bugzilla>54789</bugzilla> - XPath Assertion - GUI enhancements to increase readability and ease of use</li>
 </ul>
 
 <h3>Functions</h3>