From 6f50296c910f579f6b9191a372e827842320cbb3 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Sat, 6 Sep 2003 07:03:33 +0000 Subject: [PATCH] factored out the FAT granularity constant into FileUtils, though I am sure it is used in many other places. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275189 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/types/selectors/MappingSelector.java | 5 ++--- src/main/org/apache/tools/ant/util/FileUtils.java | 12 ++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java index aaba589ea..206cbf4d7 100644 --- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java @@ -59,6 +59,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.util.IdentityMapper; import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.FileUtils; import java.io.File; @@ -78,9 +79,7 @@ public abstract class MappingSelector extends BaseSelector { * */ public MappingSelector() { - if (Os.isFamily("dos")) { - granularity = 2000; - } + granularity=(int) FileUtils.newFileUtils().getFileTimestampGranularity(); } diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index ea2f5c3d1..00d8c9477 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -111,6 +111,11 @@ public class FileUtils { private static char[] escapedChar1 = new char[256]; private static char[] escapedChar2 = new char[256]; + /** + * the granularity of timestamps under FAT + */ + public static final long FAT_FILE_TIMESTAMP_GRANULARITY=2000; + // stolen from FilePathToURI of the Xerces-J team static { @@ -1328,5 +1333,12 @@ public class FileUtils { } } + public long getFileTimestampGranularity() { + if(Os.isFamily("dos")) { + return FAT_FILE_TIMESTAMP_GRANULARITY; + } else { + return 0; + } + } }