ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/util ConcatResourceInputStream.java
Date Fri, 03 Jun 2005 16:46:55 GMT
jhm         2005/06/03 09:46:55

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        CovReport.java
               src/main/org/apache/tools/ant/taskdefs JDBCTask.java
                        RecorderEntry.java LogOutputStream.java
                        ResourceCount.java
               src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        WsdlToDotnet.java NetCommand.java
               src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
               src/main/org/apache/tools/ant/types/resources Touchable.java
                        FileResourceIterator.java Restrict.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        XMLValidateTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/ssh
                        SSHExec.java
               src/main/org/apache/tools/ant/taskdefs/repository
                        HttpRepository.java Repository.java
                        RepositoryRef.java
               src/main/org/apache/tools/ant/types DataType.java
               src/main/org/apache/tools/ant/types/optional/image
                        ImageOperation.java TransformOperation.java
               src/main/org/apache/tools/ant/types/resources/comparators
                        Reverse.java
               src/main/org/apache/tools/ant/util
                        ConcatResourceInputStream.java
  Log:
  make JavaDoc more happier
  
  Revision  Changes    Path
  1.25      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  
  Index: CovReport.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CovReport.java	25 May 2005 14:23:31 -0000	1.24
  +++ CovReport.java	3 Jun 2005 16:46:55 -0000	1.25
  @@ -123,7 +123,7 @@
   
       /** Enumerated type for format attribute. */
       public static class ReportFormat extends EnumeratedAttribute {
  -        /** @see EnumeratedAttribute@getValues() */
  +        /** @see EnumeratedAttribute#getValues() */
           public String[] getValues() {
               return new String[]{"html", "text", "xml"};
           }
  @@ -139,7 +139,7 @@
   
       /** Enumerated type for type attribute. */
       public static class ReportType extends EnumeratedAttribute {
  -        /** @see EnumeratedAttribute@getValues() */
  +        /** @see EnumeratedAttribute#getValues() */
           public String[] getValues() {
               return new String[]{"executive", "summary", "detailed", "verydetailed"};
           }
  @@ -407,4 +407,4 @@
               }
           }
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.18      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
  
  Index: JDBCTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JDBCTask.java	11 Mar 2005 15:16:24 -0000	1.17
  +++ JDBCTask.java	3 Jun 2005 16:46:55 -0000	1.18
  @@ -393,7 +393,7 @@
   
   
       /**
  -     * Set the caching attribute. (!)
  +     * Set the caching attribute.
        * @param value a <code>boolean</code> value
        */
       public void isCaching(boolean value) {
  @@ -464,4 +464,4 @@
           return version;
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.23      +1 -2      ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
  
  Index: RecorderEntry.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- RecorderEntry.java	14 Mar 2005 10:26:56 -0000	1.22
  +++ RecorderEntry.java	3 Jun 2005 16:46:55 -0000	1.23
  @@ -239,7 +239,7 @@
   
   
       /**
  -     * @see BuildLogger#setEmacMode(boolean)
  +     * @see BuildLogger#setEmacsMode(boolean)
        */
       public void setEmacsMode(boolean emacsMode) {
           this.emacsMode = emacsMode;
  @@ -342,4 +342,3 @@
       }
   
   }
  -
  
  
  
  1.24      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
  
  Index: LogOutputStream.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- LogOutputStream.java	15 Feb 2005 15:58:06 -0000	1.23
  +++ LogOutputStream.java	3 Jun 2005 16:46:55 -0000	1.24
  @@ -49,7 +49,7 @@
       /**
        * Creates a new instance of this class.
        *
  -     * @param task the task for whom to log
  +     * @param pc the project component for whom to log
        * @param level loglevel used to log data written to this stream.
        * @since Ant 1.6.3
        */
  @@ -92,4 +92,4 @@
           return level;
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java
  
  Index: ResourceCount.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceCount.java	23 May 2005 19:51:56 -0000	1.1
  +++ ResourceCount.java	3 Jun 2005 16:46:55 -0000	1.2
  @@ -106,7 +106,7 @@
   
       /**
        * Set the comparison for use as a Condition.
  -     * @param w EnumeratedAttribute When.
  +     * @param c Comparison (an EnumeratedAttribute) When.
        * @see org.apache.tools.ant.types.Comparison
        */
       public void setWhen(Comparison c) {
  @@ -121,4 +121,4 @@
           property = p;
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.31      +1 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
  
  Index: WsdlToDotnet.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- WsdlToDotnet.java	28 Mar 2005 23:22:12 -0000	1.30
  +++ WsdlToDotnet.java	3 Jun 2005 16:46:55 -0000	1.31
  @@ -203,7 +203,7 @@
       }
   
       /**
  -     * Should errors be machine parseable?
  +     * Defines wether errors are machine parseable.
        * Optional, default=true
        *
        * @since Ant 1.7
  @@ -558,4 +558,3 @@
       }
   
   }
  -
  
  
  
  1.36      +1 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
  
  Index: NetCommand.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- NetCommand.java	14 Mar 2005 11:46:01 -0000	1.35
  +++ NetCommand.java	3 Jun 2005 16:46:55 -0000	1.36
  @@ -205,7 +205,7 @@
        *  add an argument to a command line; do nothing if the arg is null or
        *  empty string
        *
  -     *@param  argument  The feature to be added to the Argument attribute
  +     *@param  arguments  The features to be added to the Argument attribute
        */
       public void addArguments(String[] arguments) {
           if (arguments != null && arguments.length != 0) {
  @@ -397,4 +397,3 @@
           return filesOutOfDate;
       }
   }
  -
  
  
  
  1.80      +94 -95    ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- FTP.java	30 May 2005 17:56:33 -0000	1.79
  +++ FTP.java	3 Jun 2005 16:46:55 -0000	1.80
  @@ -89,11 +89,11 @@
       protected static final int SITE_CMD = 7;
       /** return code of ftp - not implemented in commons-net version 1.0 */
       private static final int CODE_521 = 521;
  -    
  +
       /** adjust uptodate calculations where server timestamps are HH:mm and client's
        * are HH:mm:ss */
       private static final long GRANULARITY_MINUTE = 60000L;
  -    
  +
       /** Default port for FTP */
       public static final int DEFAULT_FTP_PORT = 21;
   
  @@ -223,7 +223,7 @@
                   String cwd = ftp.printWorkingDirectory();
                   // always start from the current ftp working dir
                   forceRemoteSensitivityCheck();
  -                
  +
                   checkIncludePatterns();
                   clearCaches();
                   ftp.changeWorkingDirectory(cwd);
  @@ -539,7 +539,7 @@
               }
               return result;
           }
  -        
  +
           private void forceRemoteSensitivityCheck()
           {
               if (!remoteSensitivityChecked) {
  @@ -897,7 +897,7 @@
                   }
                   return traversesSymlinks;
               }
  -            
  +
               public String toString() {
                   return "AntFtpFile: "+curpwd+"%"+ftpFile;
               }
  @@ -1278,8 +1278,8 @@
       /**
        * Sets the systemTypeKey attribute.
        * Method for setting <code>FTPClientConfig</code> remote system key.
  -     * 
  -     * @param systemTypeKey the key to be set - BUT if blank 
  +     *
  +     * @param systemKey the key to be set - BUT if blank
        * the default value of null (which signifies "autodetect") will be kept.
        * @see org.apache.commons.net.ftp.FTPClientConfig
        */
  @@ -1293,7 +1293,7 @@
   
       /**
        * Sets the defaultDateFormatConfig attribute.
  -     * @param defaultDateFormatConfig configuration to be set, unless it is
  +     * @param defaultDateFormat configuration to be set, unless it is
        * null or empty string, in which case ignored.
        * @see org.apache.commons.net.ftp.FTPClientConfig
        */
  @@ -1307,7 +1307,7 @@
   
       /**
        * Sets the recentDateFormatConfig attribute.
  -     * @param recentDateFormatConfig configuration to be set, unless it is
  +     * @param recentDateFormat configuration to be set, unless it is
        * null or empty string, in which case ignored.
        * @see org.apache.commons.net.ftp.FTPClientConfig
        */
  @@ -1321,7 +1321,7 @@
   
       /**
        * Sets the serverLanguageCode attribute.
  -     * @param serverLanguageCodeConfig configuration to be set, unless it is
  +     * @param serverLanguageCode configuration to be set, unless it is
        * null or empty string, in which case ignored.
        * @see org.apache.commons.net.ftp.FTPClientConfig
        */
  @@ -1335,7 +1335,7 @@
   
       /**
        * Sets the serverTimeZoneConfig attribute.
  -     * @param serverTimeZoneConfig configuration to be set, unless it is
  +     * @param serverTimeZoneId configuration to be set, unless it is
        * null or empty string, in which case ignored.
        * @see org.apache.commons.net.ftp.FTPClientConfig
        */
  @@ -1349,8 +1349,8 @@
   
       /**
        * Sets the shortMonthNamesConfig attribute
  -     * 
  -     * @param shortMonthNamesConfig configuration to be set, unless it is
  +     *
  +     * @param shortMonthNames configuration to be set, unless it is
        * null or empty string, in which case ignored.
        * @see org.apache.commons.net.ftp.FTPClientConfig
        */
  @@ -1365,11 +1365,11 @@
   
   
       /**
  -     * How many times to retry executing FTP command before giving up?
  +     * Defines how many times to retry executing FTP command before giving up.
        * Default is 0 - try once and if failure then give up.
  -     * 
  +     *
        * @param retriesAllowed number of retries to allow.  -1 means
  -     * keep trying forever. "forever" may also be specified as a 
  +     * keep trying forever. "forever" may also be specified as a
        * synonym for -1.
        */
       public void setRetriesAllowed(String retriesAllowed) {
  @@ -1380,18 +1380,18 @@
                   int retries = Integer.parseInt(retriesAllowed);
                   if (retries < Retryable.RETRY_FOREVER) {
                       throw new BuildException(
  -                            "Invalid value for retriesAllowed attribute: " 
  +                            "Invalid value for retriesAllowed attribute: "
                               + retriesAllowed);
   
                   }
                   this.retriesAllowed = retries;
               } catch (NumberFormatException px) {
                   throw new BuildException(
  -                        "Invalid value for retriesAllowed attribute: " 
  +                        "Invalid value for retriesAllowed attribute: "
                           + retriesAllowed);
  -             
  +
               }
  -            
  +
           }
       }
       /**
  @@ -1458,8 +1458,8 @@
       /**
        * Sets the initialSiteCommand attribute.  This attribute
        * names a site command that will be executed immediately
  -     * after connection. 
  -     * @param initialSiteCommand The initialSiteCommand to set.
  +     * after connection.
  +     * @param initialCommand The initialSiteCommand to set.
        */
       public void setInitialSiteCommand(String initialCommand) {
           this.initialSiteCommand = initialCommand;
  @@ -1499,7 +1499,7 @@
                    + "action!");
           }
   
  -        
  +
           if (this.isConfigurationSet) {
               try {
                   Class.forName("org.apache.commons.net.ftp.FTPClientConfig");
  @@ -1509,8 +1509,8 @@
               }
           }
       }
  -    
  -    protected void executeRetryable(RetryHandler h, Retryable r, String descr) 
  +
  +    protected void executeRetryable(RetryHandler h, Retryable r, String descr)
       throws IOException
       {
           h.execute(r, descr);
  @@ -1592,7 +1592,7 @@
                   final BufferedWriter fbw = bw;
                   final String fdir = dir;
                   if (this.newerOnly) {
  -                    this.granularityMillis = 
  +                    this.granularityMillis =
                           this.timestampGranularity.getMilliseconds(action);
                   }
                   for (int i = 0; i < dsfiles.length; i++) {
  @@ -1819,10 +1819,10 @@
           }
           return null;
       }
  -    
  -    private static final SimpleDateFormat TIMESTAMP_LOGGING_SDF = 
  +
  +    private static final SimpleDateFormat TIMESTAMP_LOGGING_SDF =
           new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  -    
  +
       /**
        * Checks to see if the remote file is current as compared with the local
        * file. Returns true if the target file is up to date.
  @@ -1859,26 +1859,26 @@
   
           long remoteTimestamp = files[0].getTimestamp().getTime().getTime();
           long localTimestamp = localFile.lastModified();
  -        long adjustedRemoteTimestamp = 
  -            remoteTimestamp + this.timeDiffMillis + this.granularityMillis; 
  -        
  +        long adjustedRemoteTimestamp =
  +            remoteTimestamp + this.timeDiffMillis + this.granularityMillis;
  +
           StringBuffer msg = new StringBuffer("   [")
  -        	.append(TIMESTAMP_LOGGING_SDF.format(new Date(localTimestamp)))
  -        	.append("] local");
  +                .append(TIMESTAMP_LOGGING_SDF.format(new Date(localTimestamp)))
  +                .append("] local");
           log(msg.toString(), Project.MSG_VERBOSE);
  -        
  +
           msg = new StringBuffer("   [")
  -          	.append(TIMESTAMP_LOGGING_SDF.format(new Date(adjustedRemoteTimestamp)))
  -        	.append("] remote");
  +                  .append(TIMESTAMP_LOGGING_SDF.format(new Date(adjustedRemoteTimestamp)))
  +                .append("] remote");
           if (remoteTimestamp != adjustedRemoteTimestamp) {
               msg.append(" - (raw: ")
  -        	.append(TIMESTAMP_LOGGING_SDF.format(new Date(remoteTimestamp)))
  +                .append(TIMESTAMP_LOGGING_SDF.format(new Date(remoteTimestamp)))
               .append(")");
           }
           log(msg.toString(), Project.MSG_VERBOSE);
  -        
   
  -        
  +
  +
           if (this.action == SEND_FILES) {
               return adjustedRemoteTimestamp >= localTimestamp;
           } else {
  @@ -2281,7 +2281,7 @@
                            + "mode: " + ftp.getReplyString());
                   }
               }
  -            
  +
               // If an initial command was configured then send it.
               // Some FTP servers offer different modes of operation,
               // E.G. switching between a UNIX file system mode and
  @@ -2415,26 +2415,26 @@
           }
       }
       /**
  -     * represents one of the valid timestamp adjustment values 
  +     * represents one of the valid timestamp adjustment values
        * recognized by the <code>timestampGranularity</code> attribute.<p>
   
  -     * A timestamp adjustment may be used in file transfers for checking 
  -     * uptodateness. MINUTE means to add one minute to the server 
  -     * timestamp.  This is done because FTP servers typically list 
  +     * A timestamp adjustment may be used in file transfers for checking
  +     * uptodateness. MINUTE means to add one minute to the server
  +     * timestamp.  This is done because FTP servers typically list
        * timestamps HH:mm and client FileSystems typically use HH:mm:ss.
  -     * 
  -     * The default is to use MINUTE for PUT actions and NONE for GET 
  +     *
  +     * The default is to use MINUTE for PUT actions and NONE for GET
        * actions, since GETs have the <code>preserveLastModified</code>
        * option, which takes care of the problem in most use cases where
        * this level of granularity is an issue.
  -     * 
  +     *
        */
       public static class Granularity extends EnumeratedAttribute {
   
           private static final String[] VALID_GRANULARITIES = {
                   "", "MINUTE", "NONE"
           };
  -         /* 
  +         /*
            * @return the list of valid Granularity values
            */
           public String[] getValues() {
  @@ -2442,11 +2442,11 @@
               return VALID_GRANULARITIES;
           }
           /**
  -         * returns the number of milliseconds associated with 
  +         * returns the number of milliseconds associated with
            * the attribute, which can vary in some cases depending
            * on the value of the action parameter.
            * @param action SEND_FILES or GET_FILES
  -         * @return the number of milliseconds associated with 
  +         * @return the number of milliseconds associated with
            * the attribute, in the context of the supplied action
            */
           public long getMilliseconds(int action) {
  @@ -2454,51 +2454,51 @@
               long granularity = 0L;
               if ("".equals(granularityU)) {
                   if (action == SEND_FILES) {
  -                    return GRANULARITY_MINUTE;                   
  +                    return GRANULARITY_MINUTE;
                   }
               } else if ("MINUTE".equals(granularityU)) {
                   return GRANULARITY_MINUTE;
  -        	}  
  -        	return 0L;
  +                }
  +                return 0L;
           }
           static final Granularity getDefault() {
               Granularity g = new Granularity();
               g.setValue("");
               return g;
           }
  -        
  +
      }
      /**
  -	 * one of the valid system type keys recognized by the systemTypeKey
  -	 * attribute.
  -	 */
  +         * one of the valid system type keys recognized by the systemTypeKey
  +         * attribute.
  +         */
       public static class FTPSystemType extends EnumeratedAttribute {
   
          private static final String[] VALID_SYSTEM_TYPES = {
  -	           "", "UNIX", "VMS", "WINDOWS", "OS/2", "OS/400",
  -	           "MVS"
  -	   };
  -       
  -       
  -	    /* 
  -	     * @return the list of valid system types.
  -	     */
  -	    public String[] getValues() {
  -	        return VALID_SYSTEM_TYPES;
  -	    }
  -	    
  -	    static final FTPSystemType getDefault() {
  -	        FTPSystemType ftpst = new FTPSystemType();
  -	        ftpst.setValue("");
  -	        return ftpst;
  -	    }
  +                   "", "UNIX", "VMS", "WINDOWS", "OS/2", "OS/400",
  +                   "MVS"
  +           };
  +
  +
  +            /*
  +             * @return the list of valid system types.
  +             */
  +            public String[] getValues() {
  +                return VALID_SYSTEM_TYPES;
  +            }
  +
  +            static final FTPSystemType getDefault() {
  +                FTPSystemType ftpst = new FTPSystemType();
  +                ftpst.setValue("");
  +                return ftpst;
  +            }
       }
       public static class LanguageCode extends EnumeratedAttribute {
   
  -        
  -        private static final String[] VALID_LANGUAGE_CODES = 
  +
  +        private static final String[] VALID_LANGUAGE_CODES =
               getValidLanguageCodes();
  - 	   
  +
           private static final String[] getValidLanguageCodes() {
               Collection c = FTPClientConfig.getSupportedLanguageCodes();
               String[] ret = new String[c.size() + 1];
  @@ -2507,23 +2507,22 @@
               for (Iterator it = c.iterator(); it.hasNext(); i++) {
                   ret[i] = (String) it.next();
               }
  -            return ret; 
  +            return ret;
           }
  -        
  -        
  - 	    /* 
  - 	     * @return the list of valid system types.
  - 	     */
  - 	    public String[] getValues() {
  - 	        return VALID_LANGUAGE_CODES;
  - 	    }
  - 	    
  - 	    static final LanguageCode getDefault() {
  - 	        LanguageCode lc = new LanguageCode();
  - 	        lc.setValue("");
  - 	        return lc;
  - 	    }
  -     }
   
  -}
   
  +             /*
  +              * @return the list of valid system types.
  +              */
  +             public String[] getValues() {
  +                 return VALID_LANGUAGE_CODES;
  +             }
  +
  +             static final LanguageCode getDefault() {
  +                 LanguageCode lc = new LanguageCode();
  +                 lc.setValue("");
  +                 return lc;
  +             }
  +     }
  +
  +}
  \ No newline at end of file
  
  
  
  1.2       +3 -3      ant/src/main/org/apache/tools/ant/types/resources/Touchable.java
  
  Index: Touchable.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resources/Touchable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Touchable.java	23 May 2005 19:51:57 -0000	1.1
  +++ Touchable.java	3 Jun 2005 16:46:55 -0000	1.2
  @@ -17,10 +17,10 @@
   package org.apache.tools.ant.types.resources;
   
   /**
  - * Interface to be implemented by "touchable" resources; i.e. those
  - * whose modification time can be altered.
  + * Interface to be implemented by "touchable" resources;
  + * for example those whose modification time can be altered.
    * @since Ant 1.7
    */
   public interface Touchable {
       void touch(long modTime);
  -}
  +}
  \ No newline at end of file
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java
  
  Index: FileResourceIterator.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileResourceIterator.java	23 May 2005 19:51:57 -0000	1.1
  +++ FileResourceIterator.java	3 Jun 2005 16:46:55 -0000	1.2
  @@ -50,7 +50,7 @@
        * Construct a new FileResourceIterator over the specified filenames,
        * relative to the specified base directory.
        * @param f the base directory of this instance.
  -     * @param files the String[] of filenames.
  +     * @param s the String[] of filenames.
        */
       public FileResourceIterator(File f, String[] s) {
           this(f);
  @@ -105,4 +105,4 @@
           return new FileResource(basedir, files[pos++]);
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/resources/Restrict.java
  
  Index: Restrict.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resources/Restrict.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Restrict.java	23 May 2005 19:51:57 -0000	1.1
  +++ Restrict.java	3 Jun 2005 16:46:55 -0000	1.2
  @@ -56,7 +56,7 @@
   
       /**
        * Add a ResourceSelector.
  -     * @param the ResourceSelector to add.
  +     * @param s the ResourceSelector to add.
        */
       public synchronized void add(ResourceSelector s) {
           super.add(s);
  @@ -134,4 +134,4 @@
           return result;
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.51      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  
  Index: XMLValidateTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- XMLValidateTask.java	20 May 2005 21:46:55 -0000	1.50
  +++ XMLValidateTask.java	3 Jun 2005 16:46:55 -0000	1.51
  @@ -318,7 +318,7 @@
   
       /**
        * handler called on successful file validation.
  -     * @param fileProcessed number of files processed. 
  +     * @param fileProcessed number of files processed.
        */
       protected void onSuccessfulValidation(int fileProcessed) {
           log(fileProcessed + MESSAGE_FILES_VALIDATED);
  @@ -370,7 +370,7 @@
        * falling back to a default reader if not.
        * If the returned reader is an instance of {@link ParserAdapter} then
        * we have created and wrapped a SAX1 parser.
  -     * @returns the new XMLReader.
  +     * @return the new XMLReader.
        */
       protected XMLReader createXmlReader() {
           Object reader = null;
  @@ -729,4 +729,4 @@
   
   
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.20      +1 -4      ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
  
  Index: SSHExec.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SSHExec.java	14 Mar 2005 09:02:48 -0000	1.19
  +++ SSHExec.java	3 Jun 2005 16:46:55 -0000	1.20
  @@ -33,9 +33,7 @@
   
   /**
    * Executes a command on a remote machine via ssh.
  - *
  - * @created   February 2, 2003
  - * @since     Ant 1.6
  + * @since     Ant 1.6 (created February 2, 2003)
    */
   public class SSHExec extends SSHBase {
   
  @@ -261,4 +259,3 @@
       }
   
   }
  -
  
  
  
  1.6       +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/repository/HttpRepository.java
  
  Index: HttpRepository.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/repository/HttpRepository.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HttpRepository.java	13 Dec 2004 08:59:42 -0000	1.5
  +++ HttpRepository.java	3 Jun 2005 16:46:55 -0000	1.6
  @@ -33,7 +33,7 @@
    *
    * Although it is biased towards HTTP, because the underlying &lt;get&gt; task
    * supports different protocols, one is actually able to use other protocols
  - * such as ftp: or file: to retrieve content. 
  + * such as ftp: or file: to retrieve content.
    *
    * @since Ant1.7
    */
  @@ -189,7 +189,7 @@
   
       /**
        * Test for a repository being reachable. This method is called after {@link
  -     * #connect(org.apache.tools.ant.taskdefs.repository.GetLibraries)}
  +     * #connect(org.apache.tools.ant.taskdefs.repository.Libraries)}
        * is called, before any files are to be retrieved.
        * <p/>
        * If it returns false the repository considers itself offline. Similarly,
  @@ -302,4 +302,4 @@
       public String getRepositoryURI() {
           return "HttpRepository://" + getUrl();
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.5       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/repository/Repository.java
  
  Index: Repository.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/repository/Repository.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Repository.java	21 Jan 2005 07:12:52 -0000	1.4
  +++ Repository.java	3 Jun 2005 16:46:55 -0000	1.5
  @@ -85,7 +85,7 @@
   
       /**
        * Test for a repository being reachable. This method is called after {@link
  -     * #connect(GetLibraries)} is called, before any files are to be retrieved.
  +     * #connect(Libraries)} is called, before any files are to be retrieved.
        * <p/>
        * If it returns false the repository considers itself offline. Similarly,
        * any ioexception is interpreted as being offline.
  @@ -113,4 +113,4 @@
        * @return
        */
       public abstract String getRepositoryURI();
  -}
  +}
  \ No newline at end of file
  
  
  
  1.3       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/repository/RepositoryRef.java
  
  Index: RepositoryRef.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/repository/RepositoryRef.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RepositoryRef.java	22 Nov 2004 09:23:35 -0000	1.2
  +++ RepositoryRef.java	3 Jun 2005 16:46:55 -0000	1.3
  @@ -52,7 +52,7 @@
   
       /**
        * Test for a repository being reachable. This method is called after {@link
  -     * #connect(GetLibraries)} is called, before any files are to be retrieved.
  +     * #connect(Libraries)} is called, before any files are to be retrieved.
        * <p/>
        * If it returns false the repository considers itself offline. Similarly,
        * any ioexception is interpreted as being offline.
  @@ -86,4 +86,4 @@
       public String getRepositoryURI() {
           return "ref://" + getRefid();
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.27      +4 -4      ant/src/main/org/apache/tools/ant/types/DataType.java
  
  Index: DataType.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/DataType.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- DataType.java	23 May 2005 19:28:09 -0000	1.26
  +++ DataType.java	3 Jun 2005 16:46:55 -0000	1.27
  @@ -188,8 +188,8 @@
        * Allow DataTypes outside org.apache.tools.ant.types to indirectly call
        * dieOnCircularReference on nested DataTypes.
        * @param dt the DataType to check.
  -     * @param stack the stack of references to check.
  -     * @param project the project to use to dereference the references.
  +     * @param stk the stack of references to check.
  +     * @param p the project to use to dereference the references.
        * @throws BuildException on error.
        * @since Ant 1.7
        */
  @@ -212,7 +212,7 @@
       /**
        * Performs the check for circular references and returns the
        * referenced object.
  -     * @param project the Ant Project instance against which to resolve references.
  +     * @param p the Ant Project instance against which to resolve references.
        * @return the dereferenced object.
        * @throws BuildException if the reference is invalid (circular ref, wrong class, etc).
        * @since Ant 1.7
  @@ -338,4 +338,4 @@
               throw noChildrenAllowed();
           }
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.10      +2 -2      ant/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java
  
  Index: ImageOperation.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ImageOperation.java	9 Mar 2004 16:48:43 -0000	1.9
  +++ ImageOperation.java	3 Jun 2005 16:46:55 -0000	1.10
  @@ -21,7 +21,7 @@
   
   /**
    *
  - * @see org.apache.tools.ant.tasks.optional.image.Image
  + * @see org.apache.tools.ant.taskdefs.optional.image.Image
    */
   public abstract class ImageOperation extends DataType {
       protected Vector instructions = new Vector();
  @@ -45,4 +45,4 @@
       public void addScale(Scale instr) {
           instructions.add(instr);
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.9       +2 -2      ant/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java
  
  Index: TransformOperation.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TransformOperation.java	9 Mar 2004 16:48:43 -0000	1.8
  +++ TransformOperation.java	3 Jun 2005 16:46:55 -0000	1.9
  @@ -19,7 +19,7 @@
   
   /**
    *
  - * @see org.apache.tools.ant.tasks.optional.image.Image
  + * @see org.apache.tools.ant.taskdefs.optional.image.Image
    */
   public abstract class TransformOperation extends ImageOperation {
       public abstract PlanarImage executeTransformOperation(PlanarImage img);
  @@ -28,4 +28,4 @@
           instructions.add(instr);
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java
  
  Index: Reverse.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Reverse.java	23 May 2005 19:51:57 -0000	1.1
  +++ Reverse.java	3 Jun 2005 16:46:55 -0000	1.2
  @@ -32,7 +32,7 @@
   
       /**
        * Add the ResourceComparator to reverse.
  -     * @param nested the ResourceComparator to add.
  +     * @param c the ResourceComparator to add.
        */
       public void add(ResourceComparator c) {
           if (nested != null) {
  @@ -53,4 +53,4 @@
               ? foo.compareTo(bar) : nested.compare(foo, bar));
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
  
  Index: ConcatResourceInputStream.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConcatResourceInputStream.java	23 May 2005 19:51:58 -0000	1.1
  +++ ConcatResourceInputStream.java	3 Jun 2005 16:46:55 -0000	1.2
  @@ -88,7 +88,7 @@
       /**
        * Set a managing <code>ProjectComponent</code> for
        * this <code>ConcatResourceInputStream</code>.
  -     * @param task   the managing <code>Task</code>.
  +     * @param pc   the managing <code>ProjectComponent</code>.
        */
       public void setManagingComponent(ProjectComponent pc) {
           this.managingPc = pc;
  @@ -140,4 +140,4 @@
           FileUtils.close(currentStream);
           currentStream = null;
       }
  -}
  +}
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message