Browse Source

Replace non ASCII characters by UNICODE escapes

PR: 23919
Submitted by: Martijn Kruithof (ant at kruithof dot xs4all dot nl)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275557 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 21 years ago
parent
commit
9734889750
12 changed files with 38 additions and 38 deletions
  1. +3
    -3
      src/main/org/apache/tools/ant/filters/ConcatFilter.java
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  3. +2
    -2
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java
  4. +2
    -2
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java
  5. +5
    -5
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
  6. +2
    -2
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java
  7. +7
    -7
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
  8. +4
    -4
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
  9. +2
    -2
      src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
  10. +2
    -2
      src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
  11. +3
    -3
      src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
  12. +5
    -5
      src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java

+ 3
- 3
src/main/org/apache/tools/ant/filters/ConcatFilter.java View File

@@ -77,7 +77,7 @@ import org.apache.tools.ant.types.Parameter;
*
* @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 @@ public final class ConcatFilter extends BaseParamFilterReader
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 @@ public final class ConcatFilter extends BaseParamFilterReader
appendReader = new BufferedReader(new FileReader(append));
}
}
}
}

+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/optional/IContract.java View File

@@ -87,7 +87,7 @@ import org.apache.tools.ant.types.Reference;
* <p/>
* Thanks to Rainer Schmitz for enhancements and comments.
*
* @author <a href="mailto:aslak.hellesoy@bekk.no">Aslak Hellesa>
* @author <a href="mailto:aslak.hellesoy@bekk.no">Aslak Helles\u00f8y</a>
*
* <p/>
* <table border="1" cellpadding="2" cellspacing="0">


+ 2
- 2
src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java View File

@@ -64,7 +64,7 @@ import java.io.File;
* 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 @@ public interface Algorithm {
* @return The value for that file
*/
String getValue(File file);
}
}

+ 2
- 2
src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java View File

@@ -66,7 +66,7 @@ import java.util.Iterator;
* <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 @@ public interface Cache {
* @return An iterator over the keys.
*/
Iterator iterator();
}
}

+ 5
- 5
src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java View File

@@ -68,7 +68,7 @@ import org.apache.tools.ant.BuildException;
/**
* 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 @@ import org.apache.tools.ant.BuildException;
* </tr>
* </table>
*
* @author Jan Matèrne
* @author Jan Mat\u00e8rne
* @version 2003-09-13
* @since Ant 1.6
*/
@@ -170,8 +170,8 @@ public class DigestAlgorithm 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 <i>true</i> if all is ok, otherwise <i>false</i>.
*/
public boolean isValid() {
@@ -238,4 +238,4 @@ public class DigestAlgorithm implements Algorithm {
buf.append(">");
return buf.toString();
}
}
}

+ 2
- 2
src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java View File

@@ -63,7 +63,7 @@ import java.util.Comparator;
* 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 class EqualComparator implements Comparator {
public String toString() {
return "EqualComparator";
}
}
}

+ 7
- 7
src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java View File

@@ -60,18 +60,18 @@ import java.io.File;

/**
* 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 @@ public class HashvalueAlgorithm implements Algorithm {
* 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 @@ public class HashvalueAlgorithm implements Algorithm {
return "HashvalueAlgorithm";
}

}
}

+ 4
- 4
src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java View File

@@ -146,7 +146,7 @@ import org.apache.tools.ant.types.selectors.BaseExtendSelector;
* </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 @@ import org.apache.tools.ant.types.selectors.BaseExtendSelector;
* 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 @@ public class ModifiedSelector extends BaseExtendSelector {
* <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 @@ public class ModifiedSelector extends BaseExtendSelector {
}
}

}
}

+ 2
- 2
src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java View File

@@ -88,7 +88,7 @@ import java.io.FileOutputStream;
* </tr>
* </table>
*
* @author Jan Matèrne
* @author Jan Mat\u00e8rne
* @version 2003-09-13
* @since Ant 1.6
*/
@@ -252,4 +252,4 @@ public class PropertiesfileCache implements Cache {
buf.append(">");
return buf.toString();
}
}
}

+ 2
- 2
src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java View File

@@ -62,7 +62,7 @@ import org.apache.tools.ant.util.FileUtils;

/**
* JUnit Testcases for ConcatReader
* @author Jan Matèrne
* @author Jan Mat\u00e8rne
*/
public class ConcatFilterTest extends BuildFileTest {

@@ -187,4 +187,4 @@ public class ConcatFilterTest extends BuildFileTest {
return content;
}

}
}

+ 3
- 3
src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java View File

@@ -185,7 +185,7 @@ public abstract class BaseSelectorTest extends TestCase {

/**
* 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 @@ public abstract class BaseSelectorTest extends TestCase {
}

/**
* 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 @@ public abstract class BaseSelectorTest extends TestCase {



}
}

+ 5
- 5
src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java View File

@@ -73,7 +73,7 @@ import org.apache.tools.ant.types.selectors.modifiedselector.*;
/**
* Unit tests for ModifiedSelector.
*
* @author Jan Matèrne
* @author Jan Mat\u00e8rne
* @version 2003-09-13
* @since Ant 1.6
*/
@@ -261,7 +261,7 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
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 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
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 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
* <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 @@ public class ModifiedSelectorTest extends BaseSelectorTest {
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();


Loading…
Cancel
Save