Author: sergey
Date: Tue Aug 23 16:44:06 2011
New Revision: 1160788
URL: http://svn.apache.org/viewvc?rev=1160788&view=rev
Log:
move poi.util.POIUtils to poi.poifs.filesystem.EntryUtils
Added:
poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
- copied, changed from r1160703, poi/trunk/src/java/org/apache/poi/util/POIUtils.java
Removed:
poi/trunk/src/java/org/apache/poi/util/POIUtils.java
Modified:
poi/trunk/src/java/org/apache/poi/POIDocument.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.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=1160788&r1=1160787&r2=1160788&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/POIDocument.java (original)
+++ poi/trunk/src/java/org/apache/poi/POIDocument.java Tue Aug 23 16:44:06 2011
@@ -21,11 +21,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Iterator;
import java.util.List;
-import org.apache.poi.util.POIUtils;
-
import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.MutablePropertySet;
import org.apache.poi.hpsf.PropertySet;
@@ -33,9 +30,9 @@ import org.apache.poi.hpsf.PropertySetFa
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
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.Entry;
+import org.apache.poi.poifs.filesystem.EntryUtils;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.Internal;
@@ -243,7 +240,7 @@ public abstract class POIDocument {
protected void copyNodes( POIFSFileSystem source, POIFSFileSystem target,
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,
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 )
throws IOException
{
- POIUtils.copyNodeRecursively( entry, target );
+ EntryUtils.copyNodeRecursively( entry, target );
}
}
Copied: poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java (from r1160703, poi/trunk/src/java/org/apache/poi/util/POIUtils.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java?p2=poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java&p1=poi/trunk/src/java/org/apache/poi/util/POIUtils.java&r1=1160703&r2=1160788&rev=1160788&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/POIUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java Tue Aug 23 16:44:06 2011
@@ -14,20 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-package org.apache.poi.util;
+package org.apache.poi.poifs.filesystem;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import org.apache.poi.poifs.filesystem.DirectoryEntry;
-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;
+import org.apache.poi.util.Internal;
@Internal
-public class POIUtils
+public class EntryUtils
{
/**
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java?rev=1160788&r1=1160787&r2=1160788&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java Tue Aug 23 16:44:06 2011
@@ -67,9 +67,9 @@ import org.apache.poi.poifs.common.POIFS
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.DocumentEntry;
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.util.Internal;
-import org.apache.poi.util.POIUtils;
/**
@@ -1003,7 +1003,7 @@ public final class HWPFDocument extends
}
else
{
- POIUtils.copyNodeRecursively( entry, pfs.getRoot() );
+ EntryUtils.copyNodeRecursively( entry, pfs.getRoot() );
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java?rev=1160788&r1=1160787&r2=1160788&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java Tue Aug 23 16:44:06 2011
@@ -21,8 +21,8 @@ import java.io.IOException;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
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.POIUtils;
@Internal
public class ObjectPoolImpl implements ObjectsPool
@@ -54,6 +54,6 @@ public class ObjectPoolImpl implements O
public void writeTo( DirectoryEntry directoryEntry ) throws IOException
{
if ( _objectPool != null )
- POIUtils.copyNodeRecursively( _objectPool, directoryEntry );
+ EntryUtils.copyNodeRecursively( _objectPool, directoryEntry );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org