Author: fschumacher
Date: Sat Sep 24 12:10:03 2016
New Revision: 1762119
URL: http://svn.apache.org/viewvc?rev=1762119&view=rev
Log:
Correct typo. Followup to r1760716 and r1760749.
Relates to github issue #224
Bugzilla Id: 55948
Added:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java
- copied, changed from r1762118,
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java
Removed:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1762119&r1=1762118&r2=1762119&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sat Sep 24 12:10:03 2016
@@ -1151,7 +1151,7 @@ cookies=cookies
# Note full class names should be used for non jmeter core renderers
# For JMeter core renderers, class names start with . and are automatically
# prefixed with org.apache.jmeter.visualizers
-view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLWithEmbedded,.RenderAsHTMLFormated,.RenderAsDocument,.RenderAsJSON,.RenderAsXML
+view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLWithEmbedded,.RenderAsHTMLFormatted,.RenderAsDocument,.RenderAsJSON,.RenderAsXML
# Maximum size of Document that can be parsed by Tika engine; defaut=10 * 1024
* 1024 (10MB)
# Set to 0 to disable the size check
@@ -1264,4 +1264,4 @@ system.properties=system.properties
# - Uniform Random Timer
# - Poisson Random Timer
#
-#timer.factor=1.0f
\ No newline at end of file
+#timer.factor=1.0f
Copied:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java
(from r1762118,
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java)
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java?p2=jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java&p1=jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java&r1=1762118&r2=1762119&rev=1762119&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormatted.java
Sat Sep 24 12:10:03 2016
@@ -23,16 +23,16 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.util.JMeterUtils;
import org.jsoup.Jsoup;
-public class RenderAsHTMLFormated extends SamplerResultTab implements
ResultRenderer {
+public class RenderAsHTMLFormatted extends SamplerResultTab implements
ResultRenderer {
/** {@inheritDoc} */
@Override
public void renderResult(SampleResult sampleResult) {
String response =
ViewResultsFullVisualizer.getResponseAsString(sampleResult);
- showHTMLFormatedResponse(response);
+ showHTMLFormattedResponse(response);
}
- private void showHTMLFormatedResponse(String response) {
+ private void showHTMLFormattedResponse(String response) {
results.setContentType("text/plain"); // $NON-NLS-1$
results.setText(response == null ? "" : Jsoup.parse(response).html());
// $NON-NLS-1$
results.setCaretPosition(0);
@@ -45,7 +45,7 @@ public class RenderAsHTMLFormated extend
/** {@inheritDoc} */
@Override
public String toString() {
- return JMeterUtils.getResString("view_results_render_html_formated");
// $NON-NLS-1$
+ return JMeterUtils.getResString("view_results_render_html_formatted");
// $NON-NLS-1$
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1762119&r1=1762118&r2=1762119&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat
Sep 24 12:10:03 2016
@@ -1250,7 +1250,7 @@ view_results_render=Render:
view_results_render_document=Document
view_results_render_html=HTML
view_results_render_html_embedded=HTML (download resources)
-view_results_render_html_formated=HTML Source Formated
+view_results_render_html_formatted=HTML Source Formatted
view_results_render_json=JSON
view_results_render_text=Text
view_results_render_xml=XML
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1762119&r1=1762118&r2=1762119&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Sat Sep 24 12:10:03 2016
@@ -1235,7 +1235,7 @@ view_results_render=Rendu \:
view_results_render_document=Document
view_results_render_html=HTML
view_results_render_html_embedded=HTML et ressources
-view_results_render_html_formated=Code source HTML Format\u00E9
+view_results_render_html_formatted=Code source HTML Format\u00E9
view_results_render_json=JSON
view_results_render_text=Texte brut
view_results_render_xml=XML
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1762119&r1=1762118&r2=1762119&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Sep 24 12:10:03
2016
@@ -2886,8 +2886,8 @@ Images, style-sheets, etc. aren't downlo
<td>If the <i>HTML (download resources) view</i> option is selected, the
renderer
may download images, style-sheets, etc. referenced by the HTML code.
<br/></td></tr>
-<tr><td><code>HTML Source formated</code></td>
-<td>If the <i>HTML Source formated view</i> option is selected, the renderer
will display the HTML source code formated and cleaned by <a
href="https://jsoup.org/";>Jsoup</a>.
+<tr><td><code>HTML Source formatted</code></td>
+<td>If the <em>HTML Source formatted view</em> option is selected, the
renderer will display the HTML source code formatted and cleaned by <a
href="https://jsoup.org/";>Jsoup</a>.
<br/></td></tr>
<tr><td><code>JSON</code></td>
<td>The <i>JSON view</i> will show the response in tree style (also handles
JSON embedded in JavaScript).
