#62355 - unsplit packages - 4 - open HPSF

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1832361 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/hpsf/Array.java b/src/java/org/apache/poi/hpsf/Array.java
index f8c70fe1270803f8273ee91281ddb084b472c1c2..94af1369f8e1a063c7068ac5917d1fdcfcad603c 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Array.java
+++ b/src/java/org/apache/poi/hpsf/Array.java
@@ -20,7 +20,7 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 
 @Internal
-class Array
+public class Array
 {
     static class ArrayDimension {
         private long _size;
@@ -74,9 +74,7 @@ class Array
     private final ArrayHeader _header = new ArrayHeader();
     private TypedPropertyValue[] _values;
 
-    Array() {}
-
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         _header.read(lei);
 
         long numberOfScalarsLong = _header.getNumberOfScalarValues();
@@ -99,8 +97,8 @@ class Array
             }
         }
     }
-    
-    TypedPropertyValue[] getValues(){
+
+    public TypedPropertyValue[] getValues(){
         return _values;
     }
 }

diff --git a/src/java/org/apache/poi/hpsf/Blob.java b/src/java/org/apache/poi/hpsf/Blob.java
index 07c2c2ffe8f2d8ed49791c785da3fc1f92f8fb9e..47211feee03d0224be1ec5dded588069837ef9c3 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Blob.java
+++ b/src/java/org/apache/poi/hpsf/Blob.java
@@ -21,16 +21,14 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianInput;
 
 @Internal
-class Blob {
+public class Blob {
 
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 1_000_000;
 
     private byte[] _value;
 
-    Blob() {}
-    
-    void read( LittleEndianInput lei ) {
+    public void read( LittleEndianInput lei ) {
         int size = lei.readInt();
         _value = IOUtils.safelyAllocate(size, MAX_RECORD_LENGTH);
         if ( size > 0 ) {

diff --git a/src/java/org/apache/poi/hpsf/ClipboardData.java b/src/java/org/apache/poi/hpsf/ClipboardData.java
index ddc8ab09787acf11454205159f0d64f889226c35..4c1869fcac0ca910f7778b3cd5dd5908ad24dd31 100644 (file)
--- a/src/java/org/apache/poi/hpsf/ClipboardData.java
+++ b/src/java/org/apache/poi/hpsf/ClipboardData.java
@@ -25,7 +25,7 @@ import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
 @Internal
-class ClipboardData {
+public class ClipboardData {
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000_000;
 
@@ -33,10 +33,8 @@ class ClipboardData {
 
     private int _format;
     private byte[] _value;
-    
-    ClipboardData() {}
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         int offset = lei.getReadIndex();
         int size = lei.readInt();
 
@@ -55,11 +53,11 @@ class ClipboardData {
         lei.readFully(_value);
     }
 
-    byte[] getValue() {
+    public byte[] getValue() {
         return _value;
     }
 
-    byte[] toByteArray() {
+    public byte[] toByteArray() {
         byte[] result = new byte[LittleEndianConsts.INT_SIZE*2+_value.length];
         LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(result,0);
         try {
@@ -71,8 +69,8 @@ class ClipboardData {
             IOUtils.closeQuietly(bos);
         }
     }
-    
-    void setValue( byte[] value ) {
+
+    public void setValue( byte[] value ) {
         _value = value.clone();
     }
 }

diff --git a/src/java/org/apache/poi/hpsf/CodePageString.java b/src/java/org/apache/poi/hpsf/CodePageString.java
index e45d224cdf89c57c3b902d847bf445a2010ee496..eff276468dd5305896d85b5ff79b7148e2c195f6 100644 (file)
--- a/src/java/org/apache/poi/hpsf/CodePageString.java
+++ b/src/java/org/apache/poi/hpsf/CodePageString.java
@@ -30,18 +30,16 @@ import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
 @Internal
-class CodePageString {
+public class CodePageString {
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
     private final static POILogger LOG = POILogFactory.getLogger( CodePageString.class );
 
     private byte[] _value;
-    
-    
-    CodePageString() {}
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+
+    public void read( LittleEndianByteArrayInputStream lei ) {
         int offset = lei.getReadIndex();
         int size = lei.readInt();
         _value = IOUtils.safelyAllocate(size, MAX_RECORD_LENGTH);
@@ -70,7 +68,7 @@ class CodePageString {
         TypedPropertyValue.skipPadding(lei);
     }
 
-    String getJavaValue( int codepage ) throws UnsupportedEncodingException {
+    public String getJavaValue( int codepage ) throws UnsupportedEncodingException {
         int cp = ( codepage == -1 ) ? Property.DEFAULT_CODEPAGE : codepage;
         String result = CodePageUtil.getStringFromCodePage(_value, cp);
 
@@ -92,16 +90,16 @@ class CodePageString {
         return result.substring( 0, terminator );
     }
 
-    int getSize() {
+    public int getSize() {
         return LittleEndianConsts.INT_SIZE + _value.length;
     }
 
-    void setJavaValue( String string, int codepage ) throws UnsupportedEncodingException {
+    public void setJavaValue( String string, int codepage ) throws UnsupportedEncodingException {
         int cp = ( codepage == -1 ) ? Property.DEFAULT_CODEPAGE : codepage;
         _value = CodePageUtil.getBytesInCodePage(string + "\0", cp);
     }
 
-    int write( OutputStream out ) throws IOException {
+    public int write( OutputStream out ) throws IOException {
         LittleEndian.putUInt( _value.length, out );
         out.write( _value );
         return LittleEndianConsts.INT_SIZE + _value.length;

diff --git a/src/java/org/apache/poi/hpsf/Currency.java b/src/java/org/apache/poi/hpsf/Currency.java
index 34ae39a645a33dff8673e08bf50d1933b8cb3676..974887efcb16922a0a9bbe1c16e258bfb7ed6b04 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Currency.java
+++ b/src/java/org/apache/poi/hpsf/Currency.java
@@ -20,14 +20,12 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 
 @Internal
-class Currency {
+public class Currency {
     private static final int SIZE = 8;
 
     private final byte[] _value = new byte[SIZE];
-    
-    Currency() {}
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         lei.readFully(_value);
     }
 }

diff --git a/src/java/org/apache/poi/hpsf/Date.java b/src/java/org/apache/poi/hpsf/Date.java
index a116d21b8bd279b4a7de3285a195454018c5b45e..984661ca37304e280fda106bc6672e1930f4c018 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Date.java
+++ b/src/java/org/apache/poi/hpsf/Date.java
@@ -20,14 +20,12 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 
 @Internal
-class Date {
+public class Date {
     private static final int SIZE = 8;
 
     private final byte[] _value = new byte[SIZE];
-    
-    Date() {}
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         lei.readFully(_value);
     }
 }

diff --git a/src/java/org/apache/poi/hpsf/Decimal.java b/src/java/org/apache/poi/hpsf/Decimal.java
index 1ef50dabb04ad60eddbb9d78f9a373d82265941d..608d8c21bbbfe273e697595049609dd14415db52 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Decimal.java
+++ b/src/java/org/apache/poi/hpsf/Decimal.java
@@ -20,7 +20,7 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 
 @Internal
-class Decimal {
+public class Decimal {
     /**
      * Findbugs: UNR_UNREAD_FIELD
      */
@@ -30,9 +30,7 @@ class Decimal {
     private int field_4_hi32;
     private long field_5_lo64;
 
-    Decimal() {}
-    
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         field_1_wReserved = lei.readShort();
         field_2_scale = lei.readByte();
         field_3_sign = lei.readByte();

diff --git a/src/java/org/apache/poi/hpsf/Filetime.java b/src/java/org/apache/poi/hpsf/Filetime.java
index ba5687a7b32bd22196fe606521a8db24b0040ce5..42d864d23820c276ad0c997ebd82f3ae8948f29d 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Filetime.java
+++ b/src/java/org/apache/poi/hpsf/Filetime.java
@@ -20,10 +20,12 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Date;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 import org.apache.poi.util.LittleEndianConsts;
 
+@Internal
 public class Filetime {
     /**
      * The difference between the Windows epoch (1601-01-01
@@ -39,47 +41,47 @@ public class Filetime {
     private int _dwHighDateTime;
     private int _dwLowDateTime;
 
-    Filetime() {}
-    
-    Filetime( int low, int high ) {
+    public Filetime() {}
+
+    public Filetime( int low, int high ) {
         _dwLowDateTime = low;
         _dwHighDateTime = high;
     }
 
-    Filetime( Date date ) {
+    public Filetime( Date date ) {
         long filetime = Filetime.dateToFileTime(date);
         _dwHighDateTime = (int) ((filetime >>> 32) & UINT_MASK);
         _dwLowDateTime = (int) (filetime & UINT_MASK);
     }
     
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         _dwLowDateTime = lei.readInt();
         _dwHighDateTime = lei.readInt();
     }
 
-    long getHigh() {
+    public long getHigh() {
         return _dwHighDateTime;
     }
 
-    long getLow() {
+    public long getLow() {
         return _dwLowDateTime;
     }
 
-    byte[] toByteArray() {
+    public byte[] toByteArray() {
         byte[] result = new byte[SIZE];
         LittleEndian.putInt( result, 0 * LittleEndianConsts.INT_SIZE, _dwLowDateTime );
         LittleEndian.putInt( result, 1 * LittleEndianConsts.INT_SIZE, _dwHighDateTime );
         return result;
     }
 
-    int write( OutputStream out ) throws IOException {
+    public int write( OutputStream out ) throws IOException {
         LittleEndian.putInt( _dwLowDateTime, out );
         LittleEndian.putInt( _dwHighDateTime, out );
         return SIZE;
     }
 
-    Date getJavaValue() {
+    public Date getJavaValue() {
         long l = (((long)_dwHighDateTime) << 32) | (_dwLowDateTime & UINT_MASK);
         return filetimeToDate( l );
     }

diff --git a/src/java/org/apache/poi/hpsf/GUID.java b/src/java/org/apache/poi/hpsf/GUID.java
index 3483d50709d230701fabdaab65db63df2ec8be44..a140a9cc463b48361fe0fa8bab7074f308b80c80 100644 (file)
--- a/src/java/org/apache/poi/hpsf/GUID.java
+++ b/src/java/org/apache/poi/hpsf/GUID.java
@@ -20,15 +20,13 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 
 @Internal
-class GUID {
+public class GUID {
     private int _data1;
     private short _data2;
     private short _data3;
     private long _data4;
 
-    GUID() {}
-    
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         _data1 = lei.readInt();
         _data2 = lei.readShort();
         _data3 = lei.readShort();

diff --git a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java b/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
index 758f755691d5ec8f61c07d3aea13a95f990bf132..f5bfc2aeab8c685b4e82513c1f20d5156d8314e5 100644 (file)
--- a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
+++ b/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
@@ -19,6 +19,6 @@ package org.apache.poi.hpsf;
 import org.apache.poi.util.Internal;
 
 @Internal
-class IndirectPropertyName extends CodePageString {
+public class IndirectPropertyName extends CodePageString {
     IndirectPropertyName() {}
 }

diff --git a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java b/src/java/org/apache/poi/hpsf/TypedPropertyValue.java
index 7c0d726cb8cbdc7ce57df953cb6ceded578e3700..0cba4a62043273fa6c9e17f4877a27b572e70795 100644 (file)
--- a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java
+++ b/src/java/org/apache/poi/hpsf/TypedPropertyValue.java
@@ -27,22 +27,22 @@ import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
 @Internal
-class TypedPropertyValue {
+public class TypedPropertyValue {
     private static final POILogger LOG = POILogFactory.getLogger( TypedPropertyValue.class );
 
     private int _type;
     private Object _value;
 
-    TypedPropertyValue( int type, Object value ) {
+    public TypedPropertyValue( int type, Object value ) {
         _type = type;
         _value = value;
     }
 
-    Object getValue() {
+    public Object getValue() {
         return _value;
     }
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         _type = lei.readShort();
         short padding = lei.readShort();
         if ( padding != 0 ) {
@@ -52,7 +52,7 @@ class TypedPropertyValue {
         readValue( lei );
     }
 
-    void readValue( LittleEndianByteArrayInputStream lei ) {
+    public void readValue( LittleEndianByteArrayInputStream lei ) {
         switch ( _type ) {
         case Variant.VT_EMPTY:
         case Variant.VT_NULL:

diff --git a/src/java/org/apache/poi/hpsf/UnicodeString.java b/src/java/org/apache/poi/hpsf/UnicodeString.java
index 71e5fb7a088dac896907c4b9b8e3dd8ca09dfcdf..51f90184389ec4f494b7be1025d486c25ee53184 100644 (file)
--- a/src/java/org/apache/poi/hpsf/UnicodeString.java
+++ b/src/java/org/apache/poi/hpsf/UnicodeString.java
@@ -31,16 +31,14 @@ import org.apache.poi.util.POILogger;
 import org.apache.poi.util.StringUtil;
 
 @Internal
-class UnicodeString {
+public class UnicodeString {
     private static final POILogger LOG = POILogFactory.getLogger( UnicodeString.class );
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
     private byte[] _value;
-    
-    UnicodeString() {}
 
-    void read(LittleEndianByteArrayInputStream lei) {
+    public void read(LittleEndianByteArrayInputStream lei) {
         final int length = lei.readInt();
         final int unicodeBytes = length*2;
         _value = IOUtils.safelyAllocate(unicodeBytes, MAX_RECORD_LENGTH);
@@ -66,11 +64,11 @@ class UnicodeString {
         TypedPropertyValue.skipPadding(lei);
     }
     
-    byte[] getValue() {
+    public byte[] getValue() {
         return _value;
     }
 
-    String toJavaString() {
+    public String toJavaString() {
         if ( _value.length == 0 ) {
             return null;
         }
@@ -95,11 +93,11 @@ class UnicodeString {
         return result.substring( 0, terminator );
     }
 
-    void setJavaValue( String string ) throws UnsupportedEncodingException {
+    public void setJavaValue( String string ) throws UnsupportedEncodingException {
         _value = CodePageUtil.getBytesInCodePage(string + "\0", CodePageUtil.CP_UNICODE);
     }
 
-    int write( OutputStream out ) throws IOException {
+    public int write( OutputStream out ) throws IOException {
         LittleEndian.putUInt( _value.length / 2, out );
         out.write( _value );
         return LittleEndianConsts.INT_SIZE + _value.length;

diff --git a/src/java/org/apache/poi/hpsf/VariantBool.java b/src/java/org/apache/poi/hpsf/VariantBool.java
index 438312a6f66e54874b99798f9c215122d714dbdd..bfdeead64c809de7bbed002867253c05e46cada5 100644 (file)
--- a/src/java/org/apache/poi/hpsf/VariantBool.java
+++ b/src/java/org/apache/poi/hpsf/VariantBool.java
@@ -22,16 +22,14 @@ import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
 @Internal
-class VariantBool {
+public class VariantBool {
     private final static POILogger LOG = POILogFactory.getLogger( VariantBool.class );
 
     static final int SIZE = 2;
 
     private boolean _value;
 
-    VariantBool() {}
-    
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         short value = lei.readShort();
         switch (value) {
             case 0:
@@ -47,11 +45,11 @@ class VariantBool {
         }
     }
 
-    boolean getValue() {
+    public boolean getValue() {
         return _value;
     }
 
-    void setValue( boolean value ) {
+    public void setValue( boolean value ) {
         this._value = value;
     }
 }

diff --git a/src/java/org/apache/poi/hpsf/Vector.java b/src/java/org/apache/poi/hpsf/Vector.java
index 889c378f0b5c462fb2fad8b6851b6aa676a7d3ea..d82c215b70d0e2fd9d7a239f3abeddcf6e77e54f 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Vector.java
+++ b/src/java/org/apache/poi/hpsf/Vector.java
@@ -26,16 +26,16 @@ import org.apache.poi.util.LittleEndianByteArrayInputStream;
  * Holder for vector-type properties
  */
 @Internal
-class Vector {
+public class Vector {
     private final short _type;
 
     private TypedPropertyValue[] _values;
 
-    Vector( short type ) {
+    public Vector( short type ) {
         this._type = type;
     }
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public void read( LittleEndianByteArrayInputStream lei ) {
         final long longLength = lei.readUInt();
 
         if ( longLength > Integer.MAX_VALUE ) {
@@ -61,7 +61,7 @@ class Vector {
         _values = values.toArray(new TypedPropertyValue[values.size()]);
     }
 
-    TypedPropertyValue[] getValues(){
+    public TypedPropertyValue[] getValues(){
         return _values;
     }
 }

diff --git a/src/java/org/apache/poi/hpsf/VersionedStream.java b/src/java/org/apache/poi/hpsf/VersionedStream.java
index fe082859739d097ebb58765c78efed7c6bc82c18..20d2d133a4b7cd1dceead9e208c217f60def3930 100644 (file)
--- a/src/java/org/apache/poi/hpsf/VersionedStream.java
+++ b/src/java/org/apache/poi/hpsf/VersionedStream.java
@@ -22,14 +22,14 @@ import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 
 @Internal
-class VersionedStream
+public class VersionedStream
 {
     private final GUID _versionGuid = new GUID();
     private final IndirectPropertyName _streamName = new IndirectPropertyName();
-    
-    VersionedStream() {}
 
-    void read( LittleEndianByteArrayInputStream lei ) {
+    public VersionedStream() {}
+
+    public void read( LittleEndianByteArrayInputStream lei ) {
         _versionGuid.read(lei);
         _streamName.read(lei);
     }