Index: src/java/org/apache/poi/hssf/model/Workbook.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/model/Workbook.java,v
--- src/java/org/apache/poi/hssf/model/Workbook.java 21 Jul 2002 03:03:57 -0000 1.13
+++ src/java/org/apache/poi/hssf/model/Workbook.java 26 Jul 2002 01:58:48 -0000
@@ -84,6 +84,7 @@
* Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
* before even attempting to use this.
*
+ * @author Shawn Laubach (shawnlaubach at cox.net) (Data Formats)
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Glen Stampoultzis (glens at apache.org)
* @author Sergei Kozello (sergeikozello at mail.ru)
@@ -128,6 +129,8 @@
*/
+
+ protected ArrayList formats = new ArrayList();
protected ArrayList boundsheets = new ArrayList();
protected ArrayList names = new ArrayList();
@@ -150,6 +153,8 @@
0; // holds the position of last name record
private int supbookpos =
0; // holds the position of sup book
+ private short maxformatid =
+ -1; // holds the max format id
private static POILogger log =
POILogFactory.getLogger(Workbook.class);
@@ -238,7 +243,11 @@
log.log(DEBUG, "found SupBook record at " + k);
retval.supbookpos = k;
break;
-
+ case FormatRecord.sid :
+ log.log(DEBUG, "found format record at " + k);
+ retval.formats.add(rec);
+ retval.maxformatid = retval.maxformatid >= ((FormatRecord)rec).getIndexCode() ? retval.maxformatid : ((FormatRecord)rec).getIndexCode();
+ break;
default :
}
records.add(rec);
@@ -263,6 +272,9 @@
log.log(DEBUG, "creating new workbook from scratch");
Workbook retval = new Workbook();
ArrayList records = new ArrayList(30);
+ ArrayList formats = new ArrayList(8);
+ Record rec;
+ int i;
records.add(retval.createBOF());
records.add(retval.createInterfaceHdr());
@@ -293,14 +305,13 @@
records.add(retval.createFont());
retval.fontpos = records.size() - 1; // last font record postion
retval.numfonts = 4;
- records.add(retval.createFormat(0));
- records.add(retval.createFormat(1));
- records.add(retval.createFormat(2));
- records.add(retval.createFormat(3));
- records.add(retval.createFormat(4));
- records.add(retval.createFormat(5));
- records.add(retval.createFormat(6));
- records.add(retval.createFormat(7));
+ for (i = 0; i <= 7; i++) {
+ rec = retval.createFormat(i);
+ retval.maxformatid = retval.maxformatid >= ((FormatRecord)rec).getIndexCode() ? retval.maxformatid : ((FormatRecord)rec).getIndexCode();
+ formats.add(rec);
+ records.add(rec);
+ }
+ retval.formats = formats;
for (int k = 0; k < 21; k++) {
records.add(retval.createExtendedFormat(k));
retval.numxfs++;
@@ -1790,11 +1801,57 @@
SupBookRecord supbook = new SupBookRecord();
supbook.setNumberOfSheets((short)getNumSheets());
+
//supbook.setFlag();
records.add(supbookpos + 1 , supbook);
-
- return rec;
+
+ return rec;
+ }
+
+ /**
+ * Returns a format index that matches the passed in format. It does not tie into HSSFDataFormat.
+ * @param format the format string
+ * @param createIfNotFound creates a new format if format not found
+ * @return the format id of a format that matches or -1 if none found and createIfNotFound
+ */
+ public short getFormat(String format, boolean createIfNotFound) {
+ Iterator iterator;
+ for (iterator = formats.iterator(); iterator.hasNext();) {
+ FormatRecord r = (FormatRecord)iterator.next();
+ if (r.getFormatString().equals(format)) {
+ return r.getIndexCode();
+ }
+ }
+
+ if (createIfNotFound) {
+ return createFormat(format);
+ }
+
+ return -1;
+ }
+
+ /**
+ * Creates a FormatRecord, inserts it, and returns the index code.
+ * @param format the format string
+ * @return the index code of the format record.
+ * @see org.apache.poi.hssf.record.FormatRecord
+ * @see org.apache.poi.hssf.record.Record
+ */
+ public short createFormat(String format) {
+ FormatRecord rec = new FormatRecord();
+ maxformatid = maxformatid >= (short)0xa4 ? (short)(maxformatid + 1) : (short)0xa4; //Starting value from M$ empiracle study.
+ rec.setIndexCode(maxformatid);
+ rec.setFormatStringLength((byte)format.length());
+ rec.setFormatString(format);
+
+ int pos = 0;
+ while (pos < records.size() && ((Record)records.get(pos)).getSid() != FormatRecord.sid)
+ pos++;
+ pos += formats.size();
+ formats.add(rec);
+ records.add(pos, rec);
+ return maxformatid;
}
@@ -1804,6 +1861,22 @@
public Record findFirstRecordBySid(short sid) {
for (Iterator iterator = records.iterator(); iterator.hasNext(); ) {
+ Record record = ( Record ) iterator.next();
+
+ if (record.getSid() == sid) {
+ return record;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the next occurance of a record matching a particular sid.
+ */
+ public Record findNextRecordBySid(short sid, int pos) {
+ Iterator iterator = records.iterator();
+ for (;pos > 0 && iterator.hasNext(); iterator.next(),pos--);
+ while (iterator.hasNext()) {
Record record = ( Record ) iterator.next();
if (record.getSid() == sid) {
Index: src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
===================================================================
RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java,v
--- src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java 31 Jan 2002 02:23:44 -0000 1.1.1.1
+++ src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java 26 Jul 2002 01:58:49 -0000
@@ -1,4 +1,3 @@
-
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -60,11 +59,16 @@
*/
package org.apache.poi.hssf.usermodel;
-import java.util.ArrayList;
+import java.util.Vector;
import java.util.List;
+import java.util.ListIterator;
+
+import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.record.Record;
+import org.apache.poi.hssf.record.FormatRecord;
/**
- * Utility to identify builin formats. The following is a list of the formats as
+ * Utility to identify builin formats. Now can handle user defined data formats also. The following is a list of the formats as
* returned by this class.