moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

bug 60331: remove deprecated EntryUtils.copyNodes( DirectoryEntry, DirectoryEntry, List<String> excepts). Use EntryUtils.copyNodes( FilteringDirectoryEntry, FilteringDirectoryEntry ) instead.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1767716 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-11-02 16:25:18 +00:00
parent 6966eebb38
commit cbc3f8599d
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
View File

@ -24,6 +24,7 @@ import java.util.List;
import org.apache.poi.POIDocument; import org.apache.poi.POIDocument;
import org.apache.poi.poifs.filesystem.EntryUtils; 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.NPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.OPOIFSFileSystem; import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@ -88,7 +89,9 @@ public class HPSFPropertiesOnlyDocument extends POIDocument {
writeProperties(fs, excepts); writeProperties(fs, excepts);
// Copy over everything else unchanged // 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 // Caller will save the resultant POIFSFileSystem to the stream/file
} }

20
src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
View File

@ -90,26 +90,6 @@ public class EntryUtils
copyNodes( (DirectoryEntry)filteredSource, (DirectoryEntry)filteredTarget ); 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<String> 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 * Copies all nodes from one POIFS to the other
* *