You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/07/03 10:27:47 UTC

cvs commit: cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail MailCommandManager.java

cziegeler    2003/07/03 01:27:47

  Modified:    src/blocks/xmlform/java/org/apache/cocoon/components/xmlform
                        Form.java FormListener.java
               src/blocks/portal/java/org/apache/cocoon/portal/impl
                        PortalManagerImpl.java
               src/blocks/mail/java/org/apache/cocoon/mail/datasource
                        FilePartDataSource.java
               src/blocks/xmlform/java/org/apache/cocoon/components/validation
                        Schema.java
               src/blocks/xmlform/java/org/apache/cocoon/acting
                        AbstractXMLFormAction.java
               src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
                        StaticProfileManager.java
                        AuthenticationProfileManager.java
               src/blocks/woody/java/org/apache/cocoon/woody/formmodel
                        AggregateFieldDefinition.java
               src/blocks/mail/java/org/apache/cocoon/mail
                        MailCommandManager.java
  Log:
  Reducing javadocs errors
  
  Revision  Changes    Path
  1.4       +1 -6      cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/Form.java
  
  Index: Form.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/Form.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Form.java	30 May 2003 21:20:47 -0000	1.3
  +++ Form.java	3 Jul 2003 08:27:46 -0000	1.4
  @@ -320,7 +320,6 @@
        * Performs complete validation
        * of the form model.
        *
  -     * @return
        */
       public boolean validate() {
           return validate(null);
  @@ -549,7 +548,6 @@
        *
        * @param name       
        *
  -     * @return
        */
       protected boolean filterRequestParameter(String name) {
           // filter standard cocoon-* parameters
  @@ -585,7 +583,6 @@
        *
        * @param paramName  
        *
  -     * @return
        */
       protected boolean filterDefaultRequestParameter(String paramName) {
           if (paramName.startsWith(Constants.ACTION_PARAM_PREFIX) ||
  @@ -605,7 +602,6 @@
        *
        * @param sitemapObjectModel
        *
  -     * @return
        */
       public String getFormView(Map sitemapObjectModel) {
           return getRequest(sitemapObjectModel).getParameter(Form.FORM_VIEW_PARAM);
  @@ -645,7 +641,6 @@
        * @param sitemapObjectModel
        * @param id the form id
        *
  -     * @return
        */
       public static Form lookup(Map sitemapObjectModel, String id) {
           Request request = getRequest(sitemapObjectModel);
  
  
  
  1.3       +1 -3      cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/FormListener.java
  
  Index: FormListener.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/FormListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FormListener.java	26 Apr 2003 12:10:44 -0000	1.2
  +++ FormListener.java	3 Jul 2003 08:27:46 -0000	1.3
  @@ -82,8 +82,6 @@
        *
        * @param form       
        * @param parameterName
  -     *
  -     * @return
        */
       boolean filterRequestParameter(Form form, String parameterName);
   }
  
  
  
  1.3       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
  
  Index: PortalManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortalManagerImpl.java	3 Jul 2003 07:59:59 -0000	1.2
  +++ PortalManagerImpl.java	3 Jul 2003 08:27:47 -0000	1.3
  @@ -94,7 +94,7 @@
       }
   
   	/**
  -	 * @see org.apache.cocoon.portal.core.PortalManager#showPortal(ContentHandler, Parameters)
  +	 * @see PortalManager#showPortal(ContentHandler, Parameters)
   	 */
   	public void showPortal(ContentHandler contentHandler, Parameters parameters) 
       throws SAXException {
  
  
  
  1.3       +5 -5      cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java
  
  Index: FilePartDataSource.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/datasource/FilePartDataSource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FilePartDataSource.java	3 Jul 2003 08:00:00 -0000	1.2
  +++ FilePartDataSource.java	3 Jul 2003 08:27:47 -0000	1.3
  @@ -56,7 +56,7 @@
   import org.apache.cocoon.servlet.multipart.Part;
   
   /** The FilePartDataSource class provides an object, that wraps a
  - * Cocoon {@link org.apache.cocoon.components.request.multipart.FilePart}
  + * Cocoon {@link Part}
    * object in a DataSource interface.
    * @see javax.activation.DataSource
    *
  @@ -99,7 +99,7 @@
        }
           
       /** Return the content type (mime type) obtained from
  -     * {@link org.apache.cocoon.components.request.multipart.FilePart#getMimeType()}.
  +     * {@link Part#getMimeType()}.
        * Return <CODE>application/octet-stream</CODE> if <CODE>getMimeType()</CODE>
        * returns <CODE>null</CODE>.
        * @return The content type (mime type) for this <CODE>DataSource</CODE> object.
  @@ -116,7 +116,7 @@
       }
       
       /** The InputStream object obtained from
  -     * {@link org.apache.cocoon.components.request.multipart.FilePart#getInputStream()}
  +     * {@link Part#getInputStream()}
        * object.
        * @throws java.io.IOException if an I/O error occurs.
        * @return The InputStream object for this <CODE>DataSource</CODE> object.
  @@ -133,7 +133,7 @@
       
       /** Returns the name for this <CODE>DataSource</CODE> object. This is
        * what is returned by
  -     * {@link org.apache.cocoon.components.request.multipart.FilePart#getFileName}.
  +     * {@link Part#getFileName}.
        * @return the name for this <CODE>DataSource</CODE> object.
        */    
       public String getName() {
  
  
  
  1.3       +1 -6      cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/validation/Schema.java
  
  Index: Schema.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/validation/Schema.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Schema.java	26 Apr 2003 12:10:43 -0000	1.2
  +++ Schema.java	3 Jul 2003 08:27:47 -0000	1.3
  @@ -57,11 +57,6 @@
    */
   public interface Schema {
   
  -    /**
  -     *
  -     *
  -     * @return
  -     */
       Validator newValidator() throws InstantiationException;
   
   }
  
  
  
  1.3       +1 -3      cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/acting/AbstractXMLFormAction.java
  
  Index: AbstractXMLFormAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/acting/AbstractXMLFormAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractXMLFormAction.java	26 Apr 2003 12:10:43 -0000	1.2
  +++ AbstractXMLFormAction.java	3 Jul 2003 08:27:47 -0000	1.3
  @@ -366,7 +366,6 @@
        * Subclasses may override this method
        * to use custom validators
        *
  -     * @return
        */
       protected Validator getFormValidator() {
           try {
  @@ -407,7 +406,6 @@
        * Subclasses may override this method
        * to use custom model instantiation technique
        *
  -     * @return
        */
       protected Object getFormModel() {
           try {
  
  
  
  1.3       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
  
  Index: StaticProfileManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StaticProfileManager.java	27 May 2003 14:07:16 -0000	1.2
  +++ StaticProfileManager.java	3 Jul 2003 08:27:47 -0000	1.3
  @@ -102,7 +102,7 @@
       }
   
       /**
  -     * @see org.apache.cocoon.portal.profile.ProfileManager#getPortalLayout(Object)
  +     * @see ProfileManager#getPortalLayout(String)
        */
       public Layout getPortalLayout(String key) {
           PortalService service = null;
  
  
  
  1.7       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
  
  Index: AuthenticationProfileManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AuthenticationProfileManager.java	6 Jun 2003 11:33:39 -0000	1.6
  +++ AuthenticationProfileManager.java	3 Jul 2003 08:27:47 -0000	1.7
  @@ -165,7 +165,7 @@
       }
       
       /**
  -     * @see org.apache.cocoon.portal.profile.ProfileManager#getPortalLayout(Object)
  +     * @see ProfileManager#getPortalLayout(String)
        */
       public Layout getPortalLayout(String key) {
           PortalService service = null;
  
  
  
  1.2       +3 -3      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinition.java
  
  Index: AggregateFieldDefinition.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinition.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AggregateFieldDefinition.java	26 Jun 2003 09:09:59 -0000	1.1
  +++ AggregateFieldDefinition.java	3 Jul 2003 08:27:47 -0000	1.2
  @@ -65,17 +65,17 @@
       private Expression combineExpr;
       private Pattern splitPattern;
       /**
  -     * The original regexp expression from which the {@link #splitPattern} was compiled,
  +     * The original regexp expression from which the {@link splitPattern} was compiled,
        * used purely for informational purposes.
        */
       private String splitRegexp;
       /**
  -     * Message to be displayed when the {@link #splitPattern} does not match what the
  +     * Message to be displayed when the {@link splitPattern} does not match what the
        * user entered. Optional.
        */
       protected Object splitFailMessage;
       /**
  -     * List containing instances of {@link SplitMapping}, i.e. the mapping between
  +     * List containing instances of {@link splitMapping}, i.e. the mapping between
        * a group (paren) from the regular expression and corresponding field id.
        */
       private List splitMappings = new ArrayList();
  
  
  
  1.3       +1 -26     cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java
  
  Index: MailCommandManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MailCommandManager.java	11 Mar 2003 19:04:58 -0000	1.2
  +++ MailCommandManager.java	3 Jul 2003 08:27:47 -0000	1.3
  @@ -214,9 +214,6 @@
       /**
        *  Retrieve folder, and put it as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailFolderCatCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -253,13 +250,9 @@
       }
   
   
  -////
       /**
        *  Retrieve folder, and put it as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailRefreshFolderCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -301,9 +294,6 @@
        *  Retrieved headers of all messages of a folder, put
        *   retrieved messages as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailListMessagesCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -360,9 +350,6 @@
        *  List all subfolders of a folder, put
        *  all retrieved folders as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailListFolderCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -427,9 +414,6 @@
        *  Retrieved a message (envelope plus content) of a folder by its uid, put
        *   retrieved message as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailCatMessageByUIDCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -484,9 +468,6 @@
        *  Retrieved a message (envelope plus content) of a folder by its id, put
        *   retrieved message as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailCatMessageByIdCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -541,9 +522,6 @@
        *  Retrieved a message part by its part id, specifying the message by id, put
        *   retrieved part as command result.
        *
  -     *@author     Bernhard Huber
  -     *@created    23. Oktober 2002
  -     *@version    CVS Version: $Id$
        */
       public static class MailCatAttachmentMessageByIdCommand extends AbstractMailCommand implements Contextualizable {
   
  @@ -633,9 +611,6 @@
       /**
        *  Description of the Class
        *
  -     *@author     Administrator
  -     *@created    02. J�nner 2003
  -     *@version    CVS Version: $Id$
        */
       public static class MailSearchMessagesCommand extends AbstractMailCommand implements Contextualizable {
           private Folder aFolder;