Allow Checkstyle's unused imports test to be used with the o.a.tomcat.util classes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1026054 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
index 390bb6e..3f87e1a 100644 (file)
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -36,9 +36,7 @@ import org.apache.tomcat.util.http.fileupload.FileItemHeaders;
 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.fileupload.util.Streams;
  * <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);

diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java b/java/org/apache/tomcat/util/modeler/ManagedBean.java
index 98718f8..a5f391c 100644 (file)
--- a/java/org/apache/tomcat/util/modeler/ManagedBean.java
+++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java
@@ -35,7 +35,6 @@ import javax.management.MBeanOperationInfo;
 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.io.Serializable
      *
      * @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.io.Serializable
      *
      * @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