Author: pmouawad
Date: Thu Nov 16 22:01:20 2017
New Revision: 1815516
URL: http://svn.apache.org/viewvc?rev=1815516&view=rev
Log:
Bug 61769 - View Results Tree: Use syntax highlighter in XPath Tester, JSON
Path Tester and CSS/JQuery Tester
Bugzilla Id: 61769
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java?rev=1815516&r1=1815515&r2=1815516&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/extractor/json/render/RenderAsJsonRenderer.java
Thu Nov 16 22:01:20 2017
@@ -37,6 +37,8 @@ import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import org.apache.jmeter.extractor.json.jsonpath.JSONManager;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.RenderAsJSON;
@@ -44,6 +46,7 @@ import org.apache.jmeter.visualizers.Res
import org.apache.jmeter.visualizers.ViewResultsFullVisualizer;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,7 +65,7 @@ public class RenderAsJsonRenderer implem
private JPanel jsonWithJSonPathPanel;
- private JTextArea jsonDataField;
+ private JSyntaxTextArea jsonDataField;
private JLabeledTextField jsonPathExpressionField;
@@ -181,13 +184,17 @@ public class RenderAsJsonRenderer implem
* @return JSON PATH Tester panel
*/
private JPanel createJSonPathExtractorPanel() {
-
- jsonDataField = new JTextArea();
+ jsonDataField = JSyntaxTextArea.getInstance(50, 80, true);
+ jsonDataField.setCodeFoldingEnabled(true);
jsonDataField.setEditable(false);
+ jsonDataField.setBracketMatchingEnabled(false);
+ jsonDataField.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JSON);
+ jsonDataField.setLanguage(SyntaxConstants.SYNTAX_STYLE_JSON);
jsonDataField.setLineWrap(true);
jsonDataField.setWrapStyleWord(true);
+
- this.jsonDataPane = GuiUtils.makeScrollPane(jsonDataField);
+ this.jsonDataPane = JTextScrollPane.getInstance(jsonDataField, true);
jsonDataPane.setPreferredSize(new Dimension(100, 200));
JPanel panel = new JPanel(new BorderLayout(0, 5));
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java?rev=1815516&r1=1815515&r2=1815516&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsCssJQuery.java
Thu Nov 16 22:01:20 2017
@@ -44,11 +44,14 @@ import javax.swing.border.EmptyBorder;
import org.apache.jmeter.extractor.Extractor;
import org.apache.jmeter.extractor.HtmlExtractor;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledChoice;
import org.apache.jorphan.gui.JLabeledTextField;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
/**
* Implement ResultsRender for CSS/JQuery tester
@@ -60,7 +63,7 @@ public class RenderAsCssJQuery implement
private JPanel cssJqueryPane;
- private JTextArea cssJqueryDataField;
+ private JSyntaxTextArea cssJqueryDataField;
private JLabeledTextField cssJqueryField;
@@ -166,12 +169,16 @@ public class RenderAsCssJQuery implement
* @return RegExp Tester panel
*/
private JPanel createCssJqueryPanel() {
- cssJqueryDataField = new JTextArea();
+ cssJqueryDataField = JSyntaxTextArea.getInstance(50, 80, true);
+ cssJqueryDataField.setCodeFoldingEnabled(true);
cssJqueryDataField.setEditable(false);
+ cssJqueryDataField.setBracketMatchingEnabled(false);
+
cssJqueryDataField.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_HTML);
+ cssJqueryDataField.setLanguage(SyntaxConstants.SYNTAX_STYLE_HTML);
cssJqueryDataField.setLineWrap(true);
cssJqueryDataField.setWrapStyleWord(true);
- JScrollPane cssJqueryDataPane =
GuiUtils.makeScrollPane(cssJqueryDataField);
+ JScrollPane cssJqueryDataPane =
JTextScrollPane.getInstance(cssJqueryDataField, true);
cssJqueryDataPane.setPreferredSize(new Dimension(0, 200));
JPanel pane = new JPanel(new BorderLayout(0, 5));
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java?rev=1815516&r1=1815515&r2=1815516&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXPath.java
Thu Nov 16 22:01:20 2017
@@ -44,6 +44,8 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.jmeter.assertions.gui.XMLConfPanel;
import org.apache.jmeter.extractor.XPathExtractor;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.TidyException;
@@ -51,6 +53,7 @@ import org.apache.jmeter.util.XPathUtil;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
import org.apache.jorphan.util.JOrphanUtils;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -68,7 +71,7 @@ public class RenderAsXPath implements Re
private JPanel xmlWithXPathPane;
- private JTextArea xmlDataField;
+ private JSyntaxTextArea xmlDataField;
private JLabeledTextField xpathExpressionField;
@@ -77,8 +80,6 @@ public class RenderAsXPath implements Re
private JTabbedPane rightSide;
private SampleResult sampleResult = null;
-
- private JScrollPane xmlDataPane;
// Should we return fragment as text, rather than text of fragment?
private final JCheckBox getFragment =
@@ -212,13 +213,16 @@ public class RenderAsXPath implements Re
* @return XPath Tester panel
*/
private JPanel createXpathExtractorPanel() {
-
- xmlDataField = new JTextArea();
+ xmlDataField = JSyntaxTextArea.getInstance(50, 80, true);
+ xmlDataField.setCodeFoldingEnabled(true);
xmlDataField.setEditable(false);
+ xmlDataField.setBracketMatchingEnabled(false);
+ xmlDataField.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);
+ xmlDataField.setLanguage(SyntaxConstants.SYNTAX_STYLE_XML);
xmlDataField.setLineWrap(true);
xmlDataField.setWrapStyleWord(true);
- this.xmlDataPane = GuiUtils.makeScrollPane(xmlDataField);
+ JScrollPane xmlDataPane = JTextScrollPane.getInstance(xmlDataField,
true);
xmlDataPane.setPreferredSize(new Dimension(0, 200));
JPanel pane = new JPanel(new BorderLayout(0, 5));
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1815516&r1=1815515&r2=1815516&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Nov 16 22:01:20 2017
@@ -112,6 +112,7 @@ Summary
<h3>Listeners</h3>
<ul>
<li><bug>57760</bug>View Results Tree : Cookie Header is wrongly shown as
empty(no cookies) when viewing a recorder Sample Result. Contributed by Ubik
Load Pack (support at ubikloadpack.com)</li>
+ <li><bug>61769</bug>View Results Tree: Use syntax highlighter in XPath
Tester, JSON Path Tester and CSS/JQuery Tester</li>
</ul>
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>
