Author: martinc
Date: Sun Nov 27 20:44:57 2005
New Revision: 349366
URL: http://svn.apache.org/viewcvs?rev=349366&view=rev
Log:
Standardise on @throws instead of having a mixture of that and @exception.
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/DiskFileUpload.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItem.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/RequestContext.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/DiskFileUpload.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/DiskFileUpload.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/DiskFileUpload.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/DiskFileUpload.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -192,8 +192,8 @@
* @return A list of <code>FileItem</code> instances parsed from the
* request, in the order that they were transmitted.
*
- * @exception FileUploadException if there are problems reading/parsing
- * the request or storing files.
+ * @throws FileUploadException if there are problems reading/parsing
+ * the request or storing files.
*
* @deprecated Use <code>ServletFileUpload</code> instead.
*/
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItem.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItem.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItem.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileItem.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@
* @return An [EMAIL PROTECTED] java.io.InputStream InputStream} that can
be
* used to retrieve the contents of the file.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
InputStream getInputStream()
throws IOException;
@@ -128,8 +128,8 @@
*
* @return The contents of the item, as a string.
*
- * @exception UnsupportedEncodingException if the requested character
- * encoding is not available.
+ * @throws UnsupportedEncodingException if the requested character
+ * encoding is not available.
*/
String getString(String encoding)
throws UnsupportedEncodingException;
@@ -159,7 +159,7 @@
* @param file The <code>File</code> into which the uploaded item should
* be stored.
*
- * @exception Exception if an error occurs.
+ * @throws Exception if an error occurs.
*/
void write(File file) throws Exception;
@@ -218,7 +218,7 @@
* @return An [EMAIL PROTECTED] java.io.OutputStream OutputStream} that
can be used
* for storing the contensts of the file.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
OutputStream getOutputStream() throws IOException;
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/FileUploadBase.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -258,8 +258,8 @@
* @return A list of <code>FileItem</code> instances parsed from the
* request, in the order that they were transmitted.
*
- * @exception FileUploadException if there are problems reading/parsing
- * the request or storing files.
+ * @throws FileUploadException if there are problems reading/parsing
+ * the request or storing files.
*
* @deprecated Use the method in <code>ServletFileUpload</code> instead.
*/
@@ -277,8 +277,8 @@
* @return A list of <code>FileItem</code> instances parsed from the
* request, in the order that they were transmitted.
*
- * @exception FileUploadException if there are problems reading/parsing
- * the request or storing files.
+ * @throws FileUploadException if there are problems reading/parsing
+ * the request or storing files.
*/
public List /* FileItem */ parseRequest(RequestContext ctx)
throws FileUploadException {
@@ -491,7 +491,7 @@
*
* @return A newly created <code>FileItem</code> instance.
*
- * @exception FileUploadException if an error occurs.
+ * @throws FileUploadException if an error occurs.
*/
protected FileItem createItem(Map /* String, String */ headers,
boolean isFormField)
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/MultipartStream.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -266,7 +266,7 @@
* @param boundary The token used for dividing the stream into
* <code>encapsulations</code>.
*
- * @exception IOException when an error occurs.
+ * @throws IOException when an error occurs.
*
* @see #MultipartStream()
* @see #MultipartStream(InputStream, byte[], int)
@@ -313,7 +313,7 @@
*
* @return The next byte from the input stream.
*
- * @exception IOException if there is no more data available.
+ * @throws IOException if there is no more data available.
*/
public byte readByte()
throws IOException {
@@ -338,8 +338,8 @@
* @return <code>true</code> if there are more encapsulations in
* this stream; <code>false</code> otherwise.
*
- * @exception MalformedStreamException if the stream ends unexpecetedly or
- * fails to follow required syntax.
+ * @throws MalformedStreamException if the stream ends unexpecetedly or
+ * fails to follow required syntax.
*/
public boolean readBoundary()
throws MalformedStreamException {
@@ -390,9 +390,9 @@
* @param boundary The boundary to be used for parsing of the nested
* stream.
*
- * @exception IllegalBoundaryException if the <code>boundary</code>
- * has a different length than the one
- * being currently parsed.
+ * @throws IllegalBoundaryException if the <code>boundary</code>
+ * has a different length than the one
+ * being currently parsed.
*/
public void setBoundary(byte[] boundary)
throws IllegalBoundaryException {
@@ -417,7 +417,7 @@
*
* @return The <code>header-part</code> of the current encapsulation.
*
- * @exception MalformedStreamException if the stream ends unexpecetedly.
+ * @throws MalformedStreamException if the stream ends unexpecetedly.
*/
public String readHeaders()
throws MalformedStreamException {
@@ -474,8 +474,8 @@
*
* @return the amount of data written.
*
- * @exception MalformedStreamException if the stream ends unexpectedly.
- * @exception IOException if an i/o error occurs.
+ * @throws MalformedStreamException if the stream ends unexpectedly.
+ * @throws IOException if an i/o error occurs.
*/
public int readBodyData(OutputStream output)
throws MalformedStreamException,
@@ -542,8 +542,8 @@
*
* @return The amount of data discarded.
*
- * @exception MalformedStreamException if the stream ends unexpectedly.
- * @exception IOException if an i/o error occurs.
+ * @throws MalformedStreamException if the stream ends unexpectedly.
+ * @throws IOException if an i/o error occurs.
*/
public int discardBodyData()
throws MalformedStreamException,
@@ -601,7 +601,7 @@
* @return <code>true</code> if an <code>encapsulation</code> was found in
* the stream.
*
- * @exception IOException if an i/o error occurs.
+ * @throws IOException if an i/o error occurs.
*/
public boolean skipPreamble()
throws IOException {
@@ -804,7 +804,7 @@
// Main routine, for testing purposes only.
//
// @param args A String[] with the command line arguments.
- // @exception Exception, a generic exception.
+ // @throws Exception, a generic exception.
public static void main( String[] args )
throws Exception
{
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/RequestContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/RequestContext.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/RequestContext.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/RequestContext.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
Sun Nov 27 20:44:57 2005
@@ -188,7 +188,7 @@
* @return An [EMAIL PROTECTED] java.io.InputStream InputStream} that can
be
* used to retrieve the contents of the file.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
public InputStream getInputStream()
throws IOException {
@@ -322,8 +322,8 @@
*
* @return The contents of the file, as a string.
*
- * @exception UnsupportedEncodingException if the requested character
- * encoding is not available.
+ * @throws UnsupportedEncodingException if the requested character
+ * encoding is not available.
*/
public String getString(final String charset)
throws UnsupportedEncodingException {
@@ -372,7 +372,7 @@
* @param file The <code>File</code> into which the uploaded item should
* be stored.
*
- * @exception Exception if an error occurs.
+ * @throws Exception if an error occurs.
*/
public void write(File file) throws Exception {
if (isInMemory()) {
@@ -511,7 +511,7 @@
* @return An [EMAIL PROTECTED] java.io.OutputStream OutputStream} that
can be used
* for storing the contensts of the file.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
public OutputStream getOutputStream()
throws IOException {
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/portlet/PortletRequestContext.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletFileUpload.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -108,8 +108,8 @@
* @return A list of <code>FileItem</code> instances parsed from the
* request, in the order that they were transmitted.
*
- * @exception FileUploadException if there are problems reading/parsing
- * the request or storing files.
+ * @throws FileUploadException if there are problems reading/parsing
+ * the request or storing files.
*/
public List /* FileItem */ parseRequest(HttpServletRequest request)
throws FileUploadException {
Modified:
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java?rev=349366&r1=349365&r2=349366&view=diff
==============================================================================
---
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
(original)
+++
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/servlet/ServletRequestContext.java
Sun Nov 27 20:44:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
