rleland 2002/12/07 23:12:17
Modified: src/share/org/apache/struts/actions ForwardAction.java
src/share/org/apache/struts/upload DiskFile.java
MultipartIterator.java MultipartRequestHandler.java
MultipartRequestWrapper.java
MultipartValueStream.java
src/share/org/apache/struts/util ResponseUtils.java
Log:
No functional change
Fix JavaDoc and unused import statements.
Revision Changes Path
1.6 +4 -5
jakarta-struts/src/share/org/apache/struts/actions/ForwardAction.java
Index: ForwardAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/ForwardAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ForwardAction.java 18 Oct 2002 22:29:06 -0000 1.5
+++ ForwardAction.java 8 Dec 2002 07:12:16 -0000 1.6
@@ -63,7 +63,6 @@
package org.apache.struts.actions;
-import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.Action;
1.4 +5 -5 jakarta-struts/src/share/org/apache/struts/upload/DiskFile.java
Index: DiskFile.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskFile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DiskFile.java 6 Jul 2002 04:44:07 -0000 1.3
+++ DiskFile.java 8 Dec 2002 07:12:16 -0000 1.4
@@ -103,8 +103,8 @@
* can cause an OutOfMemoryError quite easily. You should use
* {@link #getInputStream() getInputStream} and do your own thing.
*
- * @exception ServletException If the temp file no longer exists, or if there is
- * some sort of IOException
+ * @exception FileNotFoundException If the temp file no longer exists
+ * @exception IOException if there is some sort of IO problem.
* @see #getFileData(int)
*/
public byte[] getFileData() throws FileNotFoundException, IOException {
1.22 +5 -7
jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java
Index: MultipartIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MultipartIterator.java 16 Nov 2002 06:04:28 -0000 1.21
+++ MultipartIterator.java 8 Dec 2002 07:12:16 -0000 1.22
@@ -271,9 +271,8 @@
/**
* Retrieves the next element in the iterator if one exists.
*
- * @throws a ServletException if the post size exceeds the maximum file size
- * passed in the 3 argument constructor
- * @throws an UnsupportedEncodingException if the "ISO-8859-1" encoding isn't
found
+ * @throws IOException if the post size exceeds the maximum file size
+ * passed in the 3 argument constructor or if the "ISO-8859-1" encoding
isn't found
* @return a {@link org.apache.struts.upload.MultipartElement MultipartElement}
* representing the next element in the request data
*
@@ -438,7 +437,6 @@
/**
* Creates a file on disk from the current mulitpart element.
- * @param fileName the name of the multipart file
*/
protected File createLocalFile() throws IOException
{
1.5 +3 -4
jakarta-struts/src/share/org/apache/struts/upload/MultipartRequestHandler.java
Index: MultipartRequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartRequestHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultipartRequestHandler.java 6 Jul 2002 04:44:07 -0000 1.4
+++ MultipartRequestHandler.java 8 Dec 2002 07:12:16 -0000 1.5
@@ -64,7 +64,6 @@
import java.util.Hashtable;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.upload.FormFile;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.action.ActionMapping;
1.3 +3 -5
jakarta-struts/src/share/org/apache/struts/upload/MultipartRequestWrapper.java
Index: MultipartRequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartRequestWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipartRequestWrapper.java 6 Jul 2002 04:44:07 -0000 1.2
+++ MultipartRequestWrapper.java 8 Dec 2002 07:12:16 -0000 1.3
@@ -62,7 +62,6 @@
package org.apache.struts.upload;
import java.util.Map;
-import java.util.List;
import java.util.Locale;
import java.util.Vector;
import java.util.HashMap;
@@ -71,7 +70,6 @@
import java.util.Collections;
import java.util.Enumeration;
import java.io.IOException;
-import java.io.InputStream;
import java.io.BufferedReader;
import java.security.Principal;
import javax.servlet.ServletInputStream;
1.4 +4 -4
jakarta-struts/src/share/org/apache/struts/upload/MultipartValueStream.java
Index: MultipartValueStream.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartValueStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultipartValueStream.java 16 Nov 2002 04:48:16 -0000 1.3
+++ MultipartValueStream.java 8 Dec 2002 07:12:17 -0000 1.4
@@ -236,7 +236,7 @@
* @return true if we are the last stream, ie. we encountered a final boundary
* @return false otherwise
*
- * @exception ParameterException if the boundary has not yet been reached
+ * @exception ServletException if the boundary has not yet been reached
*/
public boolean encounteredFinalBoundary()
1.6 +4 -5
jakarta-struts/src/share/org/apache/struts/util/ResponseUtils.java
Index: ResponseUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/ResponseUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResponseUtils.java 13 Oct 2002 00:52:11 -0000 1.5
+++ ResponseUtils.java 8 Dec 2002 07:12:17 -0000 1.6
@@ -68,7 +68,6 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyContent;
-import org.apache.struts.action.Action;
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
