This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 7e2705cf6f980d54725ff0953b648b557e9583d3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 15 18:42:29 2023 +0100
filename -> file name
---
src/main/java/org/apache/commons/fileupload/DefaultFileItem.java | 2 +-
src/main/java/org/apache/commons/fileupload/FileItem.java | 4 ++--
src/main/java/org/apache/commons/fileupload/FileItemStream.java | 4 ++--
.../java/org/apache/commons/fileupload/disk/DiskFileItem.java | 8 ++++----
src/main/java/org/apache/commons/fileupload/package-info.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
b/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
index 39d3a84c..bc18ff88 100644
--- a/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
@@ -48,7 +48,7 @@ public class DefaultFileItem
* {@code null} if not specified.
* @param isFormField Whether or not this item is a plain form field, as
* opposed to a file upload.
- * @param fileName The original filename in the user's filesystem, or
+ * @param fileName The original file name in the user's filesystem, or
* {@code null} if not specified.
* @param sizeThreshold The threshold, in bytes, below which items will be
* retained in memory and above which they will be
diff --git a/src/main/java/org/apache/commons/fileupload/FileItem.java
b/src/main/java/org/apache/commons/fileupload/FileItem.java
index 6ef24f70..b90322d4 100644
--- a/src/main/java/org/apache/commons/fileupload/FileItem.java
+++ b/src/main/java/org/apache/commons/fileupload/FileItem.java
@@ -69,12 +69,12 @@ public interface FileItem extends FileItemHeadersSupport {
String getContentType();
/**
- * Returns the original filename in the client's filesystem, as provided by
+ * Returns the original file name in the client's filesystem, as provided
by
* the browser (or other client software). In most cases, this will be the
* base file name, without path information. However, some clients, such as
* the Opera browser, do include path information.
*
- * @return The original filename in the client's filesystem.
+ * @return The original file name in the client's filesystem.
* @throws InvalidFileNameException The file name contains a NUL character,
* which might be an indicator of a security attack. If you intend to
* use the file name anyways, catch the exception and use
diff --git a/src/main/java/org/apache/commons/fileupload/FileItemStream.java
b/src/main/java/org/apache/commons/fileupload/FileItemStream.java
index c0850f14..fa831b60 100644
--- a/src/main/java/org/apache/commons/fileupload/FileItemStream.java
+++ b/src/main/java/org/apache/commons/fileupload/FileItemStream.java
@@ -73,12 +73,12 @@ public interface FileItemStream extends
FileItemHeadersSupport {
String getContentType();
/**
- * Returns the original filename in the client's filesystem, as provided by
+ * Returns the original file name in the client's filesystem, as provided
by
* the browser (or other client software). In most cases, this will be the
* base file name, without path information. However, some clients, such as
* the Opera browser, do include path information.
*
- * @return The original filename in the client's filesystem.
+ * @return The original file name in the client's filesystem.
*/
String getName();
diff --git a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
index a50929c5..06b6f6cd 100644
--- a/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload/disk/DiskFileItem.java
@@ -111,7 +111,7 @@ public class DiskFileItem
private boolean isFormField;
/**
- * The original filename in the user's filesystem.
+ * The original file name in the user's filesystem.
*/
private final String fileName;
@@ -168,7 +168,7 @@ public class DiskFileItem
* {@code null} if not specified.
* @param isFormField Whether or not this item is a plain form field, as
* opposed to a file upload.
- * @param fileName The original filename in the user's filesystem, or
+ * @param fileName The original file name in the user's filesystem, or
* {@code null} if not specified.
* @param sizeThreshold The threshold, in bytes, below which items will be
* retained in memory and above which they will be
@@ -240,9 +240,9 @@ public class DiskFileItem
}
/**
- * Returns the original filename in the client's filesystem.
+ * Returns the original file name in the client's filesystem.
*
- * @return The original filename in the client's filesystem.
+ * @return The original file name in the client's filesystem.
* @throws org.apache.commons.fileupload.InvalidFileNameException The file
name contains a NUL character,
* which might be an indicator of a security attack. If you intend to
* use the file name anyways, catch the exception and use
diff --git a/src/main/java/org/apache/commons/fileupload/package-info.java
b/src/main/java/org/apache/commons/fileupload/package-info.java
index 1821daf3..3d983a78 100644
--- a/src/main/java/org/apache/commons/fileupload/package-info.java
+++ b/src/main/java/org/apache/commons/fileupload/package-info.java
@@ -57,9 +57,9 @@
* Iterator i = fileItems.iterator();
* String comment = ((FileItem)i.next()).getString();
* FileItem fi = (FileItem)i.next();
- * // filename on the client
+ * // file name on the client
* String fileName = fi.getName();
- * // save comment and filename to database
+ * // save comment and file name to database
* ...
* // write the file
* fi.write(new File("/www/uploads/", fileName));
