Return-Path: Delivered-To: apmail-poi-commits-archive@locus.apache.org Received: (qmail 39658 invoked from network); 30 Sep 2008 06:19:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Sep 2008 06:19:16 -0000 Received: (qmail 39240 invoked by uid 500); 30 Sep 2008 06:19:14 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 39199 invoked by uid 500); 30 Sep 2008 06:19:14 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 39179 invoked by uid 99); 30 Sep 2008 06:19:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 23:19:14 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2008 06:18:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF5C323889C4; Mon, 29 Sep 2008 23:18:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r700356 [2/3] - in /poi/trunk/src: java/org/apache/poi/hssf/eventusermodel/dummyrecord/ java/org/apache/poi/hssf/record/ testcases/org/apache/poi/hssf/usermodel/ Date: Tue, 30 Sep 2008 06:18:48 -0000 To: commits@poi.apache.org From: josh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080930061853.BF5C323889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java Mon Sep 29 23:18:44 2008 @@ -42,18 +42,8 @@ { } - /** - * Constructs an HideObj record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public HideObjRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_hide_obj = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java Mon Sep 29 23:18:44 2008 @@ -131,16 +131,6 @@ } /** - * Read hyperlink from input stream - * - * @param in the stream to read from - */ - public HyperlinkRecord(RecordInputStream in) - { - super(in); - } - - /** * Return the column of the first cell that contains the hyperlink * * @return the 0-based column of the first cell that contains the hyperlink @@ -315,7 +305,7 @@ /** * @param in the RecordInputstream to read the record from */ - protected void fillFields(RecordInputStream in) + public HyperlinkRecord(RecordInputStream in) { try { rwFirst = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java Mon Sep 29 23:18:44 2008 @@ -48,18 +48,8 @@ { } - /** - * Constructs an Index record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public IndexRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_5_dbcells = new IntList(DBCELL_CAPACITY); // initial capacity of 30 field_1_zero = in.readInt(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,42 +14,31 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; import org.apache.poi.util.LittleEndian; /** - * Title: Interface End Record

+ * Title: Interface End Record (0x00E2)

* Description: Shows where the Interface Records end (MMS) * (has no fields)

* REFERENCE: PG 324 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)

* @author Andrew C. Oliver (acoliver at apache dot org) * @version 2.0-pre */ - -public class InterfaceEndRecord - extends Record -{ - public final static short sid = 0xe2; +public final class InterfaceEndRecord extends Record { + public final static short sid = 0x00E2; public InterfaceEndRecord() { } /** - * Constructs an InterfaceEnd record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from + * @param in unused (since this record has no data) */ - public InterfaceEndRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { } public String toString() Modified: poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java Mon Sep 29 23:18:44 2008 @@ -45,18 +45,8 @@ { } - /** - * Constructs an Codepage record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public InterfaceHdrRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_codepage = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java Mon Sep 29 23:18:44 2008 @@ -43,18 +43,8 @@ { } - /** - * Constructs an Iteration record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public IterationRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_iteration = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java Mon Sep 29 23:18:44 2008 @@ -44,20 +44,10 @@ } /** - * Constructs an Label record and sets its fields appropriately. - * * @param in the RecordInputstream to read the record from */ public LabelRecord(RecordInputStream in) { - super(in); - } - - /** - * @param in the RecordInputstream to read the record from - */ - protected void fillFields(RecordInputStream in) - { field_1_row = in.readUShort(); field_2_column = in.readShort(); field_3_xf_index = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java Mon Sep 29 23:18:44 2008 @@ -40,17 +40,8 @@ { } - /** - * Constructs an LabelSST record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ public LabelSSTRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_row = in.readUShort(); field_2_column = in.readUShort(); field_3_xf_index = in.readUShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java Mon Sep 29 23:18:44 2008 @@ -31,15 +31,7 @@ public LeftMarginRecord() { } - /** - * Constructs a LeftMargin record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ public LeftMarginRecord(RecordInputStream in) - { super(in); } - - protected void fillFields(RecordInputStream in) { field_1_margin = in.readDouble(); } @@ -93,4 +85,4 @@ rec.field_1_margin = this.field_1_margin; return rec; } -} // END OF CLASS \ No newline at end of file +} // END OF CLAS \ No newline at end of file Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java Mon Sep 29 23:18:44 2008 @@ -62,20 +62,8 @@ } - /** - * Constructs a Legend record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public LegendRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_xAxisUpperLeft = in.readInt(); field_2_yAxisUpperLeft = in.readInt(); field_3_xSize = in.readInt(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java Mon Sep 29 23:18:44 2008 @@ -61,20 +61,8 @@ } - /** - * Constructs a LineFormat record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public LineFormatRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_lineColor = in.readInt(); field_2_linePattern = in.readShort(); field_3_weight = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataFormulaField.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataFormulaField.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataFormulaField.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataFormulaField.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -31,9 +29,7 @@ * * @author Glen Stampoultzis (glens at apache.org) */ -public class LinkedDataFormulaField - implements CustomField -{ +public final class LinkedDataFormulaField implements CustomField { Stack formulaTokens = new Stack(); public int getSize() Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java Mon Sep 29 23:18:44 2008 @@ -54,20 +54,8 @@ } - /** - * Constructs a LinkedData record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public LinkedDataRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_linkType = in.readByte(); field_2_referenceType = in.readByte(); field_3_options = in.readShort(); @@ -142,7 +130,7 @@ rec.field_2_referenceType = field_2_referenceType; rec.field_3_options = field_3_options; rec.field_4_indexNumberFmtRecord = field_4_indexNumberFmtRecord; - rec.field_5_formulaOfLink = ((LinkedDataFormulaField)field_5_formulaOfLink.clone());; + rec.field_5_formulaOfLink = ((LinkedDataFormulaField)field_5_formulaOfLink.clone()); return rec; } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java Mon Sep 29 23:18:44 2008 @@ -41,18 +41,8 @@ { } - /** - * Constructs a MMS record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public MMSRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_addMenuCount = in.readByte(); field_2_delMenuCount = in.readByte(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java Mon Sep 29 23:18:44 2008 @@ -56,9 +56,6 @@ _startIndex = 0; _regions = cras; } - protected void fillFields(RecordInputStream in) { - throw new RuntimeException("obsolete"); - } /** * get the number of merged areas. If this drops down to 0 you should just go * ahead and delete the record. Modified: poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java Mon Sep 29 23:18:44 2008 @@ -53,17 +53,6 @@ } /** - * Constructs a MulBlank record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - - public MulBlankRecord(RecordInputStream in) - { - super(in); - } - - /** * get the row number of the cells this represents * * @return row number @@ -119,7 +108,7 @@ /** * @param in the RecordInputstream to read the record from */ - protected void fillFields(RecordInputStream in) + public MulBlankRecord(RecordInputStream in) { //field_1_row = LittleEndian.getShort(data, 0 + offset); field_1_row = in.readUShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java Mon Sep 29 23:18:44 2008 @@ -37,15 +37,6 @@ private RkRec[] field_3_rks; private short field_4_last_col; - /** - * Constructs a MulRK record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public MulRKRecord(RecordInputStream in) { - super(in); - } - public int getRow() { return field_1_row; } @@ -93,7 +84,7 @@ /** * @param in the RecordInputstream to read the record from */ - protected void fillFields(RecordInputStream in) { + public MulRKRecord(RecordInputStream in) { field_1_row = in.readUShort(); field_2_first_col = in.readShort(); field_3_rks = RkRec.parseRKs(in); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java Mon Sep 29 23:18:44 2008 @@ -108,15 +108,6 @@ } /** - * Constructs a Name record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public NameRecord(RecordInputStream in) { - super(in); - } - - /** * Constructor to create a built-in named region * @param builtin Built-in byte representation for the name record, use the public constants */ @@ -539,7 +530,7 @@ * * @param in the RecordInputstream to read the record from */ - protected void fillFields(RecordInputStream in) { + public NameRecord(RecordInputStream in) { field_1_option_flag = in.readShort(); field_2_keyboard_shortcut = in.readByte(); int field_3_length_name_text = in.readByte(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java Mon Sep 29 23:18:44 2008 @@ -54,18 +54,6 @@ } /** - * Constructs a NoteRecord and fills its fields - * from the supplied RecordInputStream. - * - * @param in the stream to read from - */ - public NoteRecord(RecordInputStream in) - { - super(in); - - } - - /** * @return id of this record. */ public short getSid() @@ -76,7 +64,7 @@ /** * Read the record data from the supplied RecordInputStream */ - protected void fillFields(RecordInputStream in) + public NoteRecord(RecordInputStream in) { field_1_row = in.readShort(); field_2_col = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java Mon Sep 29 23:18:44 2008 @@ -46,19 +46,9 @@ } /** - * Constructs a NoteStructureSubRecord and sets its fields appropriately. - * - */ - public NoteStructureSubRecord(RecordInputStream in) - { - super(in); - - } - - /** * Read the record data from the supplied RecordInputStream */ - protected void fillFields(RecordInputStream in) + public NoteStructureSubRecord(RecordInputStream in) { //just grab the raw data reserved = in.readRemainder(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java Mon Sep 29 23:18:44 2008 @@ -42,20 +42,8 @@ } - /** - * Constructs a NumberFormatIndex record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public NumberFormatIndexRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_formatIndex = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java Mon Sep 29 23:18:44 2008 @@ -41,20 +41,10 @@ } /** - * Constructs a Number record and sets its fields appropriately. - * * @param in the RecordInputstream to read the record from */ public NumberRecord(RecordInputStream in) { - super(in); - } - - /** - * @param in the RecordInputstream to read the record from - */ - protected void fillFields(RecordInputStream in) - { field_1_row = in.readUShort(); field_2_col = in.readUShort(); field_3_xf = in.readUShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java Mon Sep 29 23:18:44 2008 @@ -43,19 +43,8 @@ // TODO - ensure 2 sub-records (ftCmo 15h, and ftEnd 00h) are always created } - /** - * Constructs a OBJ record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public ObjRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { // TODO - problems with OBJ sub-records stream // MS spec says first sub-records is always CommonObjectDataSubRecord, and last is // always EndSubRecord. OOO spec does not mention ObjRecord(0x005D). Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java Mon Sep 29 23:18:44 2008 @@ -49,20 +49,8 @@ } - /** - * Constructs a ObjectLink record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public ObjectLinkRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_anchorId = in.readShort(); field_2_link1 = in.readShort(); field_3_link2 = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java Mon Sep 29 23:18:44 2008 @@ -41,18 +41,8 @@ { } - /** - * Constructs a Protect record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public ObjectProtectRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_protect = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java Mon Sep 29 23:18:44 2008 @@ -83,11 +83,7 @@ _breakMap = new HashMap(); } - protected PageBreakRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) + public PageBreakRecord(RecordInputStream in) { int nBreaks = in.readShort(); _breaks = new ArrayList(nBreaks + 2); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java Mon Sep 29 23:18:44 2008 @@ -48,18 +48,8 @@ createDefaultPalette(); } - /** - * Constructs a PaletteRecord record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PaletteRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_numcolors = in.readShort(); field_2_colors = new ArrayList(field_1_numcolors); for (int k = 0; k < field_1_numcolors; k++) { Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java Mon Sep 29 23:18:44 2008 @@ -49,20 +49,8 @@ } - /** - * Constructs a Pane record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public PaneRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_x = in.readShort(); field_2_y = in.readShort(); field_3_topRow = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java Mon Sep 29 23:18:44 2008 @@ -36,16 +36,7 @@ public PasswordRecord() { } - /** - * Constructs a Password record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PasswordRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) { field_1_password = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java Mon Sep 29 23:18:44 2008 @@ -40,18 +40,8 @@ { } - /** - * Constructs a PasswordRev4 (PROT4REVPASS) record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PasswordRev4Record(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_password = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,13 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; - - -import org.apache.poi.util.*; +import org.apache.poi.util.LittleEndian; /** * preceeds and identifies a frame as belonging to the plot area. @@ -30,9 +26,7 @@ * @author Andrew C. Oliver (acoliver at apache.org) */ -public class PlotAreaRecord - extends Record -{ +public final class PlotAreaRecord extends Record { public final static short sid = 0x1035; @@ -42,19 +36,10 @@ } /** - * Constructs a PlotArea record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from + * @param in unused (since this record has no data) */ - public PlotAreaRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java Mon Sep 29 23:18:44 2008 @@ -43,20 +43,8 @@ } - /** - * Constructs a PlotGrowth record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public PlotGrowthRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_horizontalScale = in.readInt(); field_2_verticalScale = in.readInt(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java Mon Sep 29 23:18:44 2008 @@ -40,18 +40,8 @@ { } - /** - * Constructs a Precision record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PrecisionRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_precision = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java Mon Sep 29 23:18:44 2008 @@ -40,18 +40,8 @@ { } - /** - * Constructs a PrintGridlines record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PrintGridlinesRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_print_gridlines = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java Mon Sep 29 23:18:44 2008 @@ -41,18 +41,8 @@ { } - /** - * Constructs a PrintHeaders record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PrintHeadersRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_print_headers = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java Mon Sep 29 23:18:44 2008 @@ -66,18 +66,8 @@ { } - /** - * Constructs a PrintSetup (SETUP) record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public PrintSetupRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_paper_size = in.readShort(); field_2_scale = in.readShort(); field_3_page_start = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java Mon Sep 29 23:18:44 2008 @@ -42,18 +42,8 @@ { } - /** - * Constructs a Protect record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public ProtectRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_protect = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java Mon Sep 29 23:18:44 2008 @@ -40,18 +40,8 @@ { } - /** - * Constructs a ProtectionRev4 record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public ProtectionRev4Record(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_protect = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java Mon Sep 29 23:18:44 2008 @@ -52,17 +52,8 @@ { } - /** - * Constructs a RK record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ public RKRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_row = in.readUShort(); field_2_col = in.readUShort(); field_3_xf_index = in.readUShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -37,9 +35,7 @@ * @see org.apache.poi.hssf.model.Workbook */ -public class RecalcIdRecord - extends Record -{ +public final class RecalcIdRecord extends Record { public final static short sid = 0x1c1; public short[] field_1_recalcids; @@ -49,18 +45,8 @@ { } - /** - * Constructs a RECALCID record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public RecalcIdRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_recalcids = new short[ in.remaining() / 2 ]; for (int k = 0; k < field_1_recalcids.length; k++) { @@ -118,9 +104,8 @@ short length = ( short ) (tabids.length * 2); int byteoffset = 4; - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, - (( short ) length)); + LittleEndian.putUShort(data, 0 + offset, sid); + LittleEndian.putUShort(data, 2 + offset, length); // 2 (num bytes in a short) for (int k = 0; k < (length / 2); k++) Modified: poi/trunk/src/java/org/apache/poi/hssf/record/Record.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/Record.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/Record.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/Record.java Mon Sep 29 23:18:44 2008 @@ -41,25 +41,6 @@ } /** - * Constructor Record - * - * @param in the RecordInputstream to read the record from - */ - protected Record(RecordInputStream in) - { - fillFields(in); - } - - /** - * called by the constructor, should set class level fields. Should throw - * runtime exception for bad/icomplete data. - * - * @param in the RecordInputstream to read the record from - */ - - protected abstract void fillFields(RecordInputStream in); - - /** * called by the class that is responsible for writing this sucker. * Subclasses should implement this so that their data is passed back in a * byte array. Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java Mon Sep 29 23:18:44 2008 @@ -42,18 +42,8 @@ { } - /** - * Constructs a RefMode record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public RefModeRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_mode = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java Mon Sep 29 23:18:44 2008 @@ -40,18 +40,8 @@ { } - /** - * Constructs a RefreshAll record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public RefreshAllRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_refreshall = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java Mon Sep 29 23:18:44 2008 @@ -30,13 +30,7 @@ public RightMarginRecord() { } - /** - * Constructs a RightMargin record and sets its fields appropriately. * * @param id id must be 0x27 or an exception * will be throw upon validation * @param size size the size of the data area of the record * @param data data of the record (should not contain sid/len) - */ public RightMarginRecord( RecordInputStream in ) - { super( in ); } - - protected void fillFields( RecordInputStream in ) { field_1_margin = in.readDouble(); } @@ -82,4 +76,4 @@ rec.field_1_margin = this.field_1_margin; return rec; } -} // END OF CLAS \ No newline at end of file +} // END OF CLA \ No newline at end of file Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java Mon Sep 29 23:18:44 2008 @@ -74,17 +74,8 @@ field_8_xf_index = ( short ) 0xf; } - /** - * Constructs a Row record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ public RowRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_row_number = in.readUShort(); field_2_first_col = in.readShort(); field_3_last_col = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java Mon Sep 29 23:18:44 2008 @@ -43,20 +43,8 @@ } - /** - * Constructs a SCL record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SCLRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_numerator = in.readShort(); field_2_denominator = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java Mon Sep 29 23:18:44 2008 @@ -91,17 +91,6 @@ } /** - * Constructs an SST record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - - public SSTRecord( RecordInputStream in ) - { - super( in ); - } - - /** * Add a string. * * @param string string to be added @@ -335,7 +324,7 @@ * @param in the RecordInputstream to read the record from */ - protected void fillFields( RecordInputStream in ) + public SSTRecord( RecordInputStream in ) { // this method is ALWAYS called after construction -- using // the nontrivial constructor, of course -- so this is where Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java Mon Sep 29 23:18:44 2008 @@ -40,18 +40,8 @@ { } - /** - * Constructs an SaveRecalc record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public SaveRecalcRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_recalc = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java Mon Sep 29 23:18:44 2008 @@ -42,18 +42,8 @@ { } - /** - * Constructs a Protect record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public ScenarioProtectRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_protect = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java Mon Sep 29 23:18:44 2008 @@ -51,15 +51,7 @@ }; } - /** - * Constructs a Selection record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ public SelectionRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) { field_1_pane = in.readByte(); field_2_row_active_cell = in.readUShort(); field_3_col_active_cell = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java Mon Sep 29 23:18:44 2008 @@ -42,20 +42,8 @@ } - /** - * Constructs a SeriesChartGroupIndex record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesChartGroupIndexRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_chartGroupIndex = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java Mon Sep 29 23:18:44 2008 @@ -42,20 +42,8 @@ } - /** - * Constructs a SeriesIndex record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesIndexRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_index = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java Mon Sep 29 23:18:44 2008 @@ -46,20 +46,8 @@ } - /** - * Constructs a SeriesLabels record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesLabelsRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_formatFlags = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesListRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesListRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesListRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesListRecord.java Mon Sep 29 23:18:44 2008 @@ -42,20 +42,8 @@ } - /** - * Constructs a SeriesList record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesListRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_seriesNumbers = in.readShortArray(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesRecord.java Mon Sep 29 23:18:44 2008 @@ -59,20 +59,8 @@ } - /** - * Constructs a Series record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_categoryDataType = in.readShort(); field_2_valuesDataType = in.readShort(); field_3_numCategories = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java Mon Sep 29 23:18:44 2008 @@ -45,20 +45,8 @@ } - /** - * Constructs a SeriesText record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesTextRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_id = in.readShort(); field_2_textLength = in.readByte(); field_3_undocumented = in.readByte(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java Mon Sep 29 23:18:44 2008 @@ -42,20 +42,8 @@ } - /** - * Constructs a SeriesToChartGroup record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SeriesToChartGroupRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_chartGroupIndex = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java Mon Sep 29 23:18:44 2008 @@ -86,10 +86,6 @@ return dataSize + 4; } - protected final void fillFields(RecordInputStream in) { - throw new RuntimeException("Should not be called. Fields are filled in constructor"); - } - /** * @return true if (rowIx, colIx) is within the range ({@link #getRange()}) * of this shared value object. Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java Mon Sep 29 23:18:44 2008 @@ -50,20 +50,8 @@ } - /** - * Constructs a SheetProperties record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public SheetPropertiesRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_flags = in.readShort(); field_2_empty = in.readByte(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java Mon Sep 29 23:18:44 2008 @@ -37,19 +37,9 @@ } /** - * Constructs a String record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public StringRecord(RecordInputStream in) - { - super(in); - } - - /** * @param in the RecordInputstream to read the record from */ - protected void fillFields( RecordInputStream in) + public StringRecord( RecordInputStream in) { field_1_string_length = in.readShort(); field_2_unicode_flag = in.readByte(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java Mon Sep 29 23:18:44 2008 @@ -54,18 +54,8 @@ { } - /** - * Constructs a Style record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public StyleRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_xf_index = in.readShort(); if (getType() == STYLE_BUILT_IN) { Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,23 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; /** * Subrecords are part of the OBJ class. */ -abstract public class SubRecord - extends Record -{ - public SubRecord() - { - } - - public SubRecord( RecordInputStream in ) - { - super( in ); +abstract public class SubRecord extends Record { + protected SubRecord() { } public static Record createSubRecord(RecordInputStream in) Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java Mon Sep 29 23:18:44 2008 @@ -66,17 +66,6 @@ _isAddInFunctions = false; } - /** - * Constructs a Extern Sheet record and sets its fields appropriately. - * - * @param id id must be 0x16 or an exception will be throw upon validation - * @param size the size of the data area of the record - * @param data data of the record (should not contain sid/len) - */ - public SupBookRecord(RecordInputStream in) { - super(in); - } - public boolean isExternalReferences() { return field_3_sheet_names != null; } @@ -94,7 +83,7 @@ * @param size size of data * @param offset of the record's data (provided a big array of the file) */ - protected void fillFields(RecordInputStream in) { + public SupBookRecord(RecordInputStream in) { field_1_number_of_sheets = in.readShort(); if(in.getLength() > SMALL_RECORD_SIZE) { Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -29,10 +27,7 @@ * @author Andrew C. Oliver (acoliver at apache dot org) * @version 2.0-pre */ - -public class TabIdRecord - extends Record -{ +public final class TabIdRecord extends Record { public final static short sid = 0x13d; public short[] field_1_tabids; @@ -40,18 +35,8 @@ { } - /** - * Constructs a TabID record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public TabIdRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_tabids = new short[ in.remaining() / 2 ]; for (int k = 0; k < field_1_tabids.length; k++) { @@ -97,13 +82,12 @@ public int serialize(int offset, byte [] data) { - short[] tabids = getTabIdArray(); - short length = ( short ) (tabids.length * 2); - int byteoffset = 4; - - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, - (( short ) length)); // nubmer tabids * + short[] tabids = getTabIdArray(); + int length = tabids.length * 2; + int byteoffset = 4; + + LittleEndian.putUShort(data, 0 + offset, sid); + LittleEndian.putUShort(data, 2 + offset, length); // nubmer tabids * // 2 (num bytes in a short) for (int k = 0; k < (length / 2); k++) Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java Mon Sep 29 23:18:44 2008 @@ -69,20 +69,8 @@ } - /** - * Constructs a TextObjectBase record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public TextObjectBaseRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_options = in.readShort(); field_2_textOrientation = in.readShort(); field_3_reserved4 = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java Mon Sep 29 23:18:44 2008 @@ -17,11 +17,11 @@ package org.apache.poi.hssf.record; +import java.io.UnsupportedEncodingException; + import org.apache.poi.hssf.usermodel.HSSFRichTextString; -import org.apache.poi.util.LittleEndian; import org.apache.poi.util.HexDump; -import java.io.UnsupportedEncodingException; -import java.io.ByteArrayOutputStream; +import org.apache.poi.util.LittleEndian; public class TextObjectRecord extends TextObjectBaseRecord @@ -35,13 +35,7 @@ public TextObjectRecord( RecordInputStream in ) { super( in ); - if (str == null) - str = new HSSFRichTextString(""); - } - protected void fillFields(RecordInputStream in) - { - super.fillFields(in); if (getTextLength() > 0) { if (in.isContinueNext() && in.remaining() == 0) { //1st Continue @@ -56,6 +50,8 @@ processFontRuns(in); } else throw new RecordFormatException("Expected Continue Record to hold font runs for TextObjectRecord"); } + if (str == null) + str = new HSSFRichTextString(""); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TextRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TextRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/TextRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/TextRecord.java Mon Sep 29 23:18:44 2008 @@ -93,20 +93,8 @@ } - /** - * Constructs a Text record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public TextRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_horizontalAlignment = in.readByte(); field_2_verticalAlignment = in.readByte(); field_3_displayMode = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TickRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TickRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/TickRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/TickRecord.java Mon Sep 29 23:18:44 2008 @@ -56,20 +56,8 @@ } - /** - * Constructs a Tick record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public TickRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_majorTickType = in.readByte(); field_2_minorTickType = in.readByte(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java Mon Sep 29 23:18:44 2008 @@ -33,17 +33,9 @@ public TopMarginRecord() { } /** - * Constructs a TopMargin record and sets its fields appropriately. - * * @param in the RecordInputstream to read the record from */ public TopMarginRecord( RecordInputStream in ) - { super( in ); } - - /** - * @param in the RecordInputstream to read the record from - */ - protected void fillFields( RecordInputStream in ) { field_1_margin = in.readDouble(); } @@ -89,4 +81,4 @@ rec.field_1_margin = this.field_1_margin; return rec; } -} // END OF CLASS \ No newline at end of file +} // END OF CLAS \ No newline at end of file Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java Mon Sep 29 23:18:44 2008 @@ -37,19 +37,13 @@ */ public UncalcedRecord() { } - /** - * read constructor - */ - public UncalcedRecord(RecordInputStream in) { - super(in); - } public short getSid() { return sid; } - protected void fillFields(RecordInputStream in) { - short unused = in.readShort(); + public UncalcedRecord(RecordInputStream in) { + in.readShort(); // unused } public String toString() { @@ -60,9 +54,9 @@ } public int serialize(int offset, byte[] data) { - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, (short) 2); - LittleEndian.putShort(data, 4 + offset, (short) 0); // unused + LittleEndian.putUShort(data, 0 + offset, sid); + LittleEndian.putUShort(data, 2 + offset, 2); + LittleEndian.putUShort(data, 4 + offset, 0); // unused return getRecordSize(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UnicodeString.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UnicodeString.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/UnicodeString.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/UnicodeString.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -225,9 +223,7 @@ throw new RecordFormatException("Expected continue record."); } if (isCompressed) { - //Typecast direct to char from byte with high bit set causes all ones - //in the high byte of the char (which is of course incorrect) - char ch = (char)( (short)0xff & (short)in.readByte() ); + char ch = (char)in.readUByte(); // avoid sex tmpString.append(ch); } else { char ch = (char) in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UnitsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UnitsRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/UnitsRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/UnitsRecord.java Mon Sep 29 23:18:44 2008 @@ -42,19 +42,8 @@ } - /** - * Constructs a Units record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ public UnitsRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_units = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java Mon Sep 29 23:18:44 2008 @@ -269,11 +269,6 @@ return false; } - protected final void fillFields(RecordInputStream in) { - throw new RecordFormatException( - "Unknown record cannot be constructed via offset -- we need a copy of the data"); - } - public final Object clone() { // immutable - ok to return this return this; Modified: poi/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java Mon Sep 29 23:18:44 2008 @@ -42,18 +42,8 @@ { } - /** - * Constructs a UseSelFS record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public UseSelFSRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_flag = in.readShort(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -30,28 +28,16 @@ * @version 2.0-pre */ -public class VCenterRecord - extends Record -{ +public final class VCenterRecord extends Record { public final static short sid = 0x84; - private short field_1_vcenter; + private int field_1_vcenter; public VCenterRecord() { } - /** - * Constructs a VCENTER record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public VCenterRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_vcenter = in.readShort(); } @@ -62,14 +48,7 @@ public void setVCenter(boolean hc) { - if (hc == true) - { - field_1_vcenter = 1; - } - else - { - field_1_vcenter = 0; - } + field_1_vcenter = hc ? 1 : 0; } /** @@ -95,9 +74,9 @@ public int serialize(int offset, byte [] data) { - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, ( short ) 0x2); - LittleEndian.putShort(data, 4 + offset, ( short ) field_1_vcenter); + LittleEndian.putUShort(data, 0 + offset, sid); + LittleEndian.putUShort(data, 2 + offset, 0x2); + LittleEndian.putUShort(data, 4 + offset, field_1_vcenter); return getRecordSize(); } Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java Mon Sep 29 23:18:44 2008 @@ -55,20 +55,8 @@ } - /** - * Constructs a ValueRange record and sets its fields appropriately. - * - * @param in the RecordInputstream to read the record from - */ - public ValueRangeRecord(RecordInputStream in) { - super(in); - - } - - protected void fillFields(RecordInputStream in) - { field_1_minimumAxisValue = in.readDouble(); field_2_maximumAxisValue = in.readDouble(); field_3_majorIncrement = in.readDouble(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -33,56 +31,34 @@ * @author Jason Height (jheight at chariot dot net dot au) * @version 2.0-pre */ - -public class WSBoolRecord - extends Record -{ +public final class WSBoolRecord extends Record { public final static short sid = 0x81; private byte field_1_wsbool; // crappy names are because this is really one big short field (2byte) - private byte field_2_wsbool; // but the docs inconsistantly use it as 2 seperate bytes + private byte field_2_wsbool; // but the docs inconsistently use it as 2 separate bytes - // I decided to be consistant in this way. - static final private BitField autobreaks = - BitFieldFactory.getInstance(0x01); // are automatic page breaks visible + // I decided to be consistent in this way. + private static final BitField autobreaks = BitFieldFactory.getInstance(0x01); // are automatic page breaks visible // bits 1 to 3 unused - static final private BitField dialog = - BitFieldFactory.getInstance(0x10); // is sheet dialog sheet - static final private BitField applystyles = - BitFieldFactory.getInstance(0x20); // whether to apply automatic styles to outlines - static final private BitField rowsumsbelow = BitFieldFactory.getInstance( - 0x40); // whether summary rows will appear below detail in outlines - static final private BitField rowsumsright = BitFieldFactory.getInstance( - 0x80); // whether summary rows will appear right of the detail in outlines - static final private BitField fittopage = - BitFieldFactory.getInstance(0x01); // whether to fit stuff to the page + private static final BitField dialog = BitFieldFactory.getInstance(0x10); // is sheet dialog sheet + private static final BitField applystyles = BitFieldFactory.getInstance(0x20); // whether to apply automatic styles to outlines + private static final BitField rowsumsbelow = BitFieldFactory.getInstance(0x40); // whether summary rows will appear below detail in outlines + private static final BitField rowsumsright = BitFieldFactory.getInstance(0x80); // whether summary rows will appear right of the detail in outlines + private static final BitField fittopage = BitFieldFactory.getInstance(0x01); // whether to fit stuff to the page // bit 2 reserved - static final private BitField displayguts = BitFieldFactory.getInstance( - 0x06); // whether to display outline symbols (in the gutters) + private static final BitField displayguts = BitFieldFactory.getInstance(0x06); // whether to display outline symbols (in the gutters) // bits 4-5 reserved - static final private BitField alternateexpression = // whether to use alternate expression eval - BitFieldFactory.getInstance(0x40); - static final private BitField alternateformula = // whether to use alternate formula entry - BitFieldFactory.getInstance(0x80); + private static final BitField alternateexpression = BitFieldFactory.getInstance(0x40); // whether to use alternate expression eval + private static final BitField alternateformula = BitFieldFactory.getInstance(0x80); // whether to use alternate formula entry public WSBoolRecord() { } - /** - * Constructs a WSBool record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public WSBoolRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { byte data[] = in.readRemainder(); field_1_wsbool = data[ 1 ]; // backwards because theoretically this is one short field Modified: poi/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java Mon Sep 29 23:18:44 2008 @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record; @@ -32,10 +30,7 @@ * @author Andrew C. Oliver (acoliver at apache dot org) * @version 2.0-pre */ - -public class WindowOneRecord - extends Record -{ +public final class WindowOneRecord extends Record { public final static short sid = 0x3d; // our variable names stolen from old TV sets. @@ -66,18 +61,8 @@ { } - /** - * Constructs a WindowOne record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public WindowOneRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_h_hold = in.readShort(); field_2_v_hold = in.readShort(); field_3_width = in.readShort(); Modified: poi/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java?rev=700356&r1=700355&r2=700356&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java (original) +++ poi/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java Mon Sep 29 23:18:44 2008 @@ -39,18 +39,8 @@ { } - /** - * Constructs a WindowProtect record and sets its fields appropriately. - * @param in the RecordInputstream to read the record from - */ - public WindowProtectRecord(RecordInputStream in) { - super(in); - } - - protected void fillFields(RecordInputStream in) - { field_1_protect = in.readShort(); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org