Author: centic
Date: Sat Feb 23 07:52:06 2019
New Revision: 1854191
URL: http://svn.apache.org/viewvc?rev=1854191&view=rev
Log:
Remove some remnants of NFileSystem
Modified:
poi/trunk/src/java/org/apache/poi/POIDocument.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
Modified: poi/trunk/src/java/org/apache/poi/POIDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/POIDocument.java?rev=1854191&r1=1854190&r2=1854191&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/POIDocument.java (original)
+++ poi/trunk/src/java/org/apache/poi/POIDocument.java Sat Feb 23 07:52:06 2019
@@ -418,8 +418,8 @@ public abstract class POIDocument implem
@Override
public void close() throws IOException {
if (directory != null) {
- if (directory.getNFileSystem() != null) {
- directory.getNFileSystem().close();
+ if (directory.getFileSystem() != null) {
+ directory.getFileSystem().close();
clearDirectory();
}
}
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java?rev=1854191&r1=1854190&r2=1854191&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java Sat
Feb 23 07:52:06 2019
@@ -119,17 +119,6 @@ public class DirectoryNode
return _nfilesystem;
}
-
- /**
- * If this is NPOIFS based, return the NPOIFSFileSystem
- * that this belong to, otherwise Null if OPOIFS based
- * @return the filesystem that this belongs to
- */
- public POIFSFileSystem getNFileSystem()
- {
- return _nfilesystem;
- }
-
/**
* open a document in the directory's entry's list of entries
*
Modified:
poi/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java?rev=1854191&r1=1854190&r2=1854191&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
Sat Feb 23 07:52:06 2019
@@ -87,7 +87,7 @@ public final class DocumentInputStream e
DocumentProperty property = (DocumentProperty)doc.getProperty();
_document = new POIFSDocument(
property,
- ((DirectoryNode)doc.getParent()).getNFileSystem()
+ ((DirectoryNode)doc.getParent()).getFileSystem()
);
_data = _document.getBlockIterator();
}
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java?rev=1854191&r1=1854190&r2=1854191&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java Sat
Feb 23 07:52:06 2019
@@ -54,7 +54,7 @@ public final class POIFSDocument impleme
*/
public POIFSDocument(DocumentNode document) {
this((DocumentProperty)document.getProperty(),
- ((DirectoryNode)document.getParent()).getNFileSystem());
+ ((DirectoryNode)document.getParent()).getFileSystem());
}
/**
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java?rev=1854191&r1=1854190&r2=1854191&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
Sat Feb 23 07:52:06 2019
@@ -442,7 +442,6 @@ public final class TestDocumentInputStre
try (POIFSFileSystem npoifs = new POIFSFileSystem(sample)) {
// Ensure we have what we expect on the root
- assertEquals(npoifs, npoifs.getRoot().getNFileSystem());
assertEquals(npoifs, npoifs.getRoot().getFileSystem());
// Check inside
Modified:
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java?rev=1854191&r1=1854190&r2=1854191&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
Sat Feb 23 07:52:06 2019
@@ -140,9 +140,9 @@ public final class TestFileSystemBugs {
// Copy over
EntryUtils.copyNodes(root, dest);
- // Re-load, always as NPOIFS
+ // Re-load
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- root.getNFileSystem().writeFilesystem(baos);
+ root.getFileSystem().writeFilesystem(baos);
POIFSFileSystem read = new POIFSFileSystem(
new ByteArrayInputStream(baos.toByteArray()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
