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

Small bug fix for boolean properties that are "true".

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352783 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Klute 2002-07-18 15:51:39 +00:00
parent eab670b07b
commit 495abc1b7d
1 changed files with 74 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/java/org/apache/poi/hpsf/Property.java
View File

@ -66,46 +66,45 @@ import java.util.*;
import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndian;
/** /**
* <p> * <p>A property in a {@link Section} of a {@link PropertySet}.</p>
* *
* A property in a {@link Section} of a {@link PropertySet}.</p> <p> * <p>The property's <strong>ID</strong> gives the property a meaning
* in the context of its {@link Section}. Each {@link Section} spans
* its own name space of property IDs.</p>
* *
* The property's <strong>ID</strong> gives the property a meaning in the * <p>The property's <strong>type</strong> determines how its
* context of its {@link Section}. Each {@link Section} spans its own name * <strong>value </strong> is interpreted. For example, if the type is
* space of property IDs.</p> <p> * {@link Variant#VT_LPSTR} (byte string), the value consists of a
* {@link DWord} telling how many bytes the string contains. The bytes
* follow immediately, including any null bytes that terminate the
* string. The type {@link Variant#VT_I4} denotes a four-byte integer
* value, {@link Variant#VT_FILETIME} some date and time (of a
* file).</p>
* *
* The property's <strong>type</strong> determines how its <strong>value * <p><strong>FIXME:</strong> Reading of other types than those
* </strong> is interpreted. For example, if the type is {@link * mentioned above and the dictionary property is not yet
* Variant#VT_LPSTR} (byte string), the value consists of a {@link DWord} * implemented.</p>
* telling how many bytes the string contains. The bytes follow immediately,
* including any null bytes that terminate the string. The type {@link
* Variant#VT_I4} denotes a four-byte integer value, {@link
* Variant#VT_FILETIME} some date and time (of a file).</p> <p>
*
* <strong>FIXME:</strong> Reading of other types than those mentioned above
* and the dictionary property is not yet implemented.</p>
* *
* @author Rainer Klute (klute@rainer-klute.de) * @author Rainer Klute (klute@rainer-klute.de)
* @author Drew Varner (Drew.Varner InAndAround sc.edu) * @author Drew Varner (Drew.Varner InAndAround sc.edu)
*@created May 10, 2002
* @see Section * @see Section
* @see Variant * @see Variant
* @version $Id$ * @version $Id$
* @since 2002-02-09 * @since 2002-02-09
*/ */
public class Property { public class Property
{
private int id; private int id;
/** /**
* <p> * <p>Returns the property's ID.</p>
* *
* Returns the property's ID.</p> * @return The ID value
*
*@return The iD value
*/ */
public int getID() { public int getID()
{
return id; return id;
} }
@ -115,13 +114,12 @@ public class Property {
/** /**
* <p> * <p>Returns the property's type.</p>
*
* Returns the property's type.</p>
* *
* @return The type value * @return The type value
*/ */
public long getType() { public long getType()
{
return type; return type;
} }
@ -131,38 +129,38 @@ public class Property {
/** /**
* <p> * <p>Returns the property's value.</p>
* *
* Returns the property value's.</p> * @return The property's value
*
*@return The value value
*/ */
public Object getValue() { public Object getValue()
{
return value; return value;
} }
/** /**
* <p> * <p>Creates a {@link Property} instance by reading its bytes
* * from the property set stream.</p>
* Creates a {@link Property} instance by reading its bytes from the
* property set stream.</p>
* *
* @param id The property's ID. * @param id The property's ID.
* @param src The bytes the property set stream consists of. * @param src The bytes the property set stream consists of.
*@param offset The property's type/value pair's offset in the section. * @param offset The property's type/value pair's offset in the
*@param length The property's type/value pair's length in bytes. list. * section.
* @param length The property's type/value pair's length in bytes.
*/ */
public Property(final int id, final byte[] src, final long offset, public Property(final int id, final byte[] src, final long offset,
int length) { int length)
{
this.id = id; this.id = id;
/* /*
* ID 0 is a special case since it specifies a dictionary of * ID 0 is a special case since it specifies a dictionary of
* property IDs and property names. * property IDs and property names.
*/ */
if (id == 0) { if (id == 0)
{
value = readDictionary(src, offset, length); value = readDictionary(src, offset, length);
return; return;
} }
@ -237,9 +235,8 @@ public class Property {
length = length - LittleEndian.INT_SIZE; length = length - LittleEndian.INT_SIZE;
final byte[] v = new byte[length]; final byte[] v = new byte[length];
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++)
v[i] = src[(int)(o + i)]; v[i] = src[(int)(o + i)];
}
value = v; value = v;
break; break;
} }
@ -252,23 +249,17 @@ public class Property {
*/ */
final int first = o + LittleEndian.INT_SIZE; final int first = o + LittleEndian.INT_SIZE;
long bool = LittleEndian.getUInt(src, o); long bool = LittleEndian.getUInt(src, o);
if (bool == -1) { if (bool != 0)
value = new Boolean(true); value = new Boolean(true);
} else if (bool == 0) { else
value = new Boolean(false); value = new Boolean(false);
} else {
throw new IllegalPropertySetDataException
("Illegal property set data: A boolean must be " +
"either -1 (true) or 0 (false).");
}
break; break;
} }
default: default:
{ {
final byte[] v = new byte[length]; final byte[] v = new byte[length];
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++)
v[i] = src[(int)(offset + i)]; v[i] = src[(int)(offset + i)];
}
value = v; value = v;
break; break;
} }
@ -278,19 +269,18 @@ public class Property {
/** /**
* <p> * <p>Reads a dictionary.</p>
*
* Reads a dictionary.</p>
* *
* @param src The byte array containing the bytes making out the * @param src The byte array containing the bytes making out the
* dictionary. * dictionary.
*@param offset At this offset within <var>src</var> the dictionary * @param offset At this offset within <var>src</var> the
* starts. * dictionary starts.
* @param length The dictionary contains at most this many bytes. * @param length The dictionary contains at most this many bytes.
*@return Description of the Return Value * @return The dictonary
*/ */
protected Map readDictionary(final byte[] src, final long offset, protected Map readDictionary(final byte[] src, final long offset,
final int length) { final int length)
{
/* /*
* FIXME: Check the length! * FIXME: Check the length!
*/ */
@ -303,7 +293,8 @@ public class Property {
o += LittleEndian.INT_SIZE; o += LittleEndian.INT_SIZE;
final Map m = new HashMap((int)nrEntries, (float) 1.0); final Map m = new HashMap((int)nrEntries, (float) 1.0);
for (int i = 0; i < nrEntries; i++) { for (int i = 0; i < nrEntries; i++)
{
/* /*
* The key * The key
*/ */
@ -315,13 +306,13 @@ public class Property {
*/ */
final long sLength = LittleEndian.getUInt(src, o); final long sLength = LittleEndian.getUInt(src, o);
o += LittleEndian.INT_SIZE; o += LittleEndian.INT_SIZE;
/* /*
* Strip trailing 0x00 bytes. * Strip trailing 0x00 bytes.
*/ */
long l = sLength; long l = sLength;
while (src[(int)(o + l - 1)] == 0x00) { while (src[(int)(o + l - 1)] == 0x00)
l--; l--;
}
final String s = new String(src, o, (int)l); final String s = new String(src, o, (int)l);
o += sLength; o += sLength;
m.put(id, s); m.put(id, s);
@ -332,16 +323,16 @@ public class Property {
/** /**
* <p> * <p>Reads a code page.</p>
* *
* Reads a code page.</p> * @param src The byte array containing the bytes making out the
* * code page.
*@param src The byte array containing the bytes making out the code * @param offset At this offset within <var>src</var> the code
* page. * page starts.
*@param offset At this offset within <var>src</var> the code page starts. * @return The code page.
*@return Description of the Return Value
*/ */
protected int readCodePage(final byte[] src, final long offset) { protected int readCodePage(final byte[] src, final long offset)
{
throw new UnsupportedOperationException("FIXME"); throw new UnsupportedOperationException("FIXME");
} }