Skip to content

Commit 354f627

Browse files
committed
Javadoc clarification
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1470202 13f79535-47bb-0310-9956-ffa450edef68
1 parent 7233bf4 commit 354f627

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

src/main/java/org/apache/commons/io/IOUtils.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,13 +1963,13 @@ public static void copy(final InputStream input, final Writer output)
19631963
*
19641964
* @param input the <code>InputStream</code> to read from
19651965
* @param output the <code>Writer</code> to write to
1966-
* @param encoding the encoding to use, null means platform default
1966+
* @param inputEncoding the encoding to use for the input stream, null means platform default
19671967
* @throws NullPointerException if the input or output is null
19681968
* @throws IOException if an I/O error occurs
19691969
* @since 2.3
19701970
*/
1971-
public static void copy(final InputStream input, final Writer output, final Charset encoding) throws IOException {
1972-
final InputStreamReader in = new InputStreamReader(input, Charsets.toCharset(encoding));
1971+
public static void copy(final InputStream input, final Writer output, final Charset inputEncoding) throws IOException {
1972+
final InputStreamReader in = new InputStreamReader(input, Charsets.toCharset(inputEncoding));
19731973
copy(in, output);
19741974
}
19751975

@@ -1987,16 +1987,16 @@ public static void copy(final InputStream input, final Writer output, final Char
19871987
*
19881988
* @param input the <code>InputStream</code> to read from
19891989
* @param output the <code>Writer</code> to write to
1990-
* @param encoding the encoding to use, null means platform default
1990+
* @param inputEncoding the encoding to use for the InputStream, null means platform default
19911991
* @throws NullPointerException if the input or output is null
19921992
* @throws IOException if an I/O error occurs
19931993
* @throws UnsupportedCharsetException
19941994
* thrown instead of {@link UnsupportedEncodingException} in version 2.2 if the encoding is not
19951995
* supported.
19961996
* @since 1.1
19971997
*/
1998-
public static void copy(final InputStream input, final Writer output, final String encoding) throws IOException {
1999-
copy(input, output, Charsets.toCharset(encoding));
1998+
public static void copy(final InputStream input, final Writer output, final String inputEncoding) throws IOException {
1999+
copy(input, output, Charsets.toCharset(inputEncoding));
20002000
}
20012001

20022002
// copy from Reader
@@ -2183,13 +2183,13 @@ public static void copy(final Reader input, final OutputStream output)
21832183
*
21842184
* @param input the <code>Reader</code> to read from
21852185
* @param output the <code>OutputStream</code> to write to
2186-
* @param encoding the encoding to use, null means platform default
2186+
* @param outputEncoding the encoding to use for the OutputStream, null means platform default
21872187
* @throws NullPointerException if the input or output is null
21882188
* @throws IOException if an I/O error occurs
21892189
* @since 2.3
21902190
*/
2191-
public static void copy(final Reader input, final OutputStream output, final Charset encoding) throws IOException {
2192-
final OutputStreamWriter out = new OutputStreamWriter(output, Charsets.toCharset(encoding));
2191+
public static void copy(final Reader input, final OutputStream output, final Charset outputEncoding) throws IOException {
2192+
final OutputStreamWriter out = new OutputStreamWriter(output, Charsets.toCharset(outputEncoding));
21932193
copy(input, out);
21942194
// XXX Unless anyone is planning on rewriting OutputStreamWriter,
21952195
// we have to flush here.
@@ -2214,16 +2214,16 @@ public static void copy(final Reader input, final OutputStream output, final Cha
22142214
*
22152215
* @param input the <code>Reader</code> to read from
22162216
* @param output the <code>OutputStream</code> to write to
2217-
* @param encoding the encoding to use, null means platform default
2217+
* @param outputEncoding the encoding to use for the OutputStream, null means platform default
22182218
* @throws NullPointerException if the input or output is null
22192219
* @throws IOException if an I/O error occurs
22202220
* @throws UnsupportedCharsetException
22212221
* thrown instead of {@link UnsupportedEncodingException} in version 2.2 if the encoding is not
22222222
* supported.
22232223
* @since 1.1
22242224
*/
2225-
public static void copy(final Reader input, final OutputStream output, final String encoding) throws IOException {
2226-
copy(input, output, Charsets.toCharset(encoding));
2225+
public static void copy(final Reader input, final OutputStream output, final String outputEncoding) throws IOException {
2226+
copy(input, output, Charsets.toCharset(outputEncoding));
22272227
}
22282228

22292229
// content equals

0 commit comments

Comments
 (0)