From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/util/FileManager.java | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/FileManager.java b/opends/src/quicksetup/org/opends/quicksetup/util/FileManager.java
index 9772f09..8e7a483 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/FileManager.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/FileManager.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.opends.quicksetup.util;
@@ -116,32 +116,6 @@
}
/**
- * Recursively copies any files or directories appearing in
- * <code>source</code> or a subdirectory of <code>source</code>
- * to the corresponding directory under <code>target</code>. Files
- * in under <code>source</code> are not copied to <code>target</code>
- * if a file by the same name already exists in <code>target</code>.
- *
- * @param source source directory
- * @param target target directory
- * @param filter for specifying particular files to synchronize
- * @throws ApplicationException if there is a problem copying files
- */
- public void synchronize(File source, File target, FileFilter filter)
- throws ApplicationException
- {
- if (source != null && target != null) {
- String[] sourceFileNames = source.list();
- if (sourceFileNames != null) {
- for (String sourceFileName : sourceFileNames) {
- File sourceFile = new File(source, sourceFileName);
- copyRecursively(sourceFile, target, filter, false);
- }
- }
- }
- }
-
- /**
* Renames the source file to the target file. If the target file exists
* it is first deleted. The rename and delete operation return values
* are checked for success and if unsuccessful, this method throws an
@@ -243,7 +217,7 @@
File[] children = parentDir.listFiles();
if (children != null) {
for (File child : children) {
- delete(child);
+ deleteRecursively(child);
}
}
}
--
Gitblit v1.10.0