ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/types/selectors BaseSelectorTest.java ModifiedSelectorTest.java
Date Fri, 24 Oct 2003 06:31:44 GMT
antoine     2003/10/23 23:31:44

  Modified:    src/main/org/apache/tools/ant/filters ConcatFilter.java
               src/main/org/apache/tools/ant/types/selectors/modifiedselector
                        Algorithm.java Cache.java DigestAlgorithm.java
                        EqualComparator.java HashvalueAlgorithm.java
                        ModifiedSelector.java PropertiesfileCache.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        IContract.java
               src/testcases/org/apache/tools/ant/filters
                        ConcatFilterTest.java
               src/testcases/org/apache/tools/ant/types/selectors
                        BaseSelectorTest.java ModifiedSelectorTest.java
  Log:
  Replace non ASCII characters by UNICODE escapes
  PR: 23919
  Submitted by: Martijn Kruithof (ant at kruithof dot xs4all dot nl)
  
  Revision  Changes    Path
  1.4       +3 -3      ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java
  
  Index: ConcatFilter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/ConcatFilter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConcatFilter.java	23 Sep 2003 21:21:01 -0000	1.3
  +++ ConcatFilter.java	24 Oct 2003 06:31:43 -0000	1.4
  @@ -77,7 +77,7 @@
    *
    * @since 1.6
    * @version 2003-09-23
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    */
   public final class ConcatFilter extends BaseParamFilterReader
       implements ChainableReader {
  @@ -148,7 +148,7 @@
               ch = super.read();
           }
           if (ch == -1) {
  -            // don´t call super.close() because that reader is used
  +            // don't call super.close() because that reader is used
               // on other places ...
               if (appendReader != null) {
                   ch = appendReader.read();
  @@ -249,4 +249,4 @@
               appendReader = new BufferedReader(new FileReader(append));
           }
      }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java
  
  Index: Algorithm.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Algorithm.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ Algorithm.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -64,7 +64,7 @@
    * same value.
    * The implementing class should implement a useful toString() method.
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
  @@ -82,4 +82,4 @@
        * @return        The value for that file
        */
       String getValue(File file);
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java
  
  Index: Cache.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Cache.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ Cache.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -66,7 +66,7 @@
    * <i>order</i>.
    * The implementing class should implement a useful toString() method.
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
  @@ -106,4 +106,4 @@
        * @return An iterator over the keys.
        */
       Iterator iterator();
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +5 -5      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
  
  Index: DigestAlgorithm.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DigestAlgorithm.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ DigestAlgorithm.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -68,7 +68,7 @@
   /**
    * Computes a 'hashvalue' for the content of file using
    * java.security.MessageDigest.
  - * Use of this algorithm doesn´t require any additional nested <param>s.
  + * Use of this algorithm doesn't require any additional nested <param>s.
    * Supported <param>s are:
    * <table>
    * <tr>
  @@ -88,7 +88,7 @@
    * </tr>
    * </table>
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
  @@ -170,8 +170,8 @@
   
   
       /**
  -     * This algorithm doesn´t need any configuration.
  -     * Therefore it´s always valid.
  +     * This algorithm doesn't need any configuration.
  +     * Therefore it's always valid.
        * @return <i>true</i> if all is ok, otherwise <i>false</i>.
        */
       public boolean isValid() {
  @@ -238,4 +238,4 @@
           buf.append(">");
           return buf.toString();
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java
  
  Index: EqualComparator.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EqualComparator.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ EqualComparator.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -63,7 +63,7 @@
    * compare() returns '0' (should not be selected) if both parameter
    * are equal otherwise '1' (should be selected).
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
  @@ -94,4 +94,4 @@
       public String toString() {
           return "EqualComparator";
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +7 -7      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
  
  Index: HashvalueAlgorithm.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HashvalueAlgorithm.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ HashvalueAlgorithm.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -60,18 +60,18 @@
   
   /**
    * Computes a 'hashvalue' for the content of file using String.hashValue().
  - * Use of this algorithm doesn´t require any additional nested <param>s and
  - * doesn´t support any.
  + * Use of this algorithm doesn't require any additional nested <param>s and
  + * doesn't support any.
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
   public class HashvalueAlgorithm implements Algorithm {
   
       /**
  -     * This algorithm doesn´t need any configuration.
  -     * Therefore it´s always valid.
  +     * This algorithm doesn't need any configuration.
  +     * Therefore it's always valid.
        * @return always true
        */
       public boolean isValid() {
  @@ -83,7 +83,7 @@
        * It reads the content of a file, convert that to String and use the
        * String.hashCode() method.
        * @param file  The file for which the value should be computed
  -     * @return the hashvalue or <i>null</i> if the file couldn´t be read
  +     * @return the hashvalue or <i>null</i> if the file couldn't be read
        */
        // Because the content is only read the file will not be damaged. I tested
        // with JPG, ZIP and PDF as binary files.
  @@ -113,4 +113,4 @@
           return "HashvalueAlgorithm";
       }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +4 -4      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
  
  Index: ModifiedSelector.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ModifiedSelector.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ ModifiedSelector.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -146,7 +146,7 @@
    * </pre> Here all <b>changed</b> files are uploaded to the server. The
    * ModifiedSelector saves therefore much upload time.</p>
    *
  - * <p>This selector supports the following nested param´s:
  + * <p>This selector supports the following nested param's:
    * <table>
    * <tr><th>name</th><th>values</th><th>description</th><th>required</th></tr>
    * <tr>
  @@ -219,7 +219,7 @@
    * a nested <i><param name="algorithm.provider" value="MyProvider"/></i>.
    *
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
   */
  @@ -313,7 +313,7 @@
        * <li> set values for name pattern '*': update, cache, algorithm, comparator
</li>
        * <li> set values for name pattern '*.*: cache.cachefile, ... </li>
        * </ol></p>
  -     * <p>This configuration algorithm is needed because you don´t know
  +     * <p>This configuration algorithm is needed because you don't know
        * the order of arriving config-data. E.g. if you first set the
        * <i>cache.cachefilename</i> and after that the <i>cache</i>
itself,
        * the default value for cachefilename is used, because setting the
  @@ -650,4 +650,4 @@
           }
       }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +2 -2      ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
  
  Index: PropertiesfileCache.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropertiesfileCache.java	13 Sep 2003 16:35:52 -0000	1.1
  +++ PropertiesfileCache.java	24 Oct 2003 06:31:43 -0000	1.2
  @@ -88,7 +88,7 @@
    * </tr>
    * </table>
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
  @@ -252,4 +252,4 @@
           buf.append(">");
           return buf.toString();
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.20      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  
  Index: IContract.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- IContract.java	17 Sep 2003 20:11:43 -0000	1.19
  +++ IContract.java	24 Oct 2003 06:31:43 -0000	1.20
  @@ -87,7 +87,7 @@
    * <p/>
    * Thanks to Rainer Schmitz for enhancements and comments.
    *
  - * @author <a href="mailto:aslak.hellesoy@bekk.no">Aslak Helles�a>
  + * @author <a href="mailto:aslak.hellesoy@bekk.no">Aslak Helles\u00f8y</a>
    *
    * <p/>
    * <table border="1" cellpadding="2" cellspacing="0">
  
  
  
  1.6       +2 -2      ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
  
  Index: ConcatFilterTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConcatFilterTest.java	25 Sep 2003 06:18:46 -0000	1.5
  +++ ConcatFilterTest.java	24 Oct 2003 06:31:44 -0000	1.6
  @@ -62,7 +62,7 @@
   
   /**
    * JUnit Testcases for ConcatReader
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    */
   public class ConcatFilterTest extends BuildFileTest {
   
  @@ -187,4 +187,4 @@
           return content;
       }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.7       +3 -3      ant/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
  
  Index: BaseSelectorTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseSelectorTest.java	13 Sep 2003 16:35:52 -0000	1.6
  +++ BaseSelectorTest.java	24 Oct 2003 06:31:44 -0000	1.7
  @@ -185,7 +185,7 @@
   
       /**
        * Does the selection test for a given selector and prints the
  -     * filenames of the differing files (selected but shouldn´t,
  +     * filenames of the differing files (selected but shouldn't,
        * not selected but should).
        * @param selector  The selector to test
        * @param expected  The expected result
  @@ -198,7 +198,7 @@
       }
   
       /**
  -     *  Checks which files are selected and shouldn´t be or which
  +     *  Checks which files are selected and shouldn't be or which
        *  are not selected but should.
        *  @param expected    String containing 'F's and 'T's
        *  @param result      String containing 'F's and 'T's
  @@ -324,4 +324,4 @@
   
   
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +5 -5      ant/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
  
  Index: ModifiedSelectorTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ModifiedSelectorTest.java	17 Sep 2003 08:50:22 -0000	1.2
  +++ ModifiedSelectorTest.java	24 Oct 2003 06:31:44 -0000	1.3
  @@ -73,7 +73,7 @@
   /**
    * Unit tests for ModifiedSelector.
    *
  - * @author Jan Matèrne
  + * @author Jan Mat\u00e8rne
    * @version 2003-09-13
    * @since  Ant 1.6
    */
  @@ -261,7 +261,7 @@
               for (int i=0; i<filenames.length; i++) {
                   String ch = "F";
                   if (files[i].isDirectory()) ch = "T";
  -                // f2name shouldn´t be selected: only timestamp has changed!
  +                // f2name shouldn't be selected: only timestamp has changed!
                   if (filenames[i].equalsIgnoreCase(f3name)) ch = "T";
                   if (filenames[i].equalsIgnoreCase(f4name)) ch = "T";
                   expected.append(ch);
  @@ -304,7 +304,7 @@
               s.setClassname("org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector");
   
               s.addParam(createParam("cache.cachefile", cachefile));
  -            //s.addParam(createParam("algorithm.provider","---")); // i don´t know any
valid
  +            //s.addParam(createParam("algorithm.provider","---")); // i don't know any
valid
               s.addParam(createParam("cache","propertyfile"));
               s.addParam(createParam("update","true"));
               s.addParam(createParam("comparator","rule"));
  @@ -404,7 +404,7 @@
        *       <param name="cache" value="propertyfiles" />
        *   </custom>
        * </pre> It was important first to set the cache and then to set
  -     * the cache´s configuration parameters. That results in the reorganized
  +     * the cache's configuration parameters. That results in the reorganized
        * configure() method of ModifiedSelector. This testcase tests that.
        */
       public void testCreatePropertiesCacheViaCustomSelector() {
  @@ -535,7 +535,7 @@
               assertTrue("Not enough files copied on first time.", to1.list().length>5);
               assertTrue("Too much files copied on second time.", to2.list().length==0);
               assertTrue("Too much files copied on third time.", to3.list().length==2);
  -        // don´t catch the JUnit exceptions
  +        // don't catch the JUnit exceptions
           } finally {
               bft.doTarget("modifiedselectortest-scenario-clean");
               bft.deletePropertiesfile();
  
  
  

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


Mime
View raw message