You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jmeter.apache.org by sebb <se...@gmail.com> on 2012/05/14 00:48:24 UTC

Re: svn commit: r1337833 - in /jmeter/trunk/src/core/org/apache/jmeter/util: Calculator.java JMeterUtils.java

On 13 May 2012 11:34,  <mi...@apache.org> wrote:
> Author: milamber
> Date: Sun May 13 10:34:49 2012
> New Revision: 1337833
>
> URL: http://svn.apache.org/viewvc?rev=1337833&view=rev
> Log:
> Fix some javadoc

-1, some of the changes are incorrect.

>
> Modified:
>    jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
>    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=1337833&r1=1337832&r2=1337833&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Sun May 13 10:34:49 2012
> @@ -72,7 +72,7 @@ public class Calculator {
>      *
>      * @param newValue
>      *
> -     * @see #addValue(long, int)
> +     * @see #addValue(long)
>      * @deprecated Use {@link #addSample(SampleResult)} instead
>      */
>     @Deprecated
> @@ -119,7 +119,7 @@ public class Calculator {
>      * Add details for a sample result, which may consist of multiple samples.
>      * Updates the number of bytes read, error count, startTime and elapsedTime
>      * @param res the sample result; might represent multiple values
> -     * @see #addValue(long, int)
> +     * @see #addSample(SampleResult)

That looks wrong, because it refers to itself.

>      */
>     public void addSample(SampleResult res) {
>         addBytes(res.getBytes());
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1337833&r1=1337832&r2=1337833&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sun May 13 10:34:49 2012
> @@ -260,7 +260,6 @@ public class JMeterUtils implements Unit
>      * @param expression
>      * @return compiled pattern
>      *
> -     * @throws  org.apache.oro.text.regex.MalformedPatternException (Runtime)

The above line is needed.

>      * This should be caught for expressions that may vary (e.g. user input)
>      *
>      */
> @@ -275,7 +274,6 @@ public class JMeterUtils implements Unit
>      * @param options e.g. READ_ONLY_MASK
>      * @return compiled pattern
>      *
> -     * @throws  org.apache.oro.text.regex.MalformedPatternException (Runtime)

The above line is needed.

Need to find another way to fix the Javadoc warning (or we just ignore it).

>      * This should be caught for expressions that may vary (e.g. user input)
>      *
>      */
>
>

Re: svn commit: r1337833 - in /jmeter/trunk/src/core/org/apache/jmeter/util: Calculator.java JMeterUtils.java

Posted by Milamber <mi...@apache.org>.

Le 13/05/2012 23:48, sebb a ecrit :
> On 13 May 2012 11:34,  <mi...@apache.org> wrote:
>   
>> Author: milamber
>> Date: Sun May 13 10:34:49 2012
>> New Revision: 1337833
>>
>> URL: http://svn.apache.org/viewvc?rev=1337833&view=rev
>> Log:
>> Fix some javadoc
>>     
> -1, some of the changes are incorrect.
>   

Arrgh! you're right.
Revert done.

Milamber

>   
>> Modified:
>>    jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
>>    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
>>
>> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
>> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=1337833&r1=1337832&r2=1337833&view=diff
>> ==============================================================================
>> --- jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java (original)
>> +++ jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Sun May 13 10:34:49 2012
>> @@ -72,7 +72,7 @@ public class Calculator {
>>      *
>>      * @param newValue
>>      *
>> -     * @see #addValue(long, int)
>> +     * @see #addValue(long)
>>      * @deprecated Use {@link #addSample(SampleResult)} instead
>>      */
>>     @Deprecated
>> @@ -119,7 +119,7 @@ public class Calculator {
>>      * Add details for a sample result, which may consist of multiple samples.
>>      * Updates the number of bytes read, error count, startTime and elapsedTime
>>      * @param res the sample result; might represent multiple values
>> -     * @see #addValue(long, int)
>> +     * @see #addSample(SampleResult)
>>     
> That looks wrong, because it refers to itself.
>
>   
>>      */
>>     public void addSample(SampleResult res) {
>>         addBytes(res.getBytes());
>>
>> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
>> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1337833&r1=1337832&r2=1337833&view=diff
>> ==============================================================================
>> --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
>> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sun May 13 10:34:49 2012
>> @@ -260,7 +260,6 @@ public class JMeterUtils implements Unit
>>      * @param expression
>>      * @return compiled pattern
>>      *
>> -     * @throws  org.apache.oro.text.regex.MalformedPatternException (Runtime)
>>     
> The above line is needed.
>
>   
>>      * This should be caught for expressions that may vary (e.g. user input)
>>      *
>>      */
>> @@ -275,7 +274,6 @@ public class JMeterUtils implements Unit
>>      * @param options e.g. READ_ONLY_MASK
>>      * @return compiled pattern
>>      *
>> -     * @throws  org.apache.oro.text.regex.MalformedPatternException (Runtime)
>>     
> The above line is needed.
>
> Need to find another way to fix the Javadoc warning (or we just ignore it).
>
>   
>>      * This should be caught for expressions that may vary (e.g. user input)
>>      *
>>      */
>>
>>
>>     
>