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

move poi.util.POIUtils to poi.poifs.filesystem.EntryUtils

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1160788 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-08-23 16:44:06 +00:00
parent 995e5bdfa8
commit 77af81d3d7
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/org/apache/poi/POIDocument.java
View File

@ -21,11 +21,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.poi.util.POIUtils;
import org.apache.poi.hpsf.DocumentSummaryInformation; import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.MutablePropertySet; import org.apache.poi.hpsf.MutablePropertySet;
import org.apache.poi.hpsf.PropertySet; import org.apache.poi.hpsf.PropertySet;
@ -33,9 +30,9 @@ import org.apache.poi.hpsf.PropertySetFactory;
import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.DocumentInputStream; import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.Entry; import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.Internal; import org.apache.poi.util.Internal;
@ -243,7 +240,7 @@ public abstract class POIDocument {
protected void copyNodes( POIFSFileSystem source, POIFSFileSystem target, protected void copyNodes( POIFSFileSystem source, POIFSFileSystem target,
List<String> excepts ) throws IOException List<String> excepts ) throws IOException
{ {
POIUtils.copyNodes( source, target, excepts ); EntryUtils.copyNodes( source, target, excepts );
} }
/** /**
@ -256,7 +253,7 @@ public abstract class POIDocument {
protected void copyNodes( DirectoryNode sourceRoot, protected void copyNodes( DirectoryNode sourceRoot,
DirectoryNode targetRoot, List<String> excepts ) throws IOException DirectoryNode targetRoot, List<String> excepts ) throws IOException
{ {
POIUtils.copyNodes( sourceRoot, targetRoot, excepts ); EntryUtils.copyNodes( sourceRoot, targetRoot, excepts );
} }
/** /**
@ -267,6 +264,6 @@ public abstract class POIDocument {
protected void copyNodeRecursively( Entry entry, DirectoryEntry target ) protected void copyNodeRecursively( Entry entry, DirectoryEntry target )
throws IOException throws IOException
{ {
POIUtils.copyNodeRecursively( entry, target ); EntryUtils.copyNodeRecursively( entry, target );
} }
} }

10
src/java/org/apache/poi/util/POIUtils.java → src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
View File

@ -14,20 +14,16 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
==================================================================== */ ==================================================================== */
package org.apache.poi.util; package org.apache.poi.poifs.filesystem;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.util.Internal;
import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@Internal @Internal
public class POIUtils public class EntryUtils
{ {
/** /**

4
src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
View File

@ -67,9 +67,9 @@ import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.DocumentEntry; import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.Entry; import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.Internal; import org.apache.poi.util.Internal;
import org.apache.poi.util.POIUtils;
/** /**
@ -1003,7 +1003,7 @@ public final class HWPFDocument extends HWPFDocumentCore
} }
else else
{ {
POIUtils.copyNodeRecursively( entry, pfs.getRoot() ); EntryUtils.copyNodeRecursively( entry, pfs.getRoot() );
} }
} }

4
src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
View File

@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.Entry; import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.util.Internal; import org.apache.poi.util.Internal;
import org.apache.poi.util.POIUtils;
@Internal @Internal
public class ObjectPoolImpl implements ObjectsPool public class ObjectPoolImpl implements ObjectsPool
@ -54,6 +54,6 @@ public class ObjectPoolImpl implements ObjectsPool
public void writeTo( DirectoryEntry directoryEntry ) throws IOException public void writeTo( DirectoryEntry directoryEntry ) throws IOException
{ {
if ( _objectPool != null ) if ( _objectPool != null )
POIUtils.copyNodeRecursively( _objectPool, directoryEntry ); EntryUtils.copyNodeRecursively( _objectPool, directoryEntry );
} }
} }