Author: sebb
Date: Sat Nov 24 12:40:36 2007
New Revision: 597913

URL: http://svn.apache.org/viewvc?rev=597913&view=rev
Log:
Minor Javadoc tweaks

Modified:
    jakarta/jmeter/trunk/docs/api/index-all.html
    
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.html
    
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html
    
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/testelement/property/AbstractProperty.html
    
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
    
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
    
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java

Modified: jakarta/jmeter/trunk/docs/api/index-all.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/api/index-all.html?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/api/index-all.html (original)
+++ jakarta/jmeter/trunk/docs/api/index-all.html Sat Nov 24 12:40:36 2007
@@ -12606,7 +12606,7 @@
 <DD>Create a new LDAPArgument object.
 <DT><A 
HREF="org/apache/jmeter/testelement/property/AbstractProperty.html#makeProperty(java.lang.Object)"><B>makeProperty(Object)</B></A>
 - 
 Static method in class org.apache.jmeter.testelement.property.<A 
HREF="org/apache/jmeter/testelement/property/AbstractProperty.html" 
title="class in org.apache.jmeter.testelement.property">AbstractProperty</A>
-<DD>&nbsp;
+<DD>Create a JMeterProperty from an object.
 <DT><A 
HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html#makeProxyControl()"><B>makeProxyControl()</B></A>
 - 
 Method in class org.apache.jmeter.protocol.http.proxy.gui.<A 
HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" 
title="class in org.apache.jmeter.protocol.http.proxy.gui">ProxyControlGui</A>
 <DD>&nbsp;

Modified: 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.html?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.html
 (original)
+++ 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.html
 Sat Nov 24 12:40:36 2007
@@ -335,7 +335,7 @@
  The request infos are saved into the sample result if one is provided.
 <P>
 <DD><DL>
-<DT><B>Parameters:</B><DD><CODE>u</CODE> - <code>URL</code> of the URL 
request<DD><CODE>res</CODE> - sample result to save request infos to
+<DT><B>Parameters:</B><DD><CODE>u</CODE> - <code>URL</code> of the URL 
request<DD><CODE>httpMethod</CODE> - GET/PUT/HEAD etc<DD><CODE>res</CODE> - 
sample result to save request infos to
 <DT><B>Returns:</B><DD><code>HttpConnection</code> ready for .connect
 <DT><B>Throws:</B>
 <DD><CODE><A 
HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/io/IOException.html"; 
title="class or interface in java.io">IOException</A></CODE> - if an I/O 
Exception occurs</DL>

Modified: 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html
 (original)
+++ 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.html
 Sat Nov 24 12:40:36 2007
@@ -2831,7 +2831,7 @@
 </DD>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>areFollowingRedirect</CODE> - 
<DD><CODE>frameDepth</CODE> - <DD><CODE>res</CODE> - 
-<DT><B>Returns:</B><DD></DL>
+<DT><B>Returns:</B><DD>the sample result</DL>
 </DD>
 </DL>
 <HR>

Modified: 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/testelement/property/AbstractProperty.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/api/org/apache/jmeter/testelement/property/AbstractProperty.html?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/testelement/property/AbstractProperty.html
 (original)
+++ 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/testelement/property/AbstractProperty.html
 Sat Nov 24 12:40:36 2007
@@ -307,7 +307,7 @@
 <TD><CODE><B><A 
HREF="../../../../../org/apache/jmeter/testelement/property/AbstractProperty.html#makeProperty(java.lang.Object)">makeProperty</A></B>(<A
 HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html"; 
title="class or interface in java.lang">Object</A>&nbsp;item)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create a 
JMeterProperty from an object.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -778,12 +778,14 @@
 <PRE>
 protected static <A 
HREF="../../../../../org/apache/jmeter/testelement/property/JMeterProperty.html"
 title="interface in org.apache.jmeter.testelement.property">JMeterProperty</A> 
<B>makeProperty</B>(<A 
HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html"; 
title="class or interface in java.lang">Object</A>&nbsp;item)</PRE>
 <DL>
+<DD>Create a JMeterProperty from an object.
+<P>
 <DD><DL>
 </DL>
 </DD>
 <DD><DL>
-<DT><B>Parameters:</B><DD><CODE>item</CODE> - 
-<DT><B>Returns:</B><DD></DL>
+<DT><B>Parameters:</B><DD><CODE>item</CODE> - object to be turned into a 
propery
+<DT><B>Returns:</B><DD>the JMeterProperty</DL>
 </DD>
 </DL>
 <HR>

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
 Sat Nov 24 12:40:36 2007
@@ -353,8 +353,10 @@
        }
 
        /**
-        * @param item
-        * @return
+        * Create a JMeterProperty from an object.
+        * 
+        * @param item object to be turned into a propery
+        * @return the JMeterProperty
         */
        protected static JMeterProperty makeProperty(Object item) {
                if (item instanceof JMeterProperty) {

Modified: 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
 Sat Nov 24 12:40:36 2007
@@ -482,7 +482,7 @@
         * 
         * @param u
         *            <code>URL</code> of the URL request
-        * @param method 
+        * @param httpMethod 
         *            GET/PUT/HEAD etc
         * @param res
         *            sample result to save request infos to

Modified: 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=597913&r1=597912&r2=597913&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
 Sat Nov 24 12:40:36 2007
@@ -1202,7 +1202,7 @@
         * @param areFollowingRedirect
         * @param frameDepth
         * @param res
-        * @return
+        * @return the sample result
         */
        protected HTTPSampleResult resultProcessing(boolean 
areFollowingRedirect, int frameDepth, HTTPSampleResult res) {
                boolean wasRedirected = false;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to