You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2002/06/25 03:30:41 UTC

cvs commit: jakarta-struts/src/share/org/apache/struts/util ErrorMessages.java

craigmcc    2002/06/24 18:30:41

  Modified:    src/share/org/apache/struts/action ActionErrors.java
                        PlugIn.java RequestProcessor.java
               src/share/org/apache/struts/actions
                        LookupDispatchAction.java
               src/share/org/apache/struts/config ApplicationConfig.java
                        ConfigHelper.java ConfigHelperInterface.java
                        package.html
               src/share/org/apache/struts/taglib/logic package.html
               src/share/org/apache/struts/taglib/nested/logic
                        NestedIterateTei.java
               src/share/org/apache/struts/taglib/template/util
                        Content.java ContentMap.java
               src/share/org/apache/struts/upload
                        DiskMultipartRequestHandler.java
                        MultipartElement.java MultipartRequestHandler.java
               src/share/org/apache/struts/util ErrorMessages.java
  Log:
  Cosmetic changes only, to eliminate Javadoc warnings under 1.4.
  
  Revision  Changes    Path
  1.7       +4 -4      jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java
  
  Index: ActionErrors.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ActionErrors.java	12 Jul 2001 05:18:33 -0000	1.6
  +++ ActionErrors.java	25 Jun 2002 01:30:40 -0000	1.7
  @@ -90,7 +90,7 @@
    *
    * @author David Geary
    * @author Craig R. McClanahan
  - * @revision $Revision$ $Date$
  + * @version $Revision$ $Date$
    */
   
   public class ActionErrors extends ActionMessages implements Serializable {
  
  
  
  1.4       +5 -5      jakarta-struts/src/share/org/apache/struts/action/PlugIn.java
  
  Index: PlugIn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/PlugIn.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PlugIn.java	24 Jun 2002 18:53:01 -0000	1.3
  +++ PlugIn.java	25 Jun 2002 01:30:40 -0000	1.4
  @@ -70,7 +70,7 @@
   /**
    * <p>A <strong>PlugIn</strong> is a configuration wrapper for an application
    * specific module or service that needs to be notified about application
  - * startup and application shutdown events (i.e. corresponding to when the
  + * startup and application shutdown events (corresponding to when the
    * container calls <code>init()</code> and <code>destroy()</code> on the
    * corresponding {@link ActionServlet} instance).  PlugIn modules can be
    * configured in the <code>struts-config.xml</code> file, without the need
  
  
  
  1.10      +5 -6      jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java
  
  Index: RequestProcessor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/RequestProcessor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RequestProcessor.java	24 Jun 2002 18:53:01 -0000	1.9
  +++ RequestProcessor.java	25 Jun 2002 01:30:40 -0000	1.10
  @@ -94,6 +94,7 @@
    * interested in changing.</p>
    *
    * @author Craig R. McClanahan
  + * @author Cedric Dumoulin
    * @version $Revision$ $Date$
    * @since Struts 1.1
    */
  @@ -956,7 +957,6 @@
        * @param request Current page request
        * @param response Current page response
        * @since Struts 1.1
  -     * @author Cedric Dumoulin
        */
       protected void doForward(String uri, HttpServletRequest request,
                                HttpServletResponse response)
  @@ -980,7 +980,6 @@
        * @param request Current page request
        * @param response Current page response
        * @since Struts 1.1
  -     * @author Cedric Dumoulin
        */
       protected void doInclude(String uri, HttpServletRequest request,
                                HttpServletResponse response)
  
  
  
  1.4       +0 -1      jakarta-struts/src/share/org/apache/struts/actions/LookupDispatchAction.java
  
  Index: LookupDispatchAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/LookupDispatchAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LookupDispatchAction.java	23 Jun 2002 00:52:50 -0000	1.3
  +++ LookupDispatchAction.java	25 Jun 2002 01:30:40 -0000	1.4
  @@ -143,7 +143,6 @@
    *  is found then an exception will be thrown.
    *
    *@author     Erik Hatcher
  - *@created    November 14, 2001
    */
   
   public abstract class LookupDispatchAction extends DispatchAction {
  
  
  
  1.15      +5 -5      jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java
  
  Index: ApplicationConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApplicationConfig.java	23 Mar 2002 01:14:04 -0000	1.14
  +++ ApplicationConfig.java	25 Jun 2002 01:30:40 -0000	1.15
  @@ -161,7 +161,7 @@
   
   
       /**
  -     * Has this application been completely configured yet?  Once this flag
  +     * Has this application been completely configured yet.  Once this flag
        * has been set, any attempt to modify the configuration will return an
        * IllegalStateException.
        */
  
  
  
  1.2       +6 -11     jakarta-struts/src/share/org/apache/struts/config/ConfigHelper.java
  
  Index: ConfigHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigHelper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigHelper.java	22 Feb 2002 10:17:33 -0000	1.1
  +++ ConfigHelper.java	25 Jun 2002 01:30:40 -0000	1.2
  @@ -118,6 +118,7 @@
    *
    * @since 1.1
    * @author Ted Husted
  + * @author Luis Arias <lu...@elysia.com>
    * @version $Revision$ $Date$
    */
   public class ConfigHelper implements ConfigHelperInterface {
  @@ -616,9 +617,6 @@
   
       /**
        * Renders the reference for a HTML <base> element
  -     *
  -     * @author Luis Arias <lu...@elysia.com>
  -     * @author Ted Husted
        */
       public String getOrigRef() {
   
  @@ -647,10 +645,7 @@
   
   
       /**
  -     * Renders the reference for a HTML <base> element
  -     *
  -     * @author Luis Arias <lu...@elysia.com>
  -     * @author Ted Husted
  +     * Renders the reference for a HTML <base> element.
        */
       public String getBaseRef() {
   
  
  
  
  1.2       +5 -10     jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java
  
  Index: ConfigHelperInterface.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigHelperInterface.java	22 Feb 2002 10:17:33 -0000	1.1
  +++ ConfigHelperInterface.java	25 Jun 2002 01:30:40 -0000	1.2
  @@ -109,6 +109,7 @@
    *
    * @since 1.1
    * @author Ted Husted
  + * @author Luis Arias <lu...@elysia.com>
    * @version $Revision$ $Date$
    */
   public interface ConfigHelperInterface {
  @@ -301,9 +302,6 @@
   
       /**
        * Renders the reference for a HTML <base> element
  -     *
  -     * @author Luis Arias <lu...@elysia.com>
  -     * @author Ted Husted
        */
       public String getOrigRef();
   
  @@ -311,9 +309,6 @@
   
       /**
        * Renders the reference for a HTML <base> element
  -     *
  -     * @author Luis Arias <lu...@elysia.com>
  -     * @author Ted Husted
        */
       public String getBaseRef();
   
  
  
  
  1.4       +4 -12     jakarta-struts/src/share/org/apache/struts/config/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/package.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- package.html	12 Apr 2002 19:00:00 -0000	1.3
  +++ package.html	25 Jun 2002 01:30:40 -0000	1.4
  @@ -1,15 +1,7 @@
  -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  -<html>
  -<head>
  -  <title>Package Documentation for org.apache.struts.config Package</title>
  -</head>
  - <body bgcolor="white">
  - The "config" package contains configuration objects that correspond to elements 
  -that may be specified in the <code>struts-config.xml</code> application configuration
  -file.<br>
  -<p></p>
  +<body>
  +<p>The "config" package contains configuration objects that correspond to
  +elements that may be specified in the <code>struts-config.xml</code>
  +application configuration file.</p>
   <img src="doc-files/configUML.jpg" alt="Config UML" width="1146" height="688">
   <br>
  - 
   </body>
  -</html>
  
  
  
  1.12      +7 -13     jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- package.html	24 Mar 2002 07:14:45 -0000	1.11
  +++ package.html	25 Jun 2002 01:30:40 -0000	1.12
  @@ -1,15 +1,10 @@
  -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
  -<html>
  -<head>
  -  <title>Package Documentation for org.apache.struts.taglib.logic Package</title>
  -</head>
  - <body bgcolor="white">
  +<body>
       
  -<p>     The "struts-logic" tag library contains tags that are useful in managing
  -conditional     generation of output text, looping over object collections
  -for repetitive generation     of output text, and application flow management 
  -  </p>
  -   <a name="doc.Description"></a>
  +<p>The "struts-logic" tag library contains tags that are useful in managing
  +conditional generation of output text, looping over object collections
  +for repetitive generation of output text, and application flow management.
  +</p>
  +<a name="doc.Description"></a>
       
   <p>  </p>
   <div align="Center"> <a href="#doc.Introduction">[Introduction]</a>
  @@ -414,5 +409,4 @@
    </blockquote>
    </blockquote>
    
  -                </body>
  -                </html>
  +</body>
  
  
  
  1.3       +5 -5      jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
  
  Index: NestedIterateTei.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/logic/NestedIterateTei.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NestedIterateTei.java	27 May 2002 07:14:47 -0000	1.2
  +++ NestedIterateTei.java	25 Jun 2002 01:30:41 -0000	1.3
  @@ -68,7 +68,7 @@
    * attribute optional, so that those who want to script can add it if they need
    * it otherwise we can maintain the nice lean tag markup.
    *
  - * @TODO - Look at deleting this class. Potentially a pointless existance now
  + *  TODO - Look at deleting this class. Potentially a pointless existance now
    *         that the super class is towing the line. Left alone because it's not
    *         hurting anything as-is.
    *         Note: When done, it requires pointing the tei reference in the
  
  
  
  1.4       +12 -12    jakarta-struts/src/share/org/apache/struts/taglib/template/util/Content.java
  
  Index: Content.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/util/Content.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Content.java	29 Apr 2001 05:34:50 -0000	1.3
  +++ Content.java	25 Jun 2002 01:30:41 -0000	1.4
  @@ -76,7 +76,7 @@
    *  </p>
    *
    * @author David Geary
  - * @revision $Revision$
  + * @version $Revision$
    */
   public class Content implements java.io.Serializable {
   
  @@ -85,7 +85,7 @@
   
       /**
        *  Templates regard this as content to be either included or 
  -     *  printed directly.<br> This is a blank final that is
  +     *  printed directly.  This is a blank final that is
        *  set at construction.
        * 
        */
  @@ -93,9 +93,9 @@
   
   
       /**
  -     *   Represents a boolean; if true, content is included, otherwise
  -     *   content is printed.<br>This is a blank final that is set at 
  -     *  construction.<br>This is a string instead of a boolean as
  +     *  Represents a boolean - if true, content is included, otherwise
  +     *  content is printed.  This is a blank final that is set at 
  +     *  construction.  This is a string instead of a boolean as
        *  a convenience for the tags, whose corresponding attribute
        *  is a string.
        *  
  @@ -122,7 +122,7 @@
       // --------------------------------------------------------- Public Methods
   
       /**
  -     * Return content 
  +     * Return content.
        */
       public String getContent() {
   
  @@ -131,8 +131,8 @@
       }
   
       /**
  -     * Is content to be printed directly (isDirect() == true) <br>
  -     * instead of included (isDirect() == false)?
  +     * Is content to be printed directly (isDirect() == true)
  +     * instead of included (isDirect() == false).
        */
       public boolean isDirect() {
   
  @@ -142,7 +142,7 @@
   
   
      /**
  -     * Returns a string representation of the content
  +     * Returns a string representation of the content.
        */
      public String toString() { 
   
  
  
  
  1.4       +6 -6      jakarta-struts/src/share/org/apache/struts/taglib/template/util/ContentMap.java
  
  Index: ContentMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/util/ContentMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContentMap.java	29 Apr 2001 05:34:50 -0000	1.3
  +++ ContentMap.java	25 Jun 2002 01:30:41 -0000	1.4
  @@ -104,9 +104,9 @@
   
   
      /**
  -     * Returns the content associated with name
  +     * Returns the content associated with name.
        *
  -     * @name Name of content to retrieve
  +     * @param name Name of content to retrieve
        */
      public Content get(String name) {
   
  
  
  
  1.17      +9 -9      jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
  
  Index: DiskMultipartRequestHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DiskMultipartRequestHandler.java	23 Jun 2002 04:15:21 -0000	1.16
  +++ DiskMultipartRequestHandler.java	25 Jun 2002 01:30:41 -0000	1.17
  @@ -31,32 +31,32 @@
       protected Log log = LogFactory.getLog(this.getClass());
       
       /**
  -     * The ActionServlet instance used for this class
  +     * The ActionServlet instance used for this class.
        */
       protected ActionServlet servlet;
   
       /**
  -     * The ActionMapping instance used for this class
  +     * The ActionMapping instance used for this class.
        */
       protected ActionMapping mapping;
   
       /**
  -     * A Hashtable representing the form files uploaded
  +     * A Hashtable representing the form files uploaded.
        */
       protected Hashtable fileElements;
   
       /**
  -     * A Hashtable representing the form text input names and values
  +     * A Hashtable representing the form text input names and values.
        */
       protected Hashtable textElements;
   
       /**
  -     * A Hashtable representing all elemnents
  +     * A Hashtable representing all elemnents.
        */
       protected Hashtable allElements;
       
       /**
  -     * The temporary directory
  +     * The temporary directory.
        */
       protected String tempDir;
       
  @@ -155,7 +155,7 @@
       }
   
       /**
  -     * Delete all the files uploaded
  +     * Delete all the files uploaded.
        */
       public void rollback() {
           Enumeration names = fileElements.keys();
  @@ -169,7 +169,7 @@
   
       /**
        * Calls on {@link #rollback() rollback()} to delete
  -     * temporary files
  +     * temporary files.
        */
       public void finish() {
           rollback();
  @@ -224,7 +224,7 @@
       
       /**
        * Retrieves the temporary directory from either ActionServlet, a context
  -     * property, or a system property, in that order
  +     * property, or a system property, in that order.
        */
       protected void retrieveTempDir(ApplicationConfig appConfig) { 
           
  
  
  
  1.4       +101 -29   jakarta-struts/src/share/org/apache/struts/upload/MultipartElement.java
  
  Index: MultipartElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartElement.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MultipartElement.java	6 Mar 2002 19:39:08 -0000	1.3
  +++ MultipartElement.java	25 Jun 2002 01:30:41 -0000	1.4
  @@ -2,35 +2,63 @@
   
   import java.io.File;
   
  -/**
 * This class represents an element in a multipart request.
 * It has a few methods for determining
 * whether or not the element is a String or a file,
 * and methods to retrieve the data of the aforementioned
 * element.  Text input elements have a <code>null</code> content type,
 * files have a non-null content type.
 *
 * @author Mike Schachter
 */
  +/**
  + * This class represents an element in a multipart request.
  + * It has a few methods for determining * whether or not the element is a
  + * String or a file, and methods to retrieve the data of the aforementioned
  + * element.  Text input elements have a <code>null</code> content type,
  + * files have a non-null content type.
  + *
  + * @author Mike Schachter
  + */
   public class MultipartElement
   {
  -    /**
     * The content type of this element
     */
  +    /**
  +     * The content type of this element.
  +     */
       protected String contentType;
   
  -    /**
     * The element data
     * @deprecated This should never be used.
     */
  +    /**
  +     * The element data.
  +     * @deprecated This should never be used.
  +     */
       protected byte[] data;
   
  -    /**
     * The element's data represented in a (possibly temporary) file
     */
  +    /**
  +     * The element's data represented in a (possibly temporary) file.
  +     */
       protected File file;
   
  -    /**
     * The element name
     */
  +    /**
  +     * The element name.
  +     */
       protected String name;
   
  -    /**
     * The element's filename, null for text elements
     */
  +    /**
  +     * The element's filename, null for text elements.
  +     */
       protected String fileName;
   
   
  -    /**
     * The element's text value, null for file elements
     */
  +    /**
  +     * The element's text value, null for file elements
  +     */
       protected String value;
   
   
  -    /**
     * Whether or not this element is a file
     */
  +    /**
  +     * Whether or not this element is a file.
  +     */
       protected boolean isFile = false;
   
   
  -    /**
     * @deprecated Use the constructor that takes an File as an argument
     *             as opposed to a byte array argument, which can cause
     *             memory problems
     */
  -    public MultipartElement(String name, String fileName, String contentType, byte[] data)
  +    /**
  +     * @deprecated Use the constructor that takes an File as an argument
  +     *             as opposed to a byte array argument, which can cause
  +     *             memory problems.
  +     */
  +    public MultipartElement(String name, String fileName,
  +                            String contentType, byte[] data)
       {
   
           this.name = name;
  @@ -42,10 +70,19 @@
           {
                 isFile = true;
           }
  +
       }
   
  -    /**
     * Constructor for a file element
     * @param name The form name of the element
     * @param fileName The file name of the element if this element is a file
     * @param contentType The content type of the element if a file
     * @param file The (possibly temporary) file representing this element if
     *             it's a file
     */
  -    public MultipartElement(String name, String fileName, String contentType, File file)
  +    /**
  +     * Constructor for a file element.
  +     * @param name The form name of the element
  +     * @param fileName The file name of the element if this element is a file
  +     * @param contentType The content type of the element if a file
  +     * @param file The (possibly temporary) file representing this element if
  +     *             it's a file
  +     */
  +    public MultipartElement(String name, String fileName,
  +                            String contentType, File file)
       {
           this.name = name;
           this.fileName = fileName;
  @@ -54,22 +91,32 @@
           this.isFile = true;
       }
   
  -    /**
     * Constructor for a text element
     * @param name The name of the element
     * @param value The value of the element
     */
  +    /**
  +     * Constructor for a text element.
  +     * @param name The name of the element
  +     * @param value The value of the element
  +     */
       public MultipartElement(String name, String value)
       {
            this.name = name;
            this.value = value;
            this.isFile = false;
  -     }
  +    }
   
  -    /**
      * Retrieve the content type
      */
  -     public String getContentType()
  +    /**
  +      * Retrieve the content type.
  +      */
  +    public String getContentType()
       {
            return contentType;
  -     }
  +    }
   
   
  -    /**
     * Retrieve the data
     * @deprecated Use the getFile method to get a File representing the
     *             data for this element
     */
  +    /**
  +     * Retrieve the data.
  +     * @deprecated Use the getFile method to get a File representing the
  +     *             data for this element
  +     */
       public byte[] getData()
       {
   
  @@ -77,62 +124,83 @@
       }
   
   
  -    /**
     * Get the File that holds the data for this element.
     */
  +    /**
  +     * Get the File that holds the data for this element.
  +     */
       public File getFile()
       {
          return file;
       }
   
   
  -    /**
     * Retrieve the name
     */
  +    /**
  +     * Retrieve the name.
  +     */
       public String getName()
       {
          return name;
       }
   
  -   /**
    * Retrieve the filename, can return <code>null</code>
    * for text elements
    */
  +    /**
  +     * Retrieve the filename, can return <code>null</code>
  +     * for text elements.
  +     */
       public String getFileName()
       {
         return fileName;
       }
   
   
  -    /**
     * Returns the value of this multipart element
     * @return A String if the element is a text element, <code>null</code>
     *         otherwise
     */
  +    /**
  +     * Returns the value of this multipart element.
  +     * @return A String if the element is a text element, <code>null</code>
  +     *         otherwise
  +     */
       public String getValue()
       {
           return value;
       }
   
   
  -    /**
     * Set the file that represents this element
     */
  +    /**
  +     * Set the file that represents this element.
  +     */
       public void setFile(File file)
       {
           this.file = file;
       }
   
   
  -    /**
     * Set the file name for this element
     */
  +    /**
  +     * Set the file name for this element.
  +     */
       public void setFileName(String fileName)
       {
           this.fileName = fileName;
       }
   
   
  -    /**
     * Set the name for this element
     */
  +    /**
  +     * Set the name for this element.
  +     */
       public void setName(String name)
       {
           this.name = name;
       }
   
   
  -    /**
     * Set the content type
     */
  +    /**
  +     * Set the content type.
  +     */
       public void setContentType(String contentType)
       {
            this.contentType = contentType;
       }
   
   
  -    /**
     * Is this element a file?
     */
  +    /**
  +     * Is this element a file.
  +     */
       public boolean isFile()
       {
           if (file == null)
  @@ -149,9 +217,13 @@
       }
   
   
  -    /**
     * Set the data
     * @deprecated Use the setFile method to set the file
     *             that represents the data of this element
     */
  +    /**
  +     * Set the data.
  +     * @deprecated Use the setFile method to set the file
  +     *             that represents the data of this element
  +     */
       public void setData(byte[] data)
       {
           this.data = data;
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +87 -66    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MultipartRequestHandler.java	6 Mar 2002 19:44:07 -0000	1.2
  +++ MultipartRequestHandler.java	25 Jun 2002 01:30:41 -0000	1.3
  @@ -1,79 +1,100 @@
   package org.apache.struts.upload;
  -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 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;
  -/**
  -  * MultipartRequestHandler provides an standard interface for struts to
  -  * deal with file uploads from forms with enctypes of "multipart/form-data".
  -  * Providers must provide a no-argument constructor for initialization.
  -  *
  -  * @author Mike Schachter
  -  */
  -public interface MultipartRequestHandler
  -{
  -    /**
  -     * This is the ServletRequest attribute that should be set when a multipart request is being read
  -     * and the maximum length is exceeded. The value is a Boolean. If the maximum length isn't exceeded,
  -     * this attribute shouldn't be put in the ServletRequest. It's the job of the implementation to put this
  -     * attribute in the request if the maximum length is exceeded; in the handleRequest(HttpServletRequest) method.
  -     */
  +/**
  +  * MultipartRequestHandler provides an standard interface for struts to
  +  * deal with file uploads from forms with enctypes of "multipart/form-data".
  +  * Providers must provide a no-argument constructor for initialization.
  +  *
  +  * @author Mike Schachter
  +  */
  +public interface MultipartRequestHandler
  +{
  +    /**
  +     * This is the ServletRequest attribute that should be set when a multipart request is being read
  +     * and the maximum length is exceeded. The value is a Boolean. If the maximum length isn't exceeded,
  +     * this attribute shouldn't be put in the ServletRequest. It's the job of the implementation to put this
  +     * attribute in the request if the maximum length is exceeded; in the handleRequest(HttpServletRequest) method.
  +     */
       public static final String ATTRIBUTE_MAX_LENGTH_EXCEEDED = "org.apache.struts.upload.MaxLengthExceeded";
  -    /**
  -     * Convienience method to set a reference to a working
  -     * ActionServlet instance.
  -     */
  +    /**
  +     * Convienience method to set a reference to a working
  +     * ActionServlet instance.
  +     */
       public void setServlet(ActionServlet servlet);
  -    /**
  -     * Convienience method to set a reference to a working
  -     * ActionMapping instance.
  -     */
  +    /**
  +     * Convienience method to set a reference to a working
  +     * ActionMapping instance.
  +     */
       public void setMapping(ActionMapping mapping);
  -    /**
  -     * Get the ActionServlet instance
  -     */
  +    /**
  +     * Get the ActionServlet instance
  +     */
       public ActionServlet getServlet();
  -    /**
  -     * Get the ActionMapping instance for this request
  -     */
  -    public ActionMapping getMapping();

  -    /**
      * After constructed, this is the first method called on
      * by ActionServlet.  Use this method for all your
      * data-parsing of the ServletInputStream in the request
      *
      * @exception ServletException thrown if something goes wrong
      */
    public void handleRequest(HttpServletRequest request) throws ServletException;
  -    /**
      * This method is called on to retrieve all the text
      * input elements of the request.
      * @return A Hashtable where the keys and values are the names and values of the request input parameters
  -      */
  +    /**
  +     * Get the ActionMapping instance for this request
  +     */
  +    public ActionMapping getMapping();
  +
  +    /**
  +      * After constructed, this is the first method called on
  +      * by ActionServlet.  Use this method for all your
  +      * data-parsing of the ServletInputStream in the request
  +      *
  +      * @exception ServletException thrown if something goes wrong
  +      */
  +    public void handleRequest(HttpServletRequest request)
  +        throws ServletException;
  +
  +    /**
  +     * This method is called on to retrieve all the text
  +     * input elements of the request.
  +     *
  +     * @return A Hashtable where the keys and values are the names and
  +     *  values of the request input parameters
  +     */
       public Hashtable getTextElements();
       
  -    /**
  -     * This method is called on to retrieve all the FormFile
  -     * input elements of the request.
  -     * @see org.apache.struts.upload.FormFile
  -     * @return A Hashtable where the keys are the input names of the files and the values are FormFile objects
  -     */
  +    /**
  +     * This method is called on to retrieve all the FormFile
  +     * input elements of the request.
  +     * @see org.apache.struts.upload.FormFile
  +     * @return A Hashtable where the keys are the input names of the
  +     *  files and the values are FormFile objects
  +     */
       public Hashtable getFileElements();
  -    /**
  -     * This method returns all elements of a multipart request.
  -     * @return A Hashtable where the keys are input names and values are either Strings or FormFiles
  -     */
  +
  +    /**
  +     * This method returns all elements of a multipart request.
  +     * @return A Hashtable where the keys are input names and values
  +     *   are either Strings or FormFiles
  +     */
       public Hashtable getAllElements();
  -    /**
  -     * This method is called on when there's some sort of problem
  -     * and the form post needs to be rolled back.  Providers
  -     * should remove any FormFiles used to hold information
  -     * by setting them to null and also physically delete
  -     * them if the implementation calls for writing directly
  -     * to disk.
  -     * NOTE: Currently implemented but not automatically
  -     * supported, ActionForm implementors must call rollback()
  -     * manually for rolling back file uploads.
  -     */
  +
  +    /**
  +     * This method is called on when there's some sort of problem
  +     * and the form post needs to be rolled back.  Providers
  +     * should remove any FormFiles used to hold information
  +     * by setting them to null and also physically delete
  +     * them if the implementation calls for writing directly
  +     * to disk.
  +     * NOTE: Currently implemented but not automatically
  +     * supported, ActionForm implementors must call rollback()
  +     * manually for rolling back file uploads.
  +     */
       public void rollback();
  -    /**
  -     * This method is called on when a successful form post
  -     * has been made.  Some implementations will use this
  -     * to destroy temporary files or write to a database
  -     * or something of that nature
  -     */
  -    public void finish();
  +
  +    /**
  +     * This method is called on when a successful form post
  +     * has been made.  Some implementations will use this
  +     * to destroy temporary files or write to a database
  +     * or something of that nature.
  +     */
  +    public void finish();
  +
   }
   
  
  
  
  1.5       +4 -4      jakarta-struts/src/share/org/apache/struts/util/ErrorMessages.java
  
  Index: ErrorMessages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/ErrorMessages.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ErrorMessages.java	12 Feb 2001 00:32:13 -0000	1.4
  +++ ErrorMessages.java	25 Jun 2002 01:30:41 -0000	1.5
  @@ -81,7 +81,7 @@
    * @deprecated Use org.apache.struts.action.ActionErrors instead
    *
    * @author David Geary
  - * @revision $Revision$ $Date$
  + * @version $Revision$ $Date$
    */
   
   public class ErrorMessages {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>