From bfca3847336b9de11dabbf43c5d570346e2aff76 Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Wed, 2 Jul 2008 14:42:47 +0000 Subject: [PATCH] refactor: simplify implementation of copyDirectoryImmutably SVN: 7010 --- .../cisd/common/utilities/RecursiveHardLinkMaker.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java index 1144cbdc8fa..90c3101eaad 100644 --- a/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java +++ b/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java @@ -192,20 +192,18 @@ public final class RecursiveHardLinkMaker implements IPathImmutableCopier, public boolean copyDirectoryImmutably(File sourceDirectory, File destinationDirectory, String targetNameOrNull) { - assert sourceDirectory != null && sourceDirectory.isDirectory(); - assert destinationDirectory != null && destinationDirectory.isDirectory(); - return (tryImmutableCopy(sourceDirectory, destinationDirectory, targetNameOrNull) != null); + return copyFileImmutably(sourceDirectory, destinationDirectory, targetNameOrNull); } // // IFileImmutableCopier // - public boolean copyFileImmutably(File file, File destinationDirectory, String nameOrNull) + public boolean copyFileImmutably(File file, File destinationDirectory, String targetNameOrNull) { assert file != null && file.isFile(); assert destinationDirectory != null && destinationDirectory.isDirectory(); - return (tryImmutableCopy(file, destinationDirectory, nameOrNull) != null); + return (tryImmutableCopy(file, destinationDirectory, targetNameOrNull) != null); } private final File tryMakeCopy(final File resource, final File destinationDirectory, -- GitLab