Browse Source

simplify(?); use constants

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@708942 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 16 years ago
parent
commit
4dbe4dd92b
1 changed files with 5 additions and 13 deletions
  1. +5
    -13
      src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java

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

@@ -24,7 +24,6 @@ import java.util.Vector;


import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.types.resources.FileResource;


/** /**
* <p>This is a utility class used by selectors and DirectoryScanner. The * <p>This is a utility class used by selectors and DirectoryScanner. The
@@ -647,20 +646,13 @@ public final class SelectorUtils {
* determining out of dateness * determining out of dateness
* @return whether the target is out of date * @return whether the target is out of date
*/ */
public static boolean isOutOfDate(Resource src, Resource target,
long granularity) {
public static boolean isOutOfDate(Resource src, Resource target, long granularity) {
long sourceLastModified = src.getLastModified(); long sourceLastModified = src.getLastModified();
// Check if source exists - use sourceLastModified for file resources
// as it is quicker than checking exists() again, however string resources
// have a last modified time of 0
boolean sourceExists = (src instanceof FileResource)
? sourceLastModified != 0L : src.isExists();

long targetLastModified = target.getLastModified(); long targetLastModified = target.getLastModified();
if (targetLastModified == 0L) {
return true;
}
return (sourceLastModified - granularity) > targetLastModified;
return src.isExists()
&& (sourceLastModified == Resource.UNKNOWN_DATETIME
|| targetLastModified == Resource.UNKNOWN_DATETIME
|| (sourceLastModified - granularity) > targetLastModified);
} }


/** /**


Loading…
Cancel
Save