You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by jo...@apache.org on 2008/09/30 08:18:48 UTC
svn commit: r700356 [1/3] - in /poi/trunk/src:
java/org/apache/poi/hssf/eventusermodel/dummyrecord/
java/org/apache/poi/hssf/record/ testcases/org/apache/poi/hssf/usermodel/
Author: josh
Date: Mon Sep 29 23:18:44 2008
New Revision: 700356
URL: http://svn.apache.org/viewvc?rev=700356&view=rev
Log:
Refactored fillFields() method into constructor in Record class hierarchy
Modified:
poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/HideObjRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/IndexRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/IterationRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LegendRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LineFormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataFormulaField.java
poi/trunk/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/MMSRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/MulRKRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NoteRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NumberRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PaneRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
poi/trunk/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ProtectRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
poi/trunk/src/java/org/apache/poi/hssf/record/RKRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/Record.java
poi/trunk/src/java/org/apache/poi/hssf/record/RefModeRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/RowRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SCLRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SSTRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SelectionRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesListRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
poi/trunk/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/StringRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/StyleRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TabIdRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TextRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TickRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/UncalcedRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/UnicodeString.java
poi/trunk/src/java/org/apache/poi/hssf/record/UnitsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/UnknownRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/VCenterRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java Mon Sep 29 23:18:44 2008
@@ -18,7 +18,6 @@
package org.apache.poi.hssf.eventusermodel.dummyrecord;
import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordInputStream;
/**
* A dummy record to indicate that we've now had the last
@@ -47,15 +46,10 @@
*/
public int getLastColumnNumber() { return lastColumnNumber; }
- protected void fillFields(RecordInputStream in) {
- }
public short getSid() {
return -1;
}
public int serialize(int offset, byte[] data) {
return -1;
}
- protected void validateSid(short id) {
- }
-
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java Mon Sep 29 23:18:44 2008
@@ -18,7 +18,6 @@
package org.apache.poi.hssf.eventusermodel.dummyrecord;
import org.apache.poi.hssf.record.Record;
-import org.apache.poi.hssf.record.RecordInputStream;
/**
* A dummy record for when we're missing a cell in a row,
@@ -33,16 +32,12 @@
this.column = column;
}
- protected void fillFields(RecordInputStream in) {
- }
public short getSid() {
return -1;
}
public int serialize(int offset, byte[] data) {
return -1;
}
- protected void validateSid(short id) {
- }
public int getRow() { return row; }
public int getColumn() { return column; }
Modified: poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java Mon Sep 29 23:18:44 2008
@@ -31,16 +31,12 @@
this.rowNumber = rowNumber;
}
- protected void fillFields(RecordInputStream in) {
- }
public short getSid() {
return -1;
}
public int serialize(int offset, byte[] data) {
return -1;
}
- protected void validateSid(short id) {
- }
public int getRowNumber() {
return rowNumber;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java Mon Sep 29 23:18:44 2008
@@ -57,19 +57,8 @@
escherRecords = new ArrayList();
}
- /**
- * Constructs a Bar record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
public AbstractEscherHolderRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
escherRecords = new ArrayList();
if (! DESERIALISE )
{
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java Mon Sep 29 23:18:44 2008
@@ -48,20 +48,8 @@
}
- /**
- * Constructs a AreaFormat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AreaFormatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_foregroundColor = in.readInt();
field_2_backgroundColor = in.readInt();
field_3_pattern = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AreaRecord.java Mon Sep 29 23:18:44 2008
@@ -42,20 +42,8 @@
}
- /**
- * Constructs a Area record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AreaRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_formatFlags = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java Mon Sep 29 23:18:44 2008
@@ -46,20 +46,8 @@
}
- /**
- * Constructs a AxisLineFormat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisLineFormatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_axisType = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java Mon Sep 29 23:18:44 2008
@@ -57,20 +57,8 @@
}
- /**
- * Constructs a AxisOptions record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisOptionsRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_minimumCategory = in.readShort();
field_2_maximumCategory = in.readShort();
field_3_majorUnitValue = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AxisParentRecord.java Mon Sep 29 23:18:44 2008
@@ -48,20 +48,8 @@
}
- /**
- * Constructs a AxisParent record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisParentRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_axisType = in.readShort();
field_2_x = in.readInt();
field_3_y = in.readInt();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AxisRecord.java Mon Sep 29 23:18:44 2008
@@ -49,20 +49,8 @@
}
- /**
- * Constructs a Axis record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_axisType = in.readShort();
field_2_reserved1 = in.readInt();
field_3_reserved2 = in.readInt();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java Mon Sep 29 23:18:44 2008
@@ -42,20 +42,8 @@
}
- /**
- * Constructs a AxisUsed record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public AxisUsedRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_numAxis = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BOFRecord.java Mon Sep 29 23:18:44 2008
@@ -86,20 +86,8 @@
{
}
- /**
- * Constructs a BOFRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public BOFRecord(RecordInputStream in)
{
- super(in);
-
- // fillFields(data,size);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_version = in.readShort();
field_2_type = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BackupRecord.java Mon Sep 29 23:18:44 2008
@@ -40,18 +40,8 @@
{
}
- /**
- * Constructs a BackupRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public BackupRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_backup = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BarRecord.java Mon Sep 29 23:18:44 2008
@@ -47,20 +47,8 @@
}
- /**
- * Constructs a Bar record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public BarRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_barSpace = in.readShort();
field_2_categorySpace = in.readShort();
field_3_formatFlags = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BeginRecord.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 Glen Stampoultzis (glens at apache.org)
*/
-
-public class BeginRecord
- extends Record
-{
+public class BeginRecord extends Record {
public static final short sid = 0x1033;
public BeginRecord()
@@ -40,17 +35,10 @@
}
/**
- * Constructs a BeginRecord 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 BeginRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
}
public String toString()
@@ -64,9 +52,8 @@
public int serialize(int offset, byte [] data)
{
- LittleEndian.putShort(data, 0 + offset, sid);
- LittleEndian.putShort(data, 2 + offset,
- (( short ) 0)); // no record info
+ LittleEndian.putUShort(data, 0 + offset, sid);
+ LittleEndian.putUShort(data, 2 + offset, 0); // no record info
return getRecordSize();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BlankRecord.java Mon Sep 29 23:18:44 2008
@@ -39,17 +39,8 @@
{
}
- /**
- * Constructs a BlankRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
public BlankRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_row = in.readUShort();
field_2_col = in.readShort();
field_3_xf = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BookBoolRecord.java Mon Sep 29 23:18:44 2008
@@ -40,18 +40,8 @@
{
}
- /**
- * Constructs a BookBoolRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public BookBoolRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_save_link_values = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BoolErrRecord.java Mon Sep 29 23:18:44 2008
@@ -41,20 +41,10 @@
}
/**
- * Constructs a BoolErr record and sets its fields appropriately.
- *
* @param in the RecordInputstream to read the record from
*/
public BoolErrRecord(RecordInputStream in)
{
- super(in);
- }
-
- /**
- * @param in the RecordInputstream to read the record from
- */
- protected void fillFields(RecordInputStream in)
- {
//field_1_row = LittleEndian.getShort(data, 0 + offset);
field_1_row = in.readUShort();
field_2_column = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java Mon Sep 29 23:18:44 2008
@@ -39,18 +39,8 @@
}
- /**
- * Constructs a BottomMargin record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
public BottomMarginRecord( RecordInputStream in )
{
- super( in );
- }
-
- protected void fillFields( RecordInputStream in )
- {
field_1_margin = in.readDouble();
}
@@ -108,4 +98,4 @@
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/BoundSheetRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java Mon Sep 29 23:18:44 2008
@@ -53,15 +53,6 @@
}
/**
- * Constructs a BoundSheetRecord and sets its fields appropriately
- *
- * @param in the RecordInputstream to read the record from
- */
- public BoundSheetRecord(RecordInputStream in) {
- super(in);
- }
-
- /**
* UTF8: sid + len + bof + flags + len(str) + unicode + str 2 + 2 + 4 + 2 +
* 1 + 1 + len(str)
*
@@ -69,7 +60,7 @@
* 1 + 1 + 2 * len(str)
*
*/
- protected void fillFields(RecordInputStream in) {
+ public BoundSheetRecord(RecordInputStream in) {
field_1_position_of_BOF = in.readInt();
field_2_option_flags = in.readUShort();
int field_3_sheetname_length = in.readUByte();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java Mon Sep 29 23:18:44 2008
@@ -49,11 +49,6 @@
public CFHeaderRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_numcf = in.readShort();
field_2_need_recalculation = in.readShort();
field_3_enclosing_cell_range = new CellRangeAddress(in);
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java Mon Sep 29 23:18:44 2008
@@ -159,10 +159,6 @@
}
public CFRuleRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void fillFields(RecordInputStream in) {
field_1_condition_type = in.readByte();
field_2_comparison_operator = in.readByte();
int field_3_formula1_len = in.readUShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CRNCountRecord.java Mon Sep 29 23:18:44 2008
@@ -38,16 +38,12 @@
throw new RuntimeException("incomplete code");
}
- public CRNCountRecord(RecordInputStream in) {
- super(in);
- }
-
public int getNumberOfCRNs() {
return field_1_number_crn_records;
}
- protected void fillFields(RecordInputStream in) {
+ public CRNCountRecord(RecordInputStream in) {
field_1_number_crn_records = in.readShort();
if(field_1_number_crn_records < 0) {
// TODO - seems like the sign bit of this field might be used for some other purpose
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CRNRecord.java Mon Sep 29 23:18:44 2008
@@ -39,16 +39,12 @@
throw new RuntimeException("incomplete code");
}
- public CRNRecord(RecordInputStream in) {
- super(in);
- }
-
public int getNumberOfCRNs() {
return field_1_last_column_index;
}
- protected void fillFields(RecordInputStream in) {
+ public CRNRecord(RecordInputStream in) {
field_1_last_column_index = in.readByte() & 0x00FF;
field_2_first_column_index = in.readByte() & 0x00FF;
field_3_row_index = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CalcCountRecord.java Mon Sep 29 23:18:44 2008
@@ -45,19 +45,8 @@
{
}
- /**
- * Constructs a CalcCountRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- *
- */
-
public CalcCountRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_iterations = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CalcModeRecord.java Mon Sep 29 23:18:44 2008
@@ -61,18 +61,8 @@
{
}
- /**
- * Constructs a CalcModeRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public CalcModeRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_calcmode = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java Mon Sep 29 23:18:44 2008
@@ -47,20 +47,8 @@
}
- /**
- * Constructs a CategorySeriesAxis record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public CategorySeriesAxisRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_crossingPoint = in.readShort();
field_2_labelFrequency = in.readShort();
field_3_tickMarkFrequency = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java Mon Sep 29 23:18:44 2008
@@ -44,18 +44,8 @@
{
}
- /**
- * Constructs a ChartFormatRecord record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public ChartFormatRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field1_x_position = in.readInt();
field2_y_position = in.readInt();
field3_width = in.readInt();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ChartRecord.java Mon Sep 29 23:18:44 2008
@@ -45,20 +45,8 @@
}
- /**
- * Constructs a Chart record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public ChartRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_x = in.readInt();
field_2_y = in.readInt();
field_3_width = in.readInt();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java Mon Sep 29 23:18:44 2008
@@ -59,10 +59,6 @@
}
public ChartTitleFormatRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void fillFields(RecordInputStream in) {
m_recs = in.readUShort();
int idx;
CTFormat ctf;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CodepageRecord.java Mon Sep 29 23:18:44 2008
@@ -47,18 +47,8 @@
{
}
- /**
- * Constructs a CodepageRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public CodepageRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_codepage = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java Mon Sep 29 23:18:44 2008
@@ -52,18 +52,8 @@
field_6_reserved = 2; // seems to be the most common value
}
- /**
- * Constructs a ColumnInfo record and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public ColumnInfoRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_first_col = in.readUShort();
field_2_last_col = in.readUShort();
field_3_col_width = in.readUShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java Mon Sep 29 23:18:44 2008
@@ -82,19 +82,8 @@
}
- /**
- * Constructs a CommonObjectData record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public CommonObjectDataSubRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_objectType = in.readShort();
field_2_objectId = in.readShort();
field_3_option = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ContinueRecord.java Mon Sep 29 23:18:44 2008
@@ -46,17 +46,6 @@
}
/**
- * Main constructor -- kinda dummy because we don't validate or fill fields
- *
- * @param in the RecordInputstream to read the record from
- */
-
- public ContinueRecord(RecordInputStream in)
- {
- super(in);
- }
-
- /**
* USE ONLY within "processContinue"
*/
@@ -125,7 +114,7 @@
* @param in the RecordInputstream to read the record from
*/
- protected void fillFields(RecordInputStream in)
+ public ContinueRecord(RecordInputStream in)
{
field_1_data = in.readRemainder();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CountryRecord.java Mon Sep 29 23:18:44 2008
@@ -44,18 +44,8 @@
{
}
- /**
- * Constructs a CountryRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
-
public CountryRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_default_country = in.readShort();
field_2_current_country = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DBCellRecord.java Mon Sep 29 23:18:44 2008
@@ -38,17 +38,8 @@
field_2_cell_offsets = new short[0];
}
- /**
- * Constructs a DBCellRecord and sets its fields appropriately
- * @param in the RecordInputstream to read the record from
- */
public DBCellRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_row_offset = in.readUShort();
int size = in.remaining();
field_2_cell_offsets = new short[ size / 2 ];
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DSFRecord.java Mon Sep 29 23:18:44 2008
@@ -40,18 +40,8 @@
{
}
- /**
- * Constructs a DBCellRecord and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DSFRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_dsf = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DVALRecord.java Mon Sep 29 23:18:44 2008
@@ -48,18 +48,7 @@
field_5_dv_no = 0x00000000;
}
- /**
- * Constructs a DVAL record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
- public DVALRecord(RecordInputStream in)
- {
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
+ public DVALRecord(RecordInputStream in)
{
this.field_1_options = in.readShort();
this.field_2_horiz_pos = in.readInt();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java Mon Sep 29 23:18:44 2008
@@ -75,15 +75,6 @@
private static final BitField opt_show_error_on_invalid_value = new BitField(0x00080000);
private static final BitField opt_condition_operator = new BitField(0x00700000);
- /**
- * Constructs a DV record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
- public DVRecord(RecordInputStream in) {
- super(in);
- }
-
public DVRecord(int validationType, int operator, int errorStyle, boolean emptyCellAllowed,
boolean suppressDropDownArrow, boolean isExplicitList,
boolean showPromptBox, String promptTitle, String promptText,
@@ -110,7 +101,7 @@
_regions = regions;
}
- protected void fillFields(RecordInputStream in) {
+ public DVRecord(RecordInputStream in) {
_option_flags = in.readInt();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DatRecord.java Mon Sep 29 23:18:44 2008
@@ -45,20 +45,8 @@
}
- /**
- * Constructs a Dat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public DatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_options = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DataFormatRecord.java Mon Sep 29 23:18:44 2008
@@ -45,20 +45,8 @@
}
- /**
- * Constructs a DataFormat record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public DataFormatRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_pointNumber = in.readShort();
field_2_seriesIndex = in.readShort();
field_3_seriesNumber = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java Mon Sep 29 23:18:44 2008
@@ -40,18 +40,8 @@
{
}
- /**
- * Constructs a DateWindow1904 record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DateWindow1904Record(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_window = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java Mon Sep 29 23:18:44 2008
@@ -36,18 +36,8 @@
{
}
- /**
- * Constructs a DefaultColumnWidth record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DefaultColWidthRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_col_width = in.readUShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java Mon Sep 29 23:18:44 2008
@@ -45,20 +45,8 @@
}
- /**
- * Constructs a DefaultDataLabelTextProperties record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public DefaultDataLabelTextPropertiesRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_categoryDataType = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java Mon Sep 29 23:18:44 2008
@@ -42,18 +42,8 @@
{
}
- /**
- * Constructs a DefaultRowHeight record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DefaultRowHeightRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_option_flags = in.readShort();
field_2_row_height = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DeltaRecord.java Mon Sep 29 23:18:44 2008
@@ -44,18 +44,8 @@
{
}
- /**
- * Constructs a Delta record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DeltaRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_max_change = in.readDouble();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java Mon Sep 29 23:18:44 2008
@@ -45,18 +45,8 @@
{
}
- /**
- * Constructs a Dimensions record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public DimensionsRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_first_row = in.readInt();
field_2_last_row = in.readInt();
field_3_first_col = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DrawingRecord.java Mon Sep 29 23:18:44 2008
@@ -31,11 +31,6 @@
public DrawingRecord( RecordInputStream in )
{
- super( in );
- }
-
- protected void fillFields( RecordInputStream in )
- {
recordData = in.readRemainder();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EOFRecord.java Mon Sep 29 23:18:44 2008
@@ -40,17 +40,10 @@
}
/**
- * Constructs a EOFRecord 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 EOFRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
}
public String toString()
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java Mon Sep 29 23:18:44 2008
@@ -54,22 +54,12 @@
field_5_ole_classname = "";
}
- /**
- * Constructs an EmbeddedObjectRef record and sets its fields appropriately.
- *
- * @param in the record input stream.
- */
- public EmbeddedObjectRefSubRecord(RecordInputStream in)
- {
- super(in);
- }
-
public short getSid()
{
return sid;
}
- protected void fillFields(RecordInputStream in)
+ public EmbeddedObjectRefSubRecord(RecordInputStream in)
{
field_1_stream_id_offset = in.readShort();
field_2_unknown = in.readShortArray();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EndRecord.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,9 +28,7 @@
* @author Glen Stampoultzis (glens at apache.org)
*/
-public class EndRecord
- extends Record
-{
+public final class EndRecord extends Record {
public static final short sid = 0x1034;
public EndRecord()
@@ -40,17 +36,10 @@
}
/**
- * Constructs a EndRecord 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 EndRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
}
public String toString()
@@ -64,9 +53,8 @@
public int serialize(int offset, byte [] data)
{
- LittleEndian.putShort(data, 0 + offset, sid);
- LittleEndian.putShort(data, 2 + offset,
- (( short ) 0)); // no record info
+ LittleEndian.putUShort(data, 0 + offset, sid);
+ LittleEndian.putUShort(data, 2 + offset, 0); // no record info
return getRecordSize();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.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
@@ -16,12 +15,9 @@
limitations under the License.
==================================================================== */
-
package org.apache.poi.hssf.record;
-
-
-import org.apache.poi.util.*;
+import org.apache.poi.util.LittleEndian;
/**
* The end data record is used to denote the end of the subrecords.
@@ -30,10 +26,8 @@
* @author Glen Stampoultzis (glens at apache.org)
*/
-public class EndSubRecord
- extends SubRecord
-{
- public final static short sid = 0x00;
+public final class EndSubRecord extends SubRecord {
+ public final static short sid = 0x00;
public EndSubRecord()
@@ -42,19 +36,10 @@
}
/**
- * Constructs a End 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 EndSubRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
}
public String toString()
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java Mon Sep 29 23:18:44 2008
@@ -17,18 +17,41 @@
package org.apache.poi.hssf.record;
-import org.apache.poi.ddf.*;
-import org.apache.poi.hssf.usermodel.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.poi.ddf.DefaultEscherRecordFactory;
+import org.apache.poi.ddf.EscherBoolProperty;
+import org.apache.poi.ddf.EscherClientAnchorRecord;
+import org.apache.poi.ddf.EscherClientDataRecord;
+import org.apache.poi.ddf.EscherContainerRecord;
+import org.apache.poi.ddf.EscherDgRecord;
+import org.apache.poi.ddf.EscherDggRecord;
+import org.apache.poi.ddf.EscherOptRecord;
+import org.apache.poi.ddf.EscherProperties;
+import org.apache.poi.ddf.EscherRecord;
+import org.apache.poi.ddf.EscherRecordFactory;
+import org.apache.poi.ddf.EscherSerializationListener;
+import org.apache.poi.ddf.EscherSpRecord;
+import org.apache.poi.ddf.EscherSpgrRecord;
+import org.apache.poi.ddf.EscherTextboxRecord;
import org.apache.poi.hssf.model.AbstractShape;
-import org.apache.poi.hssf.model.TextboxShape;
-import org.apache.poi.hssf.model.DrawingManager2;
-import org.apache.poi.hssf.model.ConvertAnchor;
import org.apache.poi.hssf.model.CommentShape;
+import org.apache.poi.hssf.model.ConvertAnchor;
+import org.apache.poi.hssf.model.DrawingManager2;
+import org.apache.poi.hssf.model.TextboxShape;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFPatriarch;
+import org.apache.poi.hssf.usermodel.HSSFShape;
+import org.apache.poi.hssf.usermodel.HSSFShapeContainer;
+import org.apache.poi.hssf.usermodel.HSSFShapeGroup;
+import org.apache.poi.hssf.usermodel.HSSFTextbox;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import java.util.*;
-
/**
* This class is used to aggregate the MSODRAWING and OBJ record
* combinations. This is necessary due to the bizare way in which
@@ -283,16 +306,6 @@
}
/**
- * Unused since this is an aggregate record. Use createAggregate().
- *
- * @see #createAggregate
- */
- protected void fillFields( byte[] data, short size, int offset )
- {
- throw new IllegalStateException( "Should not reach here" );
- }
-
- /**
* Calculates the string representation of this record. This is
* simply a dump of all the records.
*/
@@ -539,8 +552,7 @@
// The top level container ought to have
// the DgRecord and the container of one container
// per shape group (patriach overall first)
- EscherContainerRecord topContainer =
- (EscherContainerRecord)getEscherContainer();
+ EscherContainerRecord topContainer = getEscherContainer();
if(topContainer == null) {
return;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTInfoSubRecord.java Mon Sep 29 23:18:44 2008
@@ -52,11 +52,6 @@
public ExtSSTInfoSubRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_stream_pos = in.readInt();
field_2_bucket_sst_offset = in.readShort();
field_3_zero = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java Mon Sep 29 23:18:44 2008
@@ -53,18 +53,8 @@
field_2_sst_info = new ArrayList();
}
- /**
- * Constructs a EOFRecord record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public ExtSSTRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_2_sst_info = new ArrayList();
field_1_strings_per_bucket = in.readShort();
while (in.remaining() > 0) {
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java Mon Sep 29 23:18:44 2008
@@ -195,18 +195,8 @@
{
}
- /**
- * Constructs an ExtendedFormat record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public ExtendedFormatRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_font_index = in.readShort();
field_2_format_index = in.readShort();
field_3_cell_options = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java Mon Sep 29 23:18:44 2008
@@ -96,21 +96,12 @@
}
/**
- * Constructs a Extern Sheet record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
- public ExternSheetRecord(RecordInputStream in) {
- super(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 void fillFields(RecordInputStream in) {
+ public ExternSheetRecord(RecordInputStream in) {
_list = new ArrayList();
int nItems = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java Mon Sep 29 23:18:44 2008
@@ -47,11 +47,7 @@
private short field_2_index;
private short field_3_not_used;
private String field_4_name;
- private Ptg[] field_5_name_definition; // TODO - junits for name definition field
-
- public ExternalNameRecord(RecordInputStream in) {
- super(in);
- }
+ private Ptg[] field_5_name_definition;
/**
* Convenience Function to determine if the name is a built-in name
@@ -116,13 +112,13 @@
LittleEndian.putShort( data, 4 + offset, field_1_option_flag );
LittleEndian.putShort( data, 6 + offset, field_2_index );
LittleEndian.putShort( data, 8 + offset, field_3_not_used );
- short nameLen = (short) field_4_name.length();
- LittleEndian.putShort( data, 10 + offset, nameLen );
+ int nameLen = field_4_name.length();
+ LittleEndian.putUShort( data, 10 + offset, nameLen );
StringUtil.putCompressedUnicode( field_4_name, data, 12 + offset );
if(hasFormula()) {
- short defLen = (short) getNameDefinitionSize();
- LittleEndian.putShort( data, 12 + nameLen + offset, defLen );
- Ptg.serializePtgStack(toStack(field_5_name_definition), data, 14 + nameLen + offset );
+ int defLen = getNameDefinitionSize();
+ LittleEndian.putUShort( data, 12 + nameLen + offset, defLen );
+ Ptg.serializePtgs(field_5_name_definition, data, 14 + nameLen + offset );
}
return dataSize + 4;
}
@@ -141,7 +137,7 @@
}
- protected void fillFields(RecordInputStream in) {
+ public ExternalNameRecord(RecordInputStream in) {
field_1_option_flag = in.readShort();
field_2_index = in.readShort();
field_3_not_used = in.readShort();
@@ -158,7 +154,7 @@
throw readFail("Ran out of record data trying to read formula.");
}
short formulaLen = in.readShort();
- field_5_name_definition = toPtgArray(Ptg.createParsedExpressionTokens(formulaLen, in));
+ field_5_name_definition = Ptg.readTokens(formulaLen, in);
}
/*
* Makes better error messages (while hasFormula() is not reliable)
@@ -196,19 +192,6 @@
return true;
}
- private static Ptg[] toPtgArray(Stack s) {
- Ptg[] result = new Ptg[s.size()];
- s.toArray(result);
- return result;
- }
- private static Stack toStack(Ptg[] ptgs) {
- Stack result = new Stack();
- for (int i = 0; i < ptgs.length; i++) {
- result.push(ptgs[i]);
- }
- return result;
- }
-
public short getSid() {
return sid;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FilePassRecord.java Mon Sep 29 23:18:44 2008
@@ -40,18 +40,8 @@
{
}
- /**
- * Constructs a FILEPASS record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public FilePassRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_encryptedpassword = in.readInt();
//Whilst i have read in the password, HSSF currently has no plans to support/decrypt the remainder
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FileSharingRecord.java Mon Sep 29 23:18:44 2008
@@ -36,18 +36,8 @@
private String field_3_username_value;
public FileSharingRecord() {}
-
-
- /**
- * Constructs a FileSharing record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
public FileSharingRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void fillFields(RecordInputStream in) {
field_1_readonly = in.readShort();
field_2_password = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java Mon Sep 29 23:18:44 2008
@@ -46,18 +46,8 @@
{
}
- /**
- * Constructs a FnGroupCount record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public FnGroupCountRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_count = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FontBasisRecord.java Mon Sep 29 23:18:44 2008
@@ -46,20 +46,8 @@
}
- /**
- * Constructs a FontBasis record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public FontBasisRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_xBasis = in.readShort();
field_2_yBasis = in.readShort();
field_3_heightBasis = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FontIndexRecord.java Mon Sep 29 23:18:44 2008
@@ -42,20 +42,8 @@
}
- /**
- * Constructs a FontIndex record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public FontIndexRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_fontIndex = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FontRecord.java Mon Sep 29 23:18:44 2008
@@ -76,19 +76,8 @@
{
}
- /**
- * Constructs a Font record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public FontRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_font_height = in.readShort();
field_2_attributes = in.readShort();
field_3_color_palette_index = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FooterRecord.java Mon Sep 29 23:18:44 2008
@@ -45,18 +45,8 @@
{
}
- /**
- * Constructs a FooterRecord record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public FooterRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
if (in.remaining() > 0)
{
field_1_footer_len = in.readByte();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java Mon Sep 29 23:18:44 2008
@@ -46,18 +46,8 @@
{
}
- /**
- * Constructs a Format record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public FormatRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_index_code = in.readShort();
field_3_unicode_len = in.readShort();
field_3_unicode_flag = ( in.readByte() & (byte)0x01 ) != 0;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java Mon Sep 29 23:18:44 2008
@@ -186,20 +186,7 @@
field_8_parsed_expr = Ptg.EMPTY_PTG_ARRAY;
}
- /**
- * Constructs a Formula record and sets its fields appropriately.
- * Note - id must be 0x06 (NOT 0x406 see MSKB #Q184647 for an
- * "explanation of this bug in the documentation) or an exception
- * will be throw upon validation
- *
- * @param in the RecordInputstream to read the record from
- */
-
public FormulaRecord(RecordInputStream in) {
- super(in);
- }
-
- protected void fillFields(RecordInputStream in) {
field_1_row = in.readUShort();
field_2_column = in.readShort();
field_3_xf = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FrameRecord.java Mon Sep 29 23:18:44 2008
@@ -46,20 +46,8 @@
}
- /**
- * Constructs a Frame record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public FrameRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_borderType = in.readShort();
field_2_options = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/GridsetRecord.java Mon Sep 29 23:18:44 2008
@@ -44,18 +44,8 @@
{
}
- /**
- * Constructs a GridSet record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public GridsetRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_gridset_flag = in.readShort();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java Mon Sep 29 23:18:44 2008
@@ -41,20 +41,8 @@
}
- /**
- * Constructs a group marker record and sets its fields appropriately.
- *
- * @param in the RecordInputstream to read the record from
- */
-
public GroupMarkerSubRecord(RecordInputStream in)
{
- super(in);
-
- }
-
- protected void fillFields(RecordInputStream in)
- {
// int pos = 0;
reserved = in.readRemainder();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/GutsRecord.java Mon Sep 29 23:18:44 2008
@@ -43,18 +43,8 @@
{
}
- /**
- * Constructs a Guts record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public GutsRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_left_row_gutter = in.readShort();
field_2_top_col_gutter = in.readShort();
field_3_row_level_max = in.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/HCenterRecord.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,43 +14,29 @@
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: HCenter record<P>
+ * Title: HCenter record (0x0083)<P>
* Description: whether to center between horizontal margins<P>
* REFERENCE: PG 320 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
* @author Andrew C. Oliver (acoliver at apache dot org)
* @author Jason Height (jheight at chariot dot net dot au)
* @version 2.0-pre
*/
-
-public class HCenterRecord
- extends Record
-{
- public final static short sid = 0x83;
+public final class HCenterRecord extends Record {
+ public final static short sid = 0x0083;
private short field_1_hcenter;
public HCenterRecord()
{
}
- /**
- * Constructs an HCenter record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public HCenterRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
field_1_hcenter = in.readShort();
}
@@ -96,8 +81,8 @@
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_hcenter);
+ LittleEndian.putUShort(data, 2 + offset, 0x2);
+ LittleEndian.putUShort(data, 4 + offset, field_1_hcenter);
return getRecordSize();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java?rev=700356&r1=700355&r2=700356&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/HeaderRecord.java Mon Sep 29 23:18:44 2008
@@ -45,18 +45,8 @@
{
}
- /**
- * Constructs an Header record and sets its fields appropriately.
- * @param in the RecordInputstream to read the record from
- */
-
public HeaderRecord(RecordInputStream in)
{
- super(in);
- }
-
- protected void fillFields(RecordInputStream in)
- {
if (in.remaining() > 0)
{
field_1_header_len = in.readByte();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org