Skip to content

Commit 9ed4080

Browse files
author
Gary Gregory
committed
Javadoc: Use "file name" instead of "filename".
Camel case vars "filename" to "fileName".
1 parent 125ad9b commit 9ed4080

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public static void main(String[] args)
193193
else
194194
{
195195
System.err.println(
196-
"Couldn't initiate transfer. Check that filenames are valid.");
196+
"Couldn't initiate transfer. Check that file names are valid.");
197197
break __main;
198198
}
199199

src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static void main(String[] args) throws IOException, URISyntaxException
146146
System.err.println("\t-. print a . for each complete message received");
147147
System.err.println("\t-X print the X-IMAP line for each complete message received");
148148
System.err.println("\tthe mboxfile is where the messages are stored; use '-' to write to standard output.");
149-
System.err.println("\tPrefix filename with '+' to append to the file. Prefix with '-' to allow overwrite.");
149+
System.err.println("\tPrefix file name with '+' to append to the file. Prefix with '-' to allow overwrite.");
150150
System.err.println("\ta sequence-set is a list of numbers/number ranges e.g. 1,2,3-10,20:* - default 1:*");
151151
System.err.println("\titemnames are the message data item name(s) e.g. BODY.PEEK[HEADER.FIELDS (SUBJECT)]" +
152152
" or a macro e.g. ALL - default (INTERNALDATE BODY.PEEK[])");

src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public final class SMTPMail
4444

4545
public static void main(String[] args)
4646
{
47-
String sender, recipient, subject, filename, server, cc;
47+
String sender, recipient, subject, fileName, server, cc;
4848
List<String> ccList = new ArrayList<String>();
4949
BufferedReader stdin;
5050
FileReader fileReader = null;
@@ -100,11 +100,11 @@ public static void main(String[] args)
100100
System.out.print("Filename: ");
101101
System.out.flush();
102102

103-
filename = stdin.readLine();
103+
fileName = stdin.readLine();
104104

105105
try
106106
{
107-
fileReader = new FileReader(filename);
107+
fileReader = new FileReader(fileName);
108108
}
109109
catch (FileNotFoundException e)
110110
{

src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public final class PostMessage
4343

4444
public static void main(String[] args)
4545
{
46-
String from, subject, newsgroup, filename, server, organization;
46+
String from, subject, newsgroup, fileName, server, organization;
4747
String references;
4848
BufferedReader stdin;
4949
FileReader fileReader = null;
@@ -122,11 +122,11 @@ public static void main(String[] args)
122122
System.out.print("Filename: ");
123123
System.out.flush();
124124

125-
filename = stdin.readLine();
125+
fileName = stdin.readLine();
126126

127127
try
128128
{
129-
fileReader = new FileReader(filename);
129+
fileReader = new FileReader(fileName);
130130
}
131131
catch (FileNotFoundException e)
132132
{

src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public abstract class TFTPRequestPacket extends TFTPPacket
7070
private final int _mode;
7171

7272
/*** The file name of the request. ***/
73-
private final String _filename;
73+
private final String _fileName;
7474

7575
/***
7676
* Creates a request packet of a given type to be sent to a host at a
@@ -89,7 +89,7 @@ public abstract class TFTPRequestPacket extends TFTPPacket
8989
{
9090
super(type, destination, port);
9191

92-
_filename = fileName;
92+
_fileName = fileName;
9393
_mode = mode;
9494
}
9595

@@ -126,10 +126,10 @@ public abstract class TFTPRequestPacket extends TFTPPacket
126126
++index;
127127
}
128128

129-
_filename = buffer.toString();
129+
_fileName = buffer.toString();
130130

131131
if (index >= length) {
132-
throw new TFTPPacketException("Bad filename and mode format.");
132+
throw new TFTPPacketException("Bad file name and mode format.");
133133
}
134134

135135
buffer.setLength(0);
@@ -181,12 +181,12 @@ final DatagramPacket _newDatagram(DatagramPacket datagram, byte[] data)
181181
{
182182
int fileLength, modeLength;
183183

184-
fileLength = _filename.length();
184+
fileLength = _fileName.length();
185185
modeLength = _modeBytes[_mode].length;
186186

187187
data[0] = 0;
188188
data[1] = (byte)_type;
189-
System.arraycopy(_filename.getBytes(), 0, data, 2, fileLength);
189+
System.arraycopy(_fileName.getBytes(), 0, data, 2, fileLength);
190190
data[fileLength + 2] = 0;
191191
System.arraycopy(_modeBytes[_mode], 0, data, fileLength + 3,
192192
modeLength);
@@ -216,13 +216,13 @@ public final DatagramPacket newDatagram()
216216
int fileLength, modeLength;
217217
byte[] data;
218218

219-
fileLength = _filename.length();
219+
fileLength = _fileName.length();
220220
modeLength = _modeBytes[_mode].length;
221221

222222
data = new byte[fileLength + modeLength + 4];
223223
data[0] = 0;
224224
data[1] = (byte)_type;
225-
System.arraycopy(_filename.getBytes(), 0, data, 2, fileLength);
225+
System.arraycopy(_fileName.getBytes(), 0, data, 2, fileLength);
226226
data[fileLength + 2] = 0;
227227
System.arraycopy(_modeBytes[_mode], 0, data, fileLength + 3,
228228
modeLength);
@@ -247,6 +247,6 @@ public final int getMode()
247247
***/
248248
public final String getFilename()
249249
{
250-
return _filename;
250+
return _fileName;
251251
}
252252
}

src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ private boolean findByName(List<?> fileList, String string)
131131
}
132132
else
133133
{
134-
String filename = (String) element;
134+
String fileName = (String) element;
135135

136-
found = filename.endsWith(string);
136+
found = fileName.endsWith(string);
137137
}
138138
}
139139

src/test/java/org/apache/commons/net/ftp/parser/DownloadListings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ private void info() throws IOException {
7070
removeProtocolCommandListener(listener);
7171
}
7272

73-
private void download(String path, FTPCmd command, File filename) throws Exception {
73+
private void download(String path, FTPCmd command, File fileName) throws Exception {
7474
Socket socket;
7575
if ((socket = _openDataConnection_(command, getListArguments(path))) == null) {
7676
System.out.println(getReplyString());
7777
return;
7878
}
7979
InputStream inputStream = socket.getInputStream();
80-
OutputStream outputStream = new FileOutputStream(filename);
80+
OutputStream outputStream = new FileOutputStream(fileName);
8181
Util.copyStream(inputStream, outputStream );
8282
inputStream.close();
8383
socket.close();

0 commit comments

Comments
 (0)