acoliver 02/03/14 18:47:57
Modified: src/java/org/apache/poi/hssf/usermodel HSSFCell.java
src/java/org/apache/poi/poifs/filesystem POIFSDocument.java
POIFSFileSystem.java
src/java/org/apache/poi/poifs/property Property.java
PropertyFactory.java PropertyTable.java
RootProperty.java
src/java/org/apache/poi/poifs/storage BATBlock.java
BlockAllocationTableReader.java
BlockAllocationTableWriter.java DocumentBlock.java
HeaderBlockConstants.java HeaderBlockReader.java
HeaderBlockWriter.java PropertyBlock.java
RawDataBlock.java SmallDocumentBlock.java
src/testcases/org/apache/poi/hssf/usermodel
TestCellStyle.java
src/testcases/org/apache/poi/poifs/property
TestDirectoryProperty.java TestRootProperty.java
src/testcases/org/apache/poi/poifs/storage
TestBlockAllocationTableReader.java
TestBlockAllocationTableWriter.java
Log:
Applied patches from Loiec Lefeavre
Revision Changes Path
1.4 +14 -0 jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
Index: HSSFCell.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HSSFCell.java 12 Feb 2002 02:19:12 -0000 1.3
+++ HSSFCell.java 15 Mar 2002 02:47:56 -0000 1.4
@@ -72,6 +72,7 @@
import org.apache.poi.hssf.record.ExtendedFormatRecord;
import java.util.Date;
+import java.util.Calendar;
/**
* High level representation of a cell in a row of a spreadsheet.
@@ -631,6 +632,19 @@
public void setCellValue(Date value)
{
setCellValue(HSSFDateUtil.getExcelDate(value));
+ }
+
+ /**
+ * set a date value for the cell. Excel treats dates as numeric so you will
need to format the cell as
+ * a date.
+ *
+ * @param value the date value to set this cell to. For formulas we'll set the
+ * precalculated value, for numerics we'll set its value. For othertypes
we
+ * will change the cell to a numeric cell and set its value.
+ */
+ public void setCellValue(Calendar value)
+ {
+ setCellValue(value.getTime());
}
/**
1.2 +4 -4
jakarta-poi/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
Index: POIFSDocument.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- POIFSDocument.java 31 Jan 2002 02:23:45 -0000 1.1
+++ POIFSDocument.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.dev.POIFSViewable;
import org.apache.poi.poifs.property.DocumentProperty;
import org.apache.poi.poifs.property.Property;
@@ -628,7 +628,7 @@
writer.processPOIFSWriterEvent(
new POIFSWriterEvent(dstream, path, name, size));
dstream.writeFiller(countBlocks()
- * PoiFSConstants
+ * POIFSConstants
.BIG_BLOCK_SIZE, DocumentBlock
.getFillByte());
}
@@ -654,8 +654,8 @@
{
if (writer != null)
{
- rval = (size + PoiFSConstants.BIG_BLOCK_SIZE - 1)
- / PoiFSConstants.BIG_BLOCK_SIZE;
+ rval = (size + POIFSConstants.BIG_BLOCK_SIZE - 1)
+ / POIFSConstants.BIG_BLOCK_SIZE;
}
else
{
1.2 +1 -1
jakarta-poi/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
Index: POIFSFileSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- POIFSFileSystem.java 31 Jan 2002 02:23:45 -0000 1.1
+++ POIFSFileSystem.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.dev.POIFSViewable;
import org.apache.poi.poifs.property.DirectoryProperty;
import org.apache.poi.poifs.property.DocumentProperty;
1.2 +4 -4 jakarta-poi/src/java/org/apache/poi/poifs/property/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/property/Property.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Property.java 31 Jan 2002 02:23:45 -0000 1.1
+++ Property.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.dev.POIFSViewable;
import org.apache.poi.util.ByteField;
import org.apache.poi.util.IntegerField;
@@ -124,7 +124,7 @@
protected Property()
{
- _raw_data = new byte[ PoiFSConstants.PROPERTY_SIZE ];
+ _raw_data = new byte[ POIFSConstants.PROPERTY_SIZE ];
Arrays.fill(_raw_data, _default_fill);
_name_size = new ShortField(_name_size_offset);
_property_type =
@@ -160,9 +160,9 @@
protected Property(final int index, final byte [] array, final int offset)
{
- _raw_data = new byte[ PoiFSConstants.PROPERTY_SIZE ];
+ _raw_data = new byte[ POIFSConstants.PROPERTY_SIZE ];
System.arraycopy(array, offset, _raw_data, 0,
- PoiFSConstants.PROPERTY_SIZE);
+ POIFSConstants.PROPERTY_SIZE);
_name_size = new ShortField(_name_size_offset, _raw_data);
_property_type =
new ByteField(PropertyConstants.PROPERTY_TYPE_OFFSET, _raw_data);
1.2 +3 -3
jakarta-poi/src/java/org/apache/poi/poifs/property/PropertyFactory.java
Index: PropertyFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/property/PropertyFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyFactory.java 31 Jan 2002 02:23:45 -0000 1.1
+++ PropertyFactory.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.storage.ListManagedBlock;
/**
@@ -102,7 +102,7 @@
{
byte[] data = blocks[ j ].getData();
int property_count = data.length
- / PoiFSConstants.PROPERTY_SIZE;
+ / POIFSConstants.PROPERTY_SIZE;
int offset = 0;
for (int k = 0; k < property_count; k++)
@@ -130,7 +130,7 @@
properties.add(null);
break;
}
- offset += PoiFSConstants.PROPERTY_SIZE;
+ offset += POIFSConstants.PROPERTY_SIZE;
}
}
return properties;
1.2 +3 -3
jakarta-poi/src/java/org/apache/poi/poifs/property/PropertyTable.java
Index: PropertyTable.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/property/PropertyTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyTable.java 31 Jan 2002 02:23:45 -0000 1.1
+++ PropertyTable.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -60,7 +60,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.filesystem.BATManaged;
import org.apache.poi.poifs.storage.BlockWritable;
import org.apache.poi.poifs.storage.PropertyBlock;
@@ -88,7 +88,7 @@
public PropertyTable()
{
- _start_block = PoiFSConstants.END_OF_CHAIN;
+ _start_block = POIFSConstants.END_OF_CHAIN;
_properties = new ArrayList();
addProperty(new RootProperty());
_blocks = null;
@@ -110,7 +110,7 @@
final RawDataBlockList blockList)
throws IOException
{
- _start_block = PoiFSConstants.END_OF_CHAIN;
+ _start_block = POIFSConstants.END_OF_CHAIN;
_blocks = null;
_properties =
PropertyFactory
1.2 +2 -2
jakarta-poi/src/java/org/apache/poi/poifs/property/RootProperty.java
Index: RootProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/property/RootProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RootProperty.java 31 Jan 2002 02:23:45 -0000 1.1
+++ RootProperty.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.io.IOException;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.storage.SmallDocumentBlock;
/**
@@ -83,7 +83,7 @@
// overrides
setNodeColor(_NODE_BLACK);
setPropertyType(PropertyConstants.ROOT_TYPE);
- setStartBlock(PoiFSConstants.END_OF_CHAIN);
+ setStartBlock(POIFSConstants.END_OF_CHAIN);
}
/**
1.2 +4 -4 jakarta-poi/src/java/org/apache/poi/poifs/storage/BATBlock.java
Index: BATBlock.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/BATBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BATBlock.java 31 Jan 2002 02:23:45 -0000 1.1
+++ BATBlock.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -60,7 +60,7 @@
import java.util.Arrays;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -76,7 +76,7 @@
extends BigBlock
{
private static final int _entries_per_block =
- PoiFSConstants.BIG_BLOCK_SIZE / LittleEndianConsts.INT_SIZE;
+ POIFSConstants.BIG_BLOCK_SIZE / LittleEndianConsts.INT_SIZE;
private static final int _entries_per_xbat_block = _entries_per_block
- 1;
private static final int _xbat_chain_offset =
@@ -91,7 +91,7 @@
private BATBlock()
{
- _data = new byte[ PoiFSConstants.BIG_BLOCK_SIZE ];
+ _data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
Arrays.fill(_data, _default_value);
_fields = new IntegerField[ _entries_per_block ];
int offset = 0;
@@ -164,7 +164,7 @@
{
blocks[ index ].setXBATChain(startBlock + index + 1);
}
- blocks[ index ].setXBATChain(PoiFSConstants.END_OF_CHAIN);
+ blocks[ index ].setXBATChain(POIFSConstants.END_OF_CHAIN);
}
return blocks;
}
1.2 +5 -5
jakarta-poi/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java
Index: BlockAllocationTableReader.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/BlockAllocationTableReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockAllocationTableReader.java 31 Jan 2002 02:23:45 -0000 1.1
+++ BlockAllocationTableReader.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -60,7 +60,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IntList;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -158,7 +158,7 @@
offset += LittleEndianConsts.INT_SIZE;
}
chain_index = LittleEndian.getInt(data, chain_index_offset);
- if (chain_index == PoiFSConstants.END_OF_CHAIN)
+ if (chain_index == POIFSConstants.END_OF_CHAIN)
{
break;
}
@@ -222,7 +222,7 @@
List blocks = new ArrayList();
int currentBlock = startBlock;
- while (currentBlock != PoiFSConstants.END_OF_CHAIN)
+ while (currentBlock != POIFSConstants.END_OF_CHAIN)
{
blocks.add(blockList.remove(currentBlock));
currentBlock = _entries.get(currentBlock);
@@ -261,7 +261,7 @@
* @param index of the current block
*
* @return index of the next block (may be
- * PoiFSConstants.END_OF_CHAIN, indicating end of chain
+ * POIFSConstants.END_OF_CHAIN, indicating end of chain
* (duh))
*
* @exception IOException if the current block is unused
@@ -305,7 +305,7 @@
{
int entry = LittleEndian.getInt(data, offset);
- if (entry == PoiFSConstants.UNUSED_BLOCK)
+ if (entry == POIFSConstants.UNUSED_BLOCK)
{
raw_blocks.zap(_entries.size());
}
1.2 +3 -3
jakarta-poi/src/java/org/apache/poi/poifs/storage/BlockAllocationTableWriter.java
Index: BlockAllocationTableWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/BlockAllocationTableWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockAllocationTableWriter.java 31 Jan 2002 02:23:45 -0000 1.1
+++ BlockAllocationTableWriter.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -60,7 +60,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.filesystem.BATManaged;
import org.apache.poi.util.IntList;
import org.apache.poi.util.LittleEndian;
@@ -95,7 +95,7 @@
public BlockAllocationTableWriter()
{
- _start_block = PoiFSConstants.END_OF_CHAIN;
+ _start_block = POIFSConstants.END_OF_CHAIN;
_entries = new IntList();
_blocks = new BATBlock[ 0 ];
}
@@ -162,7 +162,7 @@
{
_entries.add(index++);
}
- _entries.add(PoiFSConstants.END_OF_CHAIN);
+ _entries.add(POIFSConstants.END_OF_CHAIN);
}
return startBlock;
}
1.2 +15 -15
jakarta-poi/src/java/org/apache/poi/poifs/storage/DocumentBlock.java
Index: DocumentBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/DocumentBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentBlock.java 31 Jan 2002 02:23:45 -0000 1.1
+++ DocumentBlock.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -61,7 +61,7 @@
import java.util.Arrays;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -118,7 +118,7 @@
private DocumentBlock()
{
- _data = new byte[ PoiFSConstants.BIG_BLOCK_SIZE ];
+ _data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
Arrays.fill(_data, _default_value);
}
@@ -141,7 +141,7 @@
public boolean partiallyRead()
{
- return _bytes_read != PoiFSConstants.BIG_BLOCK_SIZE;
+ return _bytes_read != POIFSConstants.BIG_BLOCK_SIZE;
}
/**
@@ -168,7 +168,7 @@
final int size)
{
DocumentBlock[] rval =
- new DocumentBlock[ (size + PoiFSConstants.BIG_BLOCK_SIZE - 1) /
PoiFSConstants.BIG_BLOCK_SIZE ];
+ new DocumentBlock[ (size + POIFSConstants.BIG_BLOCK_SIZE - 1) /
POIFSConstants.BIG_BLOCK_SIZE ];
int offset = 0;
for (int k = 0; k < rval.length; k++)
@@ -176,14 +176,14 @@
rval[ k ] = new DocumentBlock();
if (offset < array.length)
{
- int length = Math.min(PoiFSConstants.BIG_BLOCK_SIZE,
+ int length = Math.min(POIFSConstants.BIG_BLOCK_SIZE,
array.length - offset);
System.arraycopy(array, offset, rval[ k ]._data, 0, length);
- if (length != PoiFSConstants.BIG_BLOCK_SIZE)
+ if (length != POIFSConstants.BIG_BLOCK_SIZE)
{
Arrays.fill(rval[ k ]._data, length,
- PoiFSConstants.BIG_BLOCK_SIZE,
+ POIFSConstants.BIG_BLOCK_SIZE,
_default_value);
}
}
@@ -191,7 +191,7 @@
{
Arrays.fill(rval[ k ]._data, _default_value);
}
- offset += PoiFSConstants.BIG_BLOCK_SIZE;
+ offset += POIFSConstants.BIG_BLOCK_SIZE;
}
return rval;
}
@@ -207,10 +207,10 @@
public static void read(final DocumentBlock [] blocks,
final byte [] buffer, final int offset)
{
- int firstBlockIndex = offset / PoiFSConstants.BIG_BLOCK_SIZE;
- int firstBlockOffset = offset % PoiFSConstants.BIG_BLOCK_SIZE;
+ int firstBlockIndex = offset / POIFSConstants.BIG_BLOCK_SIZE;
+ int firstBlockOffset = offset % POIFSConstants.BIG_BLOCK_SIZE;
int lastBlockIndex = (offset + buffer.length - 1)
- / PoiFSConstants.BIG_BLOCK_SIZE;
+ / POIFSConstants.BIG_BLOCK_SIZE;
if (firstBlockIndex == lastBlockIndex)
{
@@ -223,14 +223,14 @@
System.arraycopy(blocks[ firstBlockIndex ]._data,
firstBlockOffset, buffer, buffer_offset,
- PoiFSConstants.BIG_BLOCK_SIZE
+ POIFSConstants.BIG_BLOCK_SIZE
- firstBlockOffset);
- buffer_offset += PoiFSConstants.BIG_BLOCK_SIZE - firstBlockOffset;
+ buffer_offset += POIFSConstants.BIG_BLOCK_SIZE - firstBlockOffset;
for (int j = firstBlockIndex + 1; j < lastBlockIndex; j++)
{
System.arraycopy(blocks[ j ]._data, 0, buffer, buffer_offset,
- PoiFSConstants.BIG_BLOCK_SIZE);
- buffer_offset += PoiFSConstants.BIG_BLOCK_SIZE;
+ POIFSConstants.BIG_BLOCK_SIZE);
+ buffer_offset += POIFSConstants.BIG_BLOCK_SIZE;
}
System.arraycopy(blocks[ lastBlockIndex ]._data, 0, buffer,
buffer_offset, buffer.length - buffer_offset);
1.2 +2 -2
jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
Index: HeaderBlockConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderBlockConstants.java 31 Jan 2002 02:23:45 -0000 1.1
+++ HeaderBlockConstants.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -55,7 +55,7 @@
package org.apache.poi.poifs.storage;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -73,7 +73,7 @@
public static final long _signature = 0xE11AB1A1E011CFD0L;
public static final int _bat_array_offset = 0x4c;
public static final int _max_bats_in_header =
- (PoiFSConstants.BIG_BLOCK_SIZE - _bat_array_offset)
+ (POIFSConstants.BIG_BLOCK_SIZE - _bat_array_offset)
/ LittleEndianConsts.INT_SIZE;
// useful offsets
1.2 +4 -4
jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
Index: HeaderBlockReader.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderBlockReader.java 31 Jan 2002 02:23:45 -0000 1.1
+++ HeaderBlockReader.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -103,17 +103,17 @@
public HeaderBlockReader(final InputStream stream)
throws IOException
{
- _data = new byte[ PoiFSConstants.BIG_BLOCK_SIZE ];
+ _data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
int byte_count = stream.read(_data);
- if (byte_count != PoiFSConstants.BIG_BLOCK_SIZE)
+ if (byte_count != POIFSConstants.BIG_BLOCK_SIZE)
{
String type = " byte" + ((byte_count == 1) ? ("")
: ("s"));
throw new IOException("Unable to read entire header; "
+ byte_count + type + " read; expected "
- + PoiFSConstants.BIG_BLOCK_SIZE + " bytes");
+ + POIFSConstants.BIG_BLOCK_SIZE + " bytes");
}
// verify signature
1.2 +6 -6
jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockWriter.java
Index: HeaderBlockWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/HeaderBlockWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeaderBlockWriter.java 31 Jan 2002 02:23:45 -0000 1.1
+++ HeaderBlockWriter.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.LongField;
@@ -99,7 +99,7 @@
public HeaderBlockWriter()
{
- _data = new byte[ PoiFSConstants.BIG_BLOCK_SIZE ];
+ _data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
Arrays.fill(_data, _default_value);
new LongField(_signature_offset, _signature, _data);
new IntegerField(0x08, 0, _data);
@@ -115,15 +115,15 @@
new IntegerField(0x28, 0, _data);
_bat_count = new IntegerField(_bat_count_offset, 0, _data);
_property_start = new IntegerField(_property_start_offset,
- PoiFSConstants.END_OF_CHAIN,
+ POIFSConstants.END_OF_CHAIN,
_data);
new IntegerField(0x34, 0, _data);
new IntegerField(0x38, 0x1000, _data);
_sbat_start = new IntegerField(_sbat_start_offset,
- PoiFSConstants.END_OF_CHAIN, _data);
+ POIFSConstants.END_OF_CHAIN, _data);
new IntegerField(0x40, 1, _data);
_xbat_start = new IntegerField(_xbat_start_offset,
- PoiFSConstants.END_OF_CHAIN, _data);
+ POIFSConstants.END_OF_CHAIN, _data);
_xbat_count = new IntegerField(_xbat_count_offset, 0, _data);
}
@@ -170,7 +170,7 @@
else
{
rvalue = BATBlock.createXBATBlocks(new int[ 0 ], 0);
- _xbat_start.set(PoiFSConstants.END_OF_CHAIN, _data);
+ _xbat_start.set(POIFSConstants.END_OF_CHAIN, _data);
}
_xbat_count.set(rvalue.length, _data);
return rvalue;
1.2 +2 -2
jakarta-poi/src/java/org/apache/poi/poifs/storage/PropertyBlock.java
Index: PropertyBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/PropertyBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyBlock.java 31 Jan 2002 02:23:46 -0000 1.1
+++ PropertyBlock.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.property.Property;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
@@ -75,7 +75,7 @@
extends BigBlock
{
private static final int _properties_per_block =
- PoiFSConstants.BIG_BLOCK_SIZE / PoiFSConstants.PROPERTY_SIZE;
+ POIFSConstants.BIG_BLOCK_SIZE / POIFSConstants.PROPERTY_SIZE;
private Property[] _properties;
/**
1.2 +4 -4
jakarta-poi/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
Index: RawDataBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/RawDataBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RawDataBlock.java 31 Jan 2002 02:23:46 -0000 1.1
+++ RawDataBlock.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -55,7 +55,7 @@
package org.apache.poi.poifs.storage;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import java.io.*;
@@ -83,21 +83,21 @@
public RawDataBlock(final InputStream stream)
throws IOException
{
- _data = new byte[ PoiFSConstants.BIG_BLOCK_SIZE ];
+ _data = new byte[ POIFSConstants.BIG_BLOCK_SIZE ];
int count = stream.read(_data);
if (count == -1)
{
_eof = true;
}
- else if (count != PoiFSConstants.BIG_BLOCK_SIZE)
+ else if (count != POIFSConstants.BIG_BLOCK_SIZE)
{
String type = " byte" + ((count == 1) ? ("")
: ("s"));
throw new IOException("Unable to read entire block; " + count
+ type + " read; expected "
- + PoiFSConstants.BIG_BLOCK_SIZE + " bytes");
+ + POIFSConstants.BIG_BLOCK_SIZE + " bytes");
}
else
{
1.2 +2 -2
jakarta-poi/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java
Index: SmallDocumentBlock.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/java/org/apache/poi/poifs/storage/SmallDocumentBlock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SmallDocumentBlock.java 31 Jan 2002 02:23:46 -0000 1.1
+++ SmallDocumentBlock.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -59,7 +59,7 @@
import java.util.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
/**
* Storage for documents that are too small to use regular
@@ -75,7 +75,7 @@
private static final byte _default_fill = ( byte ) 0xff;
private static final int _block_size = 64;
private static final int _blocks_per_big_block =
- PoiFSConstants.BIG_BLOCK_SIZE / _block_size;
+ POIFSConstants.BIG_BLOCK_SIZE / _block_size;
private SmallDocumentBlock(final byte [] data, final int index)
{
1.5 +12 -1
jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
Index: TestCellStyle.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestCellStyle.java 18 Feb 2002 11:59:08 -0000 1.4
+++ TestCellStyle.java 15 Mar 2002 02:47:56 -0000 1.5
@@ -135,7 +135,7 @@
}
/**
- * Tests that is creating a file with a date works correctly.
+ * Tests that is creating a file with a date or an calendar works correctly.
*/
public void testDataStyle()
throws Exception
@@ -147,10 +147,21 @@
HSSFSheet s = wb.createSheet();
HSSFCellStyle cs = wb.createCellStyle();
HSSFRow row = s.createRow((short)0);
+
+ // with Date:
HSSFCell cell = row.createCell((short)1);
cs.setDataFormat(HSSFDataFormat.getFormat("m/d/yy"));
cell.setCellStyle(cs);
cell.setCellValue(new Date());
+
+ // with Calendar:
+ cell = row.createCell((short)2);
+ cs.setDataFormat(HSSFDataFormat.getFormat("m/d/yy"));
+ cell.setCellStyle(cs);
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cell.setCellValue(cal);
+
wb.write(out);
out.close();
1.2 +1 -1
jakarta-poi/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
Index: TestDirectoryProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestDirectoryProperty.java 31 Jan 2002 02:23:52 -0000 1.1
+++ TestDirectoryProperty.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -61,7 +61,7 @@
import junit.framework.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
/**
* Class to test DirectoryProperty functionality
1.2 +2 -2
jakarta-poi/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
Index: TestRootProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRootProperty.java 31 Jan 2002 02:23:52 -0000 1.1
+++ TestRootProperty.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -61,7 +61,7 @@
import junit.framework.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
/**
* Class to test RootProperty functionality
@@ -124,7 +124,7 @@
{
_testblock[ index ] = ( byte ) 0;
}
- _testblock[ index++ ] = ( byte ) PoiFSConstants.END_OF_CHAIN;
+ _testblock[ index++ ] = ( byte ) POIFSConstants.END_OF_CHAIN;
for (; index < 0x78; index++)
{
_testblock[ index ] = ( byte ) 0xff;
1.2 +2 -2
jakarta-poi/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java
Index: TestBlockAllocationTableReader.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBlockAllocationTableReader.java 31 Jan 2002 02:23:52 -0000 1.1
+++ TestBlockAllocationTableReader.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -61,7 +61,7 @@
import junit.framework.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -1254,7 +1254,7 @@
else if (i % 256 == 255)
{
assertEquals("Verify end of chain for block " + i,
- PoiFSConstants.END_OF_CHAIN,
+ POIFSConstants.END_OF_CHAIN,
table.getNextBlockIndex(i));
}
else
1.2 +3 -3
jakarta-poi/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java
Index: TestBlockAllocationTableWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/poifs/storage/TestBlockAllocationTableWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBlockAllocationTableWriter.java 31 Jan 2002 02:23:52 -0000 1.1
+++ TestBlockAllocationTableWriter.java 15 Mar 2002 02:47:56 -0000 1.2
@@ -61,7 +61,7 @@
import junit.framework.*;
-import org.apache.poi.poifs.common.PoiFSConstants;
+import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
@@ -189,7 +189,7 @@
offset += LittleEndianConsts.INT_SIZE;
}
LittleEndian.putInt(expected, offset,
- PoiFSConstants.END_OF_CHAIN);
+ POIFSConstants.END_OF_CHAIN);
offset += 4;
block_index++;
}
@@ -197,7 +197,7 @@
// add BAT block indices
LittleEndian.putInt(expected, offset, block_index++);
offset += LittleEndianConsts.INT_SIZE;
- LittleEndian.putInt(expected, offset, PoiFSConstants.END_OF_CHAIN);
+ LittleEndian.putInt(expected, offset, POIFSConstants.END_OF_CHAIN);
for (int k = 0; k < expected.length; k++)
{
assertEquals("At offset " + k, expected[ k ], output[ k ]);
