Author: fschumacher
Date: Thu Mar 3 18:30:26 2016
New Revision: 1733511
URL: http://svn.apache.org/viewvc?rev=1733511&view=rev
Log:
Correct html tags in javadoc
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
Thu Mar 3 18:30:26 2016
@@ -95,7 +95,7 @@ public class RenderAsHTML extends Sample
/*
* Get round problems parsing <META http-equiv='content-type'
* content='text/html; charset=utf-8'> See
- * http://bz.apache.org/bugzilla/show_bug.cgi?id=23315
+ * <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=23315";>Bug
23315</a>
*
* Is this due to a bug in Java?
*/
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java
Thu Mar 3 18:30:26 2016
@@ -34,7 +34,7 @@ import org.apache.jorphan.util.JOrphanUt
import org.apache.log.Logger;
/**
- * Reader class for reading CSV files.<reader>
+ * Reader class for reading CSV files.
* <p>
* Handles {@link SampleMetadata} reading and sample extraction.
* </p>
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
Thu Mar 3 18:30:26 2016
@@ -50,7 +50,7 @@ public class CsvSampleWriter extends Abs
private long sampleCount;
/**
- * Constructor for a CsvSampleWriter.<br/>
+ * Constructor for a CsvSampleWriter.<br>
* The newly created instance has to be supplied with a Writer to work
* properly.
*
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java Thu Mar 3
18:30:26 2016
@@ -156,14 +156,14 @@ public class Sample {
* </p>
* <p>
* Start time depends on sampleresult.timestamp.start property :
+ * </p>
* <ul>
* <li>If the property is true, this method returns the time stamp stored
in
* the sample.</li>
* <li>If the property is false, this method returns the time stamp stored
* in the sample minus the elapsed time.</li>
* </ul>
- * </p>
- *
+ *
* @return the start time
*/
public long getStartTime() {
@@ -174,16 +174,15 @@ public class Sample {
* <p>
* Gets the end time of the sample.
* </p>
- *
* <p>
* End time depends on jmeter.timestamp.start property :
+ * </p>
* <ul>
* <li>If the property is true, this method returns the time stamp recorded
* in the sample plus the elapsed time.</li>
* <li>If the property is false, this method returns the time stamp
* recorded.</li>
* </ul>
- * </p>
*
* @return the end time
*/
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java
Thu Mar 3 18:30:26 2016
@@ -25,14 +25,15 @@ package org.apache.jmeter.report.core;
public interface SampleComparator {
/**
- * Compares to sample<br>
+ * Compares to sample
* <p>
* Must return an long integer that define the relational order of the 2
- * compared samples :<br>
+ * compared samples :</p>
+ * <ul>
* <li>Negative long integer : s1 is lower than s2</li>
* <li>Zero long integer : s1 is strictly equal to s2</li>
* <li>Positive long integer : s1 is greater than s2</li>
- * </p>
+ * </ul>
*
* @param s1
* The first sample to be compared
@@ -51,7 +52,6 @@ public interface SampleComparator {
* service.
* </p>
* <p>
- * <br>
* Not that this function is the place to get sample column indexes for
* better performance
* </p>
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java
Thu Mar 3 18:30:26 2016
@@ -153,7 +153,7 @@ public abstract class AbstractSummaryCon
}
/**
- * Gets the identifier key from sample.<br />
+ * Gets the identifier key from sample.<br>
* This key is use identify the SummaryInfo linked with the sample
*
* @param sample
@@ -163,7 +163,7 @@ public abstract class AbstractSummaryCon
protected abstract String getKeyFromSample(Sample sample);
/**
- * Creates a result item for information identified by the specified
key.<br/>
+ * Creates a result item for information identified by the specified key.
*
* @param key
* the key
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
Thu Mar 3 18:30:26 2016
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* <code>SampleConsumer</code>s.<br>
* If there is several other source files with the same root name then those
* files are produced on their corresponding channels.<br>
- *
+ *
* The root name of the files is determined by the source file name and is made
* of its name without the file extension :<br>
* <b>Example:</b> If <code>results.csv</code> is the source file name then
@@ -46,19 +46,20 @@ import org.slf4j.LoggerFactory;
* <br>
* The <code>CsvFileSampleSource</code> looks for all the files in the same
* directory of the main source file that have the same root file name<br>
- * <b>Example</b> : if the directory contains results.csv, results-1.csv,
- * results-2.csv etc. then all these files will be read and produced on their
- * corresponding channels.<br>
+ * <b>Example</b> : if the directory contains <code>results.csv</code>,
+ * <code>results-1.csv</code>, <code>results-2.csv</code>, etc. then all
+ * these files will be read and produced on their corresponding channels.<br>
* The channel on which an input file will be produce is determined by its
* suffix<br>
- * <li>If the input file is named results-1.csv then it will be produced on the
- * channel 1.</li><br>
- * <li>If the input file is named results-2.csv then it will be produced on the
- * channel 2.</li><br>
- * <li>If the input file is named results.csv then it will be produced on the
- * channel 0.</li><br>
- * <br>
- *
+ * <ul>
+ * <li>If the input file is named <code>results-1.csv</code> then it will
+ * be produced on the channel 1.</li>
+ * <li>If the input file is named <code>results-2.csv</code> then it will
+ * be produced on the channel 2.</li>
+ * <li>If the input file is named <code>results.csv</code> then it will
+ * be produced on the channel 0.</li>
+ * </ul>
+ *
* @since 3.0
*/
public class CsvFileSampleSource extends AbstractSampleSource {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
Thu Mar 3 18:30:26 2016
@@ -42,7 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * R-way external sample sorter.<br>
+ * R-way external sample sorter.
* <p>
* This SampleConsumer should be used to sort samples base on a
* {@link SampleComparator}
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* <p>
* Samples are sorted with the external sort algorithm. Thus, samples are not
* all stored in memory to be sorted. Instead, they are sorted by chunk in
- * memory and then written to the disk before being merged at the end.<br>
+ * memory and then written to the disk before being merged at the end.
* </p>
* <p>
* This sorter makes it possible to sort any number of samples with a fixed
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
* </p>
* <p>
* Meanwhile, it is equally important to set a {@link SampleComparator} to
- * define sample ordering </>
+ * define sample ordering </p>
*
* @since 3.0
*/
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java
Thu Mar 3 18:30:26 2016
@@ -35,21 +35,21 @@ import org.apache.jmeter.report.core.Sam
* </p>
* <p>
* Sample metadata must be provided to the consumer before
- * <code>startConsuming()</code> is called.<br>
+ * <code>startConsuming()</code> is called.
* </p>
- * <br>
* <p>
- * The following sequence must be observed when consuming samples :<br>
+ * The following sequence must be observed when consuming samples :
+ * </p>
+ * <ul>
* <li>Call <code>setConsumedMetadata()</code> for each channel that wil
consume
- * samples</li><br>
+ * samples</li>
* <li>Call <code>startConsuming()</code> before any call to
- * <code>consume()</code></li><br>
+ * <code>consume()</code></li>
* <li>Call <code>consume()</code> for each sample to be consumed by the
- * consumer, specify the channel on which to consume</li><br>
+ * consumer, specify the channel on which to consume</li>
* <li>Call <code>stopConsuming()</code> after evry sample has been
consumed</li>
- * </p>
- * <br>
- *
+ * </ul>
+ *
* @since 3.0
*/
public interface SampleConsumer extends SampleProcessor {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java
Thu Mar 3 18:30:26 2016
@@ -18,13 +18,14 @@
package org.apache.jmeter.report.processor;
/**
- * Defines a sample processor.<br>
- * <br>
+ * Defines a sample processor.
+ * <p>
* Basically a sample processor is meant to process samples. There is currently
- * 2 kinds of sample processors :<br>
+ * 2 kinds of sample processors :</p>
+ * <ul>
* <li>SampleConsumer : sample consumers are sample processors meant to consume
* samples</li> <li>SampleProducer : sample producers are sample processors
- * meant to produce samples</li> <br>
+ * meant to produce samples</li> </ul>
*
* @since 3.0
*/
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java
Thu Mar 3 18:30:26 2016
@@ -21,31 +21,28 @@ import org.apache.jmeter.report.core.Sam
import org.apache.jmeter.report.core.SampleMetadata;
/**
- * Defines a sample producer<br>
+ * Defines a sample producer
* <p>
* A sample producer is able to produce sample on different channels.
* </p>
- * <br>
* <p>
* Typically, a {@link SampleProducer} can be connected to
* {@link SampleConsumer} where it will produced sample that will be consumed
by
* the sample consumer.
* </p>
- * <br>
* <p>
* A sample producer can produce samples of different metadata for reach
* channel/
* </p>
- * <br>
* <p>
- * The following production sequence must be observed:<br>
- * <li>Call <code>setProducedMetadata()</code> for each produced
channel</li><br>
- * <li>Call <code>startProducing()</code></li><br>
+ * The following production sequence must be observed:
+ * </p><ul>
+ * <li>Call <code>setProducedMetadata()</code> for each produced channel</li>
+ * <li>Call <code>startProducing()</code></li>
* <li>Call <code>produce()</code> for each sample to produce for every
channel</li>
- * <li>Call <code>stopProducing()</code></li><br>
- * </p>
- * <br>
- *
+ * <li>Call <code>stopProducing()</code></li>
+ * </ul>
+ *
* @since 3.0
*/
public interface SampleProducer extends SampleProcessor {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java?rev=1733511&r1=1733510&r2=1733511&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
Thu Mar 3 18:30:26 2016
@@ -37,28 +37,28 @@ import org.apache.jmeter.report.processo
* from samples. It uses a projection to define the key (x-axis coordinate) and
* an aggregator to define the value (y-axis coordinate).
* </p>
- *
+ *
+ * <b>About the seriesData :</b>
* <p>
- * <b>About the seriesData :</b><br>
* Series are defined by the seriesSelector, so they can be static or dynamic
* (sample linked) depending on the implementation of the selector.
* </p>
- *
+ *
+ * <b>About the groupData :</b>
* <p>
- * <b>About the groupData :</b><br>
* The grapher build an aggregator for each seriesData/key pair using an
* external factory. All groupData from a series do the same aggregate
* calculation.
+ * </p>
+ *
+ * <b>About the keys (x-axis coordinates) :</b>
* <p>
- *
- * <p>
- * <b>About the keys (x-axis coordinates) :</b><br>
* Keys are defined by the keysSelector for each seriesData, so the keys can be
* different depending on the seriesData
+ * </p>
+ *
+ * <b>About the values (y-axis coordinates) :</b>
* <p>
- *
- * <p>
- * <b>About the values (y-axis coordinates) :</b><br>
* Values are defined by the result aggregate produced by each aggregator.
* During consumption, values to add to the groupData are defined by the
* valueSelector.
