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 13:36:10 UTC

cvs commit: cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation VelocityGenerator.java

cziegeler    2003/07/03 04:36:10

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl
                        DefaultAspectDescription.java
               src/blocks/mail/java/org/apache/cocoon/acting Sendmail.java
               src/blocks/slide/java/org/apache/cocoon/components/source/helpers
                        SourceProperty.java
               src/blocks/mail/java/org/apache/cocoon/mail
                        MailMessageSender.java
               src/blocks/woody/java/org/apache/cocoon/woody/formmodel
                        AggregateFieldDefinition.java
               src/blocks/velocity/java/org/apache/cocoon/generation
                        VelocityGenerator.java
  Log:
  Reducing javadocs errors
  
  Revision  Changes    Path
  1.5       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/DefaultAspectDescription.java
  
  Index: DefaultAspectDescription.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/DefaultAspectDescription.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultAspectDescription.java	3 Jul 2003 09:26:03 -0000	1.4
  +++ DefaultAspectDescription.java	3 Jul 2003 11:36:09 -0000	1.5
  @@ -121,7 +121,7 @@
       }
   
       /**
  -     * @return
  +     * @return The role of the store
        */
       public String getStoreName() {
           return persistence;
  
  
  
  1.3       +2 -2      cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/acting/Sendmail.java
  
  Index: Sendmail.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/acting/Sendmail.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Sendmail.java	3 Jul 2003 09:26:03 -0000	1.2
  +++ Sendmail.java	3 Jul 2003 11:36:09 -0000	1.3
  @@ -109,7 +109,7 @@
    *    is assumed, that the argument describes a request parameter of an
    *    uploaded file, which
    *    Cocoon has internally turned into a 
  - *    {@link Part} 
  + *    {@link org.apache.cocoon.servlet.multipart.Part} 
    *    object.</dd>
    * </dl>
    * <p>
  
  
  
  1.3       +1 -3      cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/helpers/SourceProperty.java
  
  Index: SourceProperty.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/helpers/SourceProperty.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SourceProperty.java	16 Mar 2003 17:49:07 -0000	1.2
  +++ SourceProperty.java	3 Jul 2003 11:36:10 -0000	1.3
  @@ -273,8 +273,6 @@
   
       /**
        *
  -     *
  -     * @return
        */
       public Element getValue() {
           return this.value;
  
  
  
  1.4       +7 -7      cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java
  
  Index: MailMessageSender.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MailMessageSender.java	3 Jul 2003 09:26:03 -0000	1.3
  +++ MailMessageSender.java	3 Jul 2003 11:36:10 -0000	1.4
  @@ -367,10 +367,10 @@
   
       /** Sets the destination address(es) for the message. The address
        * is in the format, that
  -     * <code>javax.mail.internet.InternetAddress.parse</code> can handle
  +     * {@link javax.mail.internet.InternetAddress#parse} can handle
        * (one or more email addresses separated by a commas).
        * @param to the destination address(es)
  -     * @see javax.mail.internet.InternetAddress.parse
  +     * @see javax.mail.internet.InternetAddress#parse
        */
       public void setTo(String to) {
           if (!("".equals(to) || "null".equals(to))) {
  @@ -380,10 +380,10 @@
   
       /** Sets the address(es), which should receive a carbon copy of the
        * message. The address is in the format, that
  -     * <code>javax.mail.internet.InternetAddress.parse</code> can handle
  +     * {@link javax.mail.internet.InternetAddress#parse} can handle
        * (one or more email addresses separated by a commas).
        * @param cc the address(es), which should receive a carbon copy.
  -     * @see javax.mail.internet.InternetAddress.parse
  +     * @see javax.mail.internet.InternetAddress#parse
        */
       public void setCc(String cc) {
           if (!("".equals(cc) || "null".equals(cc))) {
  @@ -393,10 +393,10 @@
   
       /** Sets the address(es), which should receive a black carbon copy of
        * the message. The address is in the format, that
  -     * <code>javax.mail.internet.InternetAddress.parse</code> can handle
  +     * {@link javax.mail.internet.InternetAddress#parse} can handle
        * (one or more email addresses separated by a commas).
        * @param bcc the address(es), which should receive a black carbon copy.
  -     * @see javax.mail.internet.InternetAddress.parse
  +     * @see javax.mail.internet.InternetAddress#parse
        */
       public void setBcc(String bcc) {
           if (!("".equals(bcc) || "null".equals(bcc))) {
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AggregateFieldDefinition.java	3 Jul 2003 08:27:47 -0000	1.2
  +++ AggregateFieldDefinition.java	3 Jul 2003 11:36:10 -0000	1.3
  @@ -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 #splitMappings}, i.e. the mapping between
        * a group (paren) from the regular expression and corresponding field id.
        */
       private List splitMappings = new ArrayList();
  
  
  
  1.6       +1 -5      cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java
  
  Index: VelocityGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/velocity/java/org/apache/cocoon/generation/VelocityGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VelocityGenerator.java	16 May 2003 13:40:03 -0000	1.5
  +++ VelocityGenerator.java	3 Jul 2003 11:36:10 -0000	1.6
  @@ -209,7 +209,6 @@
            * @param systemId the path to the resource
            * @see org.apache.velocity.runtime.resource.loader.ResourceLoader#getResourceStream
            *
  -         * @return
            */
           public InputStream getResourceStream(String systemId)
             throws org.apache.velocity.exception.ResourceNotFoundException {
  @@ -228,7 +227,6 @@
            *
            * @param resource   
            *
  -         * @return
            */
           public boolean isSourceModified(org.apache.velocity.runtime.resource.Resource resource) {
               long lastModified = 0;
  @@ -249,7 +247,6 @@
            *
            * @param resource   
            *
  -         * @return
            */
           public long getLastModified(org.apache.velocity.runtime.resource.Resource resource) {
               long lastModified = 0;
  @@ -270,7 +267,6 @@
            *
            * @param systemId the path to the resource
            *
  -         * @return
            */
           private Source resolveSource(String systemId)
             throws org.apache.velocity.exception.ResourceNotFoundException {