From commits-return-12080-archive-asf-public=cust-asf.ponee.io@poi.apache.org Sat Feb 23 07:52:08 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0ED17180675 for ; Sat, 23 Feb 2019 08:52:07 +0100 (CET) Received: (qmail 94971 invoked by uid 500); 23 Feb 2019 07:52:07 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 94962 invoked by uid 99); 23 Feb 2019 07:52:07 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Feb 2019 07:52:07 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id AF22F3A26DD for ; Sat, 23 Feb 2019 07:52:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1854191 - in /poi/trunk/src: java/org/apache/poi/ java/org/apache/poi/poifs/filesystem/ testcases/org/apache/poi/poifs/filesystem/ Date: Sat, 23 Feb 2019 07:52:06 -0000 To: commits@poi.apache.org From: centic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190223075206.AF22F3A26DD@svn01-us-west.apache.org> 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: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org