diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java b/src/main/org/apache/tools/ant/filters/ConcatFilter.java index 529ff4fcd..b7c2e3c36 100644 --- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java +++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java @@ -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)); } } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index 5a75590f8..8981217ce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -87,7 +87,7 @@ import org.apache.tools.ant.types.Reference; *

* Thanks to Rainer Schmitz for enhancements and comments. * - * @author Aslak Helles�a> + * @author Aslak Helles\u00f8y * *

* diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java index 8b3f94bf8..c8bd9576b 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.java @@ -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); -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java index e21879a5d..967b92189 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java @@ -66,7 +66,7 @@ import java.util.Iterator; * order. * 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(); -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java index 6e2462a65..a89a73c31 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java @@ -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 s. + * Use of this algorithm doesn't require any additional nested s. * Supported s are: *
* @@ -88,7 +88,7 @@ import org.apache.tools.ant.BuildException; * *
* - * @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 true if all is ok, otherwise false. */ public boolean isValid() { @@ -238,4 +238,4 @@ public class DigestAlgorithm implements Algorithm { buf.append(">"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java index 665e13882..4fec14a4e 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java @@ -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"; } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java index b4fc89fb5..15cd5c42a 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java @@ -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 s and - * doesn´t support any. + * Use of this algorithm doesn't require any additional nested 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 null if the file couldn´t be read + * @return the hashvalue or null 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"; } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index 894450bfa..69221221c 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -146,7 +146,7 @@ import org.apache.tools.ant.types.selectors.BaseExtendSelector; * Here all changed files are uploaded to the server. The * ModifiedSelector saves therefore much upload time.

* - *

This selector supports the following nested param´s: + *

This selector supports the following nested param's: * * * @@ -219,7 +219,7 @@ import org.apache.tools.ant.types.selectors.BaseExtendSelector; * a nested . * * - * @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 { *
  • set values for name pattern '*': update, cache, algorithm, comparator
    • *
  • set values for name pattern '*.*: cache.cachefile, ...
    • *

    - *

    This configuration algorithm is needed because you don´t know + *

    This configuration algorithm is needed because you don't know * the order of arriving config-data. E.g. if you first set the * cache.cachefilename and after that the cache itself, * the default value for cachefilename is used, because setting the @@ -650,4 +650,4 @@ public class ModifiedSelector extends BaseExtendSelector { } } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java index 2b681a49b..184765b44 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java @@ -88,7 +88,7 @@ import java.io.FileOutputStream; *

    *
    namevaluesdescriptionrequired
    * - * @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(); } -} \ No newline at end of file +} diff --git a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java index 16e21731a..6e765e86e 100644 --- a/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java +++ b/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java @@ -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; } -} \ No newline at end of file +} diff --git a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java index 6ed078851..19247ecd3 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java @@ -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 { -} \ No newline at end of file +} diff --git a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java index 22a2e3763..41f6ca7d7 100644 --- a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java +++ b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java @@ -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 * * 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();