Author: markt
Date: Thu Oct 21 16:18:12 2010
New Revision: 1026054
URL: http://svn.apache.org/viewvc?rev=1026054&view=rev
Log:
Allow Checkstyle's unused imports test to be used with the o.a.tomcat.util
classes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=1026054&r1=1026053&r2=1026054&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
Thu Oct 21 16:18:12 2010
@@ -36,9 +36,7 @@ import org.apache.tomcat.util.http.fileu
import org.apache.tomcat.util.http.fileupload.FileItemHeadersSupport;
import org.apache.tomcat.util.http.fileupload.FileUploadException;
import org.apache.tomcat.util.http.fileupload.IOUtils;
-import org.apache.tomcat.util.http.fileupload.InvalidFileNameException;
import org.apache.tomcat.util.http.fileupload.ParameterParser;
-import org.apache.tomcat.util.http.fileupload.RequestContext;
import org.apache.tomcat.util.http.fileupload.util.Streams;
@@ -49,8 +47,8 @@ import org.apache.tomcat.util.http.fileu
* <p> After retrieving an instance of this class from a {...@link
* org.apache.tomcat.util.http.fileupload.FileUpload FileUpload} instance (see
* {...@link org.apache.tomcat.util.http.fileupload.FileUpload
- * #parseRequest(RequestContext)}), you may
- * either request all contents of file at once using {...@link #get()} or
+ * #parseRequest(org.apache.tomcat.util.http.fileupload.RequestContext)}), you
+ * may either request all contents of file at once using {...@link #get()} or
* request an {...@link java.io.InputStream InputStream} with
* {...@link #getInputStream()} and process the file without attempting to load
* it into memory, which may come handy with large files.
@@ -276,10 +274,10 @@ public class DiskFileItem
* Returns the original filename in the client's filesystem.
*
* @return The original filename 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
- * InvalidFileNameException#getName().
+ * @throws org.apache.tomcat.util.http.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 InvalidFileNameException#getName().
*/
public String getName() {
return Streams.checkFileName(fileName);
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1026054&r1=1026053&r2=1026054&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Thu Oct
21 16:18:12 2010
@@ -35,7 +35,6 @@ import javax.management.MBeanOperationIn
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.ServiceNotFoundException;
-import javax.management.modelmbean.InvalidTargetObjectTypeException;
/**
@@ -304,8 +303,8 @@ public class ManagedBean implements java
*
* @exception InstanceNotFoundException if the managed resource
* object cannot be found
- * @exception InvalidTargetObjectTypeException if our MBean cannot
- * handle object references (should never happen)
+ * @exception javax.management.modelmbean.InvalidTargetObjectTypeException
+ * if our MBean cannot handle object references (should never happen)
* @exception MBeanException if a problem occurs instantiating the
* <code>ModelMBean</code> instance
* @exception RuntimeOperationsException if a JMX runtime error occurs
@@ -332,8 +331,8 @@ public class ManagedBean implements java
*
* @exception InstanceNotFoundException if the managed resource
* object cannot be found
- * @exception InvalidTargetObjectTypeException if our MBean cannot
- * handle object references (should never happen)
+ * @exception javax.management.modelmbean.InvalidTargetObjectTypeException
+ * if our MBean cannot handle object references (should never happen)
* @exception MBeanException if a problem occurs instantiating the
* <code>ModelMBean</code> instance
* @exception RuntimeOperationsException if a JMX runtime error occurs
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
