Author: markt
Date: Tue Mar 26 22:15:52 2013
New Revision: 1461342
URL: http://svn.apache.org/r1461342
Log:
Fix Javadoc errors
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1461341
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:r1461341
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java?rev=1461342&r1=1461341&r2=1461342&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileDeleteStrategy.java
Tue Mar 26 22:15:52 2013
@@ -79,8 +79,8 @@ public class FileDeleteStrategy {
* <p>
* This method is designed for subclasses to override.
* The implementation may return either false or an
<code>IOException</code>
- * when deletion fails. The {@link #delete(File)} and {@link
#deleteQuietly(File)}
- * methods will handle either response appropriately.
+ * when deletion fails. The {@link #deleteQuietly(File)} method will handle
+ * either response appropriately.
* A check has been made to ensure that the file will exist.
* <p>
* This implementation uses {@link File#delete()}.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java?rev=1461342&r1=1461341&r2=1461342&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
Tue Mar 26 22:15:52 2013
@@ -18,20 +18,18 @@
/**
* <p>
* A disk-based implementation of the
- * {@link org.apache.commons.fileupload.FileItem FileItem}
+ * {@link org.apache.tomcat.util.http.fileupload.FileItem FileItem}
* interface. This implementation retains smaller items in memory, while
* writing larger ones to disk. The threshold between these two is
* configurable, as is the location of files that are written to disk.
* </p>
* <p>
* In typical usage, an instance of
- * {@link org.apache.commons.fileupload.disk.DiskFileItemFactory
DiskFileItemFactory}
+ * {@link org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory
DiskFileItemFactory}
* would be created, configured, and then passed to a
- * {@link org.apache.commons.fileupload.FileUpload FileUpload}
+ * {@link org.apache.tomcat.util.http.fileupload.FileUpload FileUpload}
* implementation such as
- * {@link org.apache.commons.fileupload.servlet.ServletFileUpload
ServletFileUpload}
- * or
- * {@link org.apache.commons.fileupload.portlet.PortletFileUpload
PortletFileUpload}.
+ * {@link
org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload
ServletFileUpload}.
* </p>
* <p>
* The following code fragment demonstrates this usage.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
