From cbc3f8599d6cd033f02bf249d03254b9c43d1156 Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Wed, 2 Nov 2016 16:25:18 +0000 Subject: [PATCH] bug 60331: remove deprecated EntryUtils.copyNodes( DirectoryEntry, DirectoryEntry, List excepts). Use EntryUtils.copyNodes( FilteringDirectoryEntry, FilteringDirectoryEntry ) instead. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1767716 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hpsf/HPSFPropertiesOnlyDocument.java | 5 ++++- .../poi/poifs/filesystem/EntryUtils.java | 20 ------------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java b/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java index 78ee5512b..79a91a4b6 100644 --- a/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java +++ b/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.poi.POIDocument; import org.apache.poi.poifs.filesystem.EntryUtils; +import org.apache.poi.poifs.filesystem.FilteringDirectoryNode; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.OPOIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem; @@ -88,7 +89,9 @@ public class HPSFPropertiesOnlyDocument extends POIDocument { writeProperties(fs, excepts); // Copy over everything else unchanged - EntryUtils.copyNodes(directory, fs.getRoot(), excepts); + FilteringDirectoryNode src = new FilteringDirectoryNode(directory, excepts); + FilteringDirectoryNode dest = new FilteringDirectoryNode(fs.getRoot(), excepts); + EntryUtils.copyNodes(src, dest); // Caller will save the resultant POIFSFileSystem to the stream/file } diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java index a4b452f4b..18140d9df 100644 --- a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java +++ b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java @@ -90,26 +90,6 @@ public class EntryUtils copyNodes( (DirectoryEntry)filteredSource, (DirectoryEntry)filteredTarget ); } - /** - * Copies nodes from one Directory to the other minus the excepts - * - * @param sourceRoot - * is the source Directory to copy from - * @param targetRoot - * is the target Directory to copy to - * @param excepts - * is a list of Strings specifying what nodes NOT to copy - * @deprecated POI 3.8 beta 5. Use {@link FilteringDirectoryNode} instead - */ - public static void copyNodes( DirectoryEntry sourceRoot, - DirectoryEntry targetRoot, List excepts ) - throws IOException - { - FilteringDirectoryNode source = new FilteringDirectoryNode(sourceRoot, excepts); - FilteringDirectoryNode target = new FilteringDirectoryNode(targetRoot, excepts); - copyNodes( source, target ); - } - /** * Copies all nodes from one POIFS to the other *