From 033f8dc250b23a66dc3e70612607e1f0752c792d Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 19 Aug 2021 14:25:21 +0200 Subject: [PATCH] BZ 65497 - improve documentation around file time granularity --- manual/Tasks/copy.html | 5 ++++- manual/Tasks/move.html | 4 +++- .../org/apache/tools/ant/types/selectors/SelectorUtils.java | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/manual/Tasks/copy.html b/manual/Tasks/copy.html index d1b8ff2a4..2e391164b 100644 --- a/manual/Tasks/copy.html +++ b/manual/Tasks/copy.html @@ -28,7 +28,10 @@

Description

Copies a file or resource collection to a new file or directory. By default, files are only copied if the source file is newer than the destination file, -or when the destination file does not exist. However, you can explicitly +or when the destination file does not exist - please see +the granularity attribute for Ant's idea +of newer. +However, you can explicitly overwrite files with the overwrite attribute.

Resource diff --git a/manual/Tasks/move.html b/manual/Tasks/move.html index c4f931ad9..3692c9dea 100644 --- a/manual/Tasks/move.html +++ b/manual/Tasks/move.html @@ -30,7 +30,9 @@ a new directory. By default, the destination file is overwritten if it already exists. When overwrite is turned off, then files are only moved if the source file is newer than -the destination file, or when the destination file does not exist.

+the destination file, or when the destination file does not exist +- please see the granularity attribute for Ant's idea +of newer.

Resource Collections are used to select a group of files to move. Only diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java index a2804c2ee..9b3749020 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java @@ -595,7 +595,7 @@ public final class SelectorUtils { * * @param src the original file * @param target the file being compared against - * @param granularity the amount in seconds of slack we will give in + * @param granularity the amount in milliseconds of slack we will give in * determining out of dateness * @return whether the target is out of date */ @@ -622,7 +622,7 @@ public final class SelectorUtils { * * @param src the original resource * @param target the resource being compared against - * @param granularity the int amount in seconds of slack we will give in + * @param granularity the int amount in milliseconds of slack we will give in * determining out of dateness * @return whether the target is out of date */ @@ -641,7 +641,7 @@ public final class SelectorUtils { * * @param src the original resource * @param target the resource being compared against - * @param granularity the long amount in seconds of slack we will give in + * @param granularity the long amount in milliseconds of slack we will give in * determining out of dateness * @return whether the target is out of date */