Do not hide other name.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1813200 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/codec/net/URLCodec.java

@@ -220,17 +220,17 @@ public byte[] decode(final byte[] bytes) throws DecoderException {
      *
      * @param str
      *            string to convert to a URL safe form
-     * @param charset
+     * @param charsetName
      *            the charset for str
      * @return URL safe string
      * @throws UnsupportedEncodingException
      *             Thrown if charset is not supported
      */
-    public String encode(final String str, final String charset) throws UnsupportedEncodingException {
+    public String encode(final String str, final String charsetName) throws UnsupportedEncodingException {
         if (str == null) {
             return null;
         }
-        return StringUtils.newStringUsAscii(encode(str.getBytes(charset)));
+        return StringUtils.newStringUsAscii(encode(str.getBytes(charsetName)));
     }
 
     /**
@@ -263,19 +263,19 @@ public String encode(final String str) throws EncoderException {
      *
      * @param str
      *            URL safe string to convert into its original form
-     * @param charset
+     * @param charsetName
      *            the original string charset
      * @return original string
      * @throws DecoderException
      *             Thrown if URL decoding is unsuccessful
      * @throws UnsupportedEncodingException
      *             Thrown if charset is not supported
      */
-    public String decode(final String str, final String charset) throws DecoderException, UnsupportedEncodingException {
+    public String decode(final String str, final String charsetName) throws DecoderException, UnsupportedEncodingException {
         if (str == null) {
             return null;
         }
-        return new String(decode(StringUtils.getBytesUsAscii(str)), charset);
+        return new String(decode(StringUtils.getBytesUsAscii(str)), charsetName);
     }
 
     /**