svn commit: r1376719 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler: HTTPAbstractImpl.java HTTPSamplerBase.java

[se...@apache.org]

Author: sebb
Date: Thu Aug 23 21:56:48 2012
New Revision: 1376719

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

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java?rev=1376719&r1=1376718&r2=1376719&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java Thu Aug 23 21:56:48 2012
@@ -96,6 +96,7 @@ public abstract class HTTPAbstractImpl i
 
     /**
      * Invokes {@link HTTPSamplerBase#getContentEncoding()}
+     * @return the encoding of the content, i.e. its charset name
      */
     protected String getContentEncoding() {
         return testElement.getContentEncoding();

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1376719&r1=1376718&r2=1376719&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Thu Aug 23 21:56:48 2012
@@ -139,6 +139,7 @@ public abstract class HTTPSamplerBase ex
 
     public static final String METHOD = "HTTPSampler.method"; // $NON-NLS-1$
 
+    /** This is the encoding used for the content, i.e. the charset name, not the header "Content-Encoding" */
     public static final String CONTENT_ENCODING = "HTTPSampler.contentEncoding"; // $NON-NLS-1$
 
     public static final String IMPLEMENTATION = "HTTPSampler.implementation"; // $NON-NLS-1$
@@ -446,10 +447,19 @@ public abstract class HTTPSamplerBase ex
         return getPropertyAsString(METHOD);
     }
 
-    public void setContentEncoding(String value) {
-        setProperty(CONTENT_ENCODING, value);
+    /**
+     * Sets the value of the encoding to be used for the content.
+     * 
+     * @param charsetName the name of the encoding to be used
+     */
+    public void setContentEncoding(String charsetName) {
+        setProperty(CONTENT_ENCODING, charsetName);
     }
 
+    /**
+     * 
+     * @return the encoding of the content, i.e. its charset name
+     */
     public String getContentEncoding() {
         return getPropertyAsString(CONTENT_ENCODING);
     }