Skip to content

Commit dd190b8

Browse files
committed
Revert "Issue #980: Replace AntBuilder.copy() with Files.walkFileTree()"
This reverts commit be967ba.
1 parent be967ba commit dd190b8

1 file changed

Lines changed: 3 additions & 33 deletions

File tree

checkstyle-tester/diff.groovy

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import static java.lang.System.err
22
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
33

4-
import java.nio.file.FileVisitResult
54
import java.nio.file.Files
6-
import java.nio.file.Path
75
import java.nio.file.Paths
8-
import java.nio.file.SimpleFileVisitor
9-
import java.nio.file.attribute.BasicFileAttributes
106
import java.util.regex.Pattern
117

128
static void main(String[] args) {
@@ -717,35 +713,9 @@ def postProcessCheckstyleReport(targetDir, repoName, repoPath) {
717713
}
718714

719715
def copyDir(source, destination) {
720-
Path sourceDir = new File(source).toPath().toAbsolutePath().normalize()
721-
Path destinationDir = new File(destination).toPath().toAbsolutePath().normalize()
722-
723-
Files.walkFileTree(sourceDir, new SimpleFileVisitor<Path>() {
724-
@Override
725-
FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
726-
if (dir.startsWith(destinationDir)) {
727-
return FileVisitResult.SKIP_SUBTREE
728-
}
729-
Path targetDir = destinationDir.resolve(sourceDir.relativize(dir))
730-
if (targetDir.startsWith(sourceDir)) {
731-
return FileVisitResult.SKIP_SUBTREE
732-
}
733-
if (!Files.exists(targetDir)) {
734-
Files.createDirectories(targetDir)
735-
}
736-
return FileVisitResult.CONTINUE
737-
}
738-
739-
@Override
740-
FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
741-
Path targetFile = destinationDir.resolve(sourceDir.relativize(file))
742-
if (targetFile.startsWith(sourceDir)) {
743-
return FileVisitResult.CONTINUE
744-
}
745-
Files.copy(file, targetFile, REPLACE_EXISTING)
746-
return FileVisitResult.CONTINUE
747-
}
748-
})
716+
new AntBuilder().copy(todir: destination) {
717+
fileset(dir: source)
718+
}
749719
}
750720

751721
def moveDir(source, destination) {

0 commit comments

Comments
 (0)