Some changes to record generation

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352885 13f79535-47bb-0310-9956-ffa450edef68

36 files changed, 118 insertions, 58 deletions

diff --git a/src/records/definitions/area_format_record.xml b/src/records/definitions/area_format_record.xml
index b5cacc34fe..9259748f42 100644
--- a/src/records/definitions/area_format_record.xml
+++ b/src/records/definitions/area_format_record.xml
@@ -1,4 +1,4 @@
-<record id="0x100a" name="AreaFormat" package="org.apache.poi.hssf.record">
+<record id="0x100a" name="AreaFormat" excel-record-id="AREAFORMAT" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The area format record is used to define the colours and patterns for an area.</description>
diff --git a/src/records/definitions/area_record.xml b/src/records/definitions/area_record.xml
index bbd29ea0bc..b2f6df0455 100644
--- a/src/records/definitions/area_record.xml
+++ b/src/records/definitions/area_record.xml
@@ -1,4 +1,5 @@
-<record id="0x101A" name="Area" package="org.apache.poi.hssf.record">
+<record id="0x101A" name="Area" excel-record-id="AREA"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The area record is used to define a area chart.</description>
diff --git a/src/records/definitions/attached_label_record.xml b/src/records/definitions/attached_label_record.xml
index 4adc324192..84a4ebf194 100644
--- a/src/records/definitions/attached_label_record.xml
+++ b/src/records/definitions/attached_label_record.xml
@@ -1,4 +1,5 @@
-<record id="0x100c" name="SeriesLabels" package="org.apache.poi.hssf.record">
+<record id="0x100c" name="SeriesLabels" excel-record-id="ATTACHEDLABEL"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The series label record defines the type of label associated with the data format record.</description>
diff --git a/src/records/definitions/axes_used_record.xml b/src/records/definitions/axes_used_record.xml
index 8e6d119eed..a53778e524 100644
--- a/src/records/definitions/axes_used_record.xml
+++ b/src/records/definitions/axes_used_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1046" name="AxisUsed" package="org.apache.poi.hssf.record">
+<record id="0x1046" name="AxisUsed" excel-record-id="AXISUSED"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The number of axes used on a chart.</description>
diff --git a/src/records/definitions/axis_line_format_record.xml b/src/records/definitions/axis_line_format_record.xml
index 000ff07987..aefe4f8739 100644
--- a/src/records/definitions/axis_line_format_record.xml
+++ b/src/records/definitions/axis_line_format_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1021" name="AxisLineFormat" package="org.apache.poi.hssf.record">
+<record id="0x1021" name="AxisLineFormat" excel-record-id="AXISLINEFORMAT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The axis line format record defines the axis type details.</description>
diff --git a/src/records/definitions/axis_options_record.xml b/src/records/definitions/axis_options_record.xml
index b9da271250..c0dc989ec6 100644
--- a/src/records/definitions/axis_options_record.xml
+++ b/src/records/definitions/axis_options_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1062" name="AxisOptions" package="org.apache.poi.hssf.record">
+<record id="0x1062" name="AxisOptions" excel-record-id="AXCEXT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The axis options record provides unit information and other various tidbits about the axis.</description>
diff --git a/src/records/definitions/axis_parent_record.xml b/src/records/definitions/axis_parent_record.xml
index 0c8a61d57a..0d0b492f03 100644
--- a/src/records/definitions/axis_parent_record.xml
+++ b/src/records/definitions/axis_parent_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1041" name="AxisParent" package="org.apache.poi.hssf.record">
+<record id="0x1041" name="AxisParent" excel-record-id="AXISPARENT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The axis size and location</description>
diff --git a/src/records/definitions/axis_record.xml b/src/records/definitions/axis_record.xml
index cfab8b6546..bb9431efb9 100644
--- a/src/records/definitions/axis_record.xml
+++ b/src/records/definitions/axis_record.xml
@@ -1,4 +1,4 @@
-<record id="0x101d" name="Axis" package="org.apache.poi.hssf.record">
+<record id="0x101d" name="Axis" excel-record-id="AXIS" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The axis record defines the type of an axis.</description>
diff --git a/src/records/definitions/bar_record.xml b/src/records/definitions/bar_record.xml
index 6cb91cce8c..fae957cfff 100644
--- a/src/records/definitions/bar_record.xml
+++ b/src/records/definitions/bar_record.xml
@@ -1,11 +1,12 @@
-<record id="0x1017" name="Bar" package="org.apache.poi.hssf.record">
+<record id="0x1017" name="Bar" excel-record-id="BAR"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The bar record is used to define a bar chart.</description>
     <author>Glen Stampoultzis (glens at apache.org)</author>
     <fields>
         <field type="int" size="2" name="bar space" description="space between bars"/>
-        <field type="int" size="2" name="category space" default="50" description="space between categories"/>
+        <field type="int" size="2" name="category space" description="space between categories"/>
         <field type="int" size="2" name="format flags">
             <bit number="0" name="horizontal" description="true to display horizontal bar charts, false for vertical"/>
             <bit number="1" name="stacked" description="stack displayed values"/>
diff --git a/src/records/definitions/category_series_axis_record.xml b/src/records/definitions/category_series_axis_record.xml
index d93b28fc8f..164de04857 100644
--- a/src/records/definitions/category_series_axis_record.xml
+++ b/src/records/definitions/category_series_axis_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1020" name="CategorySeriesAxis" package="org.apache.poi.hssf.record">
+<record id="0x1020" name="CategorySeriesAxis" excel-record-id="CATSERRANGE"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>This record refers to a category or series axis and is used to specify label/tickmark frequency.</description>
diff --git a/src/records/definitions/chart_record.xml b/src/records/definitions/chart_record.xml
index ae00900a81..c7e9e069cd 100644
--- a/src/records/definitions/chart_record.xml
+++ b/src/records/definitions/chart_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1002" name="Chart" package="org.apache.poi.hssf.record">
+<record id="0x1002" name="Chart" excel-record-id="CHART"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The chart record is used to define the location and size of a chart.</description>
diff --git a/src/records/definitions/dat_record.xml b/src/records/definitions/dat_record.xml
index 1424809c8a..cd76f222b2 100644
--- a/src/records/definitions/dat_record.xml
+++ b/src/records/definitions/dat_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1063" name="Dat" package="org.apache.poi.hssf.record">
+<record id="0x1063" name="Dat" excel-record-id="DAT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The dat record is used to store options for the chart.</description>
diff --git a/src/records/definitions/dataformat_record.xml b/src/records/definitions/dataformat_record.xml
index 48f666c40b..dc6d281b9c 100644
--- a/src/records/definitions/dataformat_record.xml
+++ b/src/records/definitions/dataformat_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1006" name="DataFormat" package="org.apache.poi.hssf.record">
+<record id="0x1006" name="DataFormat"  excel-record-id="DATAFORMAT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The data format record is used to index into a series.</description>
diff --git a/src/records/definitions/default_data_label_text_properties_record.xml b/src/records/definitions/default_data_label_text_properties_record.xml
index c4e90053db..9930f38c7f 100644
--- a/src/records/definitions/default_data_label_text_properties_record.xml
+++ b/src/records/definitions/default_data_label_text_properties_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1024" name="DefaultDataLabelTextProperties" package="org.apache.poi.hssf.record">
+<record id="0x1024" name="DefaultDataLabelTextProperties"
+    excel-record-id="DEFAULTTEXT" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The default data label text properties record identifies the text characteristics of the preceeding text record.</description>
diff --git a/src/records/definitions/font_basis_record.xml b/src/records/definitions/font_basis_record.xml
index 9d529c3dcd..a557984bd7 100644
--- a/src/records/definitions/font_basis_record.xml
+++ b/src/records/definitions/font_basis_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1060" name="FontBasis" package="org.apache.poi.hssf.record">
+<record id="0x1060" name="FontBasis" excel-record-id="FBI"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The font basis record stores various font metrics.</description>
diff --git a/src/records/definitions/font_example.xml b/src/records/definitions/font_example.xml
index f6ce083ee8..238a1b6a89 100644
--- a/src/records/definitions/font_example.xml
+++ b/src/records/definitions/font_example.xml
@@ -1,4 +1,4 @@
-<record id="0x31" name="Font" package="org.apache.poi.hssf.records">
+<record id="0x31" name="Font"  excel-record-id="FONT" package="org.apache.poi.hssf.records">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Describes a font record.  In Excel a font belongs in the font table.</description>
diff --git a/src/records/definitions/font_index_record.xml b/src/records/definitions/font_index_record.xml
index f675763f1a..858de98f95 100644
--- a/src/records/definitions/font_index_record.xml
+++ b/src/records/definitions/font_index_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1026" name="FontIndex" package="org.apache.poi.hssf.record">
+<record id="0x1026" name="FontIndex" excel-record-id="FONTX"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The font index record indexes into the font table for the text record.</description>
diff --git a/src/records/definitions/frame_record.xml b/src/records/definitions/frame_record.xml
index 2561b14cc2..b41cdc5870 100644
--- a/src/records/definitions/frame_record.xml
+++ b/src/records/definitions/frame_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1032" name="Frame" package="org.apache.poi.hssf.record">
+<record id="0x1032" name="Frame" excel-record-id="FRAME"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The frame record indicates whether there is a border around the displayed text of a chart.</description>
diff --git a/src/records/definitions/legend_record.xml b/src/records/definitions/legend_record.xml
index 81a2cae734..09c3756403 100644
--- a/src/records/definitions/legend_record.xml
+++ b/src/records/definitions/legend_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1015" name="Legend" package="org.apache.poi.hssf.record">
+<record id="0x1015" name="Legend" excel-record-id="LEGEND"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Defines a legend for a chart.</description>
diff --git a/src/records/definitions/line_format_record.xml b/src/records/definitions/line_format_record.xml
index 14fe35e87a..832f038545 100644
--- a/src/records/definitions/line_format_record.xml
+++ b/src/records/definitions/line_format_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1007" name="LineFormat" package="org.apache.poi.hssf.record">
+<record id="0x1007" name="LineFormat" excel-record-id="LINEFORMAT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Describes a line format record.  The line format record controls how a line on a chart appears.</description>
diff --git a/src/records/definitions/linked_data_record.xml b/src/records/definitions/linked_data_record.xml
index 35c63bd24d..9417eeeca2 100644
--- a/src/records/definitions/linked_data_record.xml
+++ b/src/records/definitions/linked_data_record.xml
@@ -1,4 +1,4 @@
-<record id="0x1051" name="LinkedData" package="org.apache.poi.hssf.record">
+<record id="0x1051" name="LinkedData" excel-record-id="AI" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Describes a linked data record.  This record referes to the series data or text.</description>
@@ -20,6 +20,7 @@
             <bit number="0" name="custom number format" description="true if this object has a custom number format"/>
         </field>
         <field type="int" size="2" name="index number fmt record"/>
-        <field type="int" size="2" name="formula of link" description="not supported"/>
+        <field type="custom:org.apache.poi.hssf.record.LinkedDataFormulaField"
+            size="var" name="formula of link" description="formula"/>
     </fields>
 </record>
diff --git a/src/records/definitions/number_format_index_record.xml b/src/records/definitions/number_format_index_record.xml
index 3bd1ee2463..10b62dc812 100644
--- a/src/records/definitions/number_format_index_record.xml
+++ b/src/records/definitions/number_format_index_record.xml
@@ -1,4 +1,5 @@
-<record id="0x104e" name="NumberFormatIndex" package="org.apache.poi.hssf.record">
+<record id="0x104e" name="NumberFormatIndex" excel-record-id="IFMT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The number format index record indexes format table.  This applies to an axis.</description>
diff --git a/src/records/definitions/object_link_record.xml b/src/records/definitions/object_link_record.xml
index b63a79ead7..b11de5d546 100644
--- a/src/records/definitions/object_link_record.xml
+++ b/src/records/definitions/object_link_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1027" name="ObjectLink" package="org.apache.poi.hssf.record">
+<record id="0x1027" name="ObjectLink" excel-record-id="OBJECTLINK"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Links text to an object on the chart or identifies it as the title.</description>
diff --git a/src/records/definitions/plot_area_record.xml b/src/records/definitions/plot_area_record.xml
index 2c883bf32b..cb8970bf92 100644
--- a/src/records/definitions/plot_area_record.xml
+++ b/src/records/definitions/plot_area_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1035" name="PlotArea" package="org.apache.poi.hssf.record">
+<record id="0x1035" name="PlotArea" excel-record-id="PLOTAREA"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>preceeds and identifies a frame as belonging to the plot area.</description>
diff --git a/src/records/definitions/plotgrowth_record.xml b/src/records/definitions/plotgrowth_record.xml
index 0bfefc21a6..ff5f1433a9 100644
--- a/src/records/definitions/plotgrowth_record.xml
+++ b/src/records/definitions/plotgrowth_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1064" name="PlotGrowth" package="org.apache.poi.hssf.record">
+<record id="0x1064" name="PlotGrowth" excel-record-id="PLOTGROWTH"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The plot growth record specifies the scaling factors used when a font is scaled.</description>
diff --git a/src/records/definitions/series_chart_group_record.xml b/src/records/definitions/series_chart_group_record.xml
index f7a259536e..7b04c1e384 100644
--- a/src/records/definitions/series_chart_group_record.xml
+++ b/src/records/definitions/series_chart_group_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1045" name="SeriesChartGroupIndex" package="org.apache.poi.hssf.record">
+<record id="0x1045" name="SeriesChartGroupIndex"  excel-record-id="SERTOCRT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The series chart group index record stores the index to the CHARTFORMAT record (0 based).</description>
diff --git a/src/records/definitions/series_index_record.xml b/src/records/definitions/series_index_record.xml
index 72e286c140..eaa512655b 100644
--- a/src/records/definitions/series_index_record.xml
+++ b/src/records/definitions/series_index_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1065" name="SeriesIndex" package="org.apache.poi.hssf.record">
+<record id="0x1065" name="SeriesIndex" excel-record-id="SINDEX"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>links a series to its position in the series list.</description>
diff --git a/src/records/definitions/series_list_record.xml b/src/records/definitions/series_list_record.xml
index 412c8ebfa4..07b136c0fe 100644
--- a/src/records/definitions/series_list_record.xml
+++ b/src/records/definitions/series_list_record.xml
@@ -1,4 +1,5 @@
-<record id="0x1016" name="SeriesList" package="org.apache.poi.hssf.record">
+<record id="0x1016" name="SeriesList" excel-record-id="SERIESLIST"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The series list record defines the series displayed as an overlay to the main chart record.</description>
diff --git a/src/records/definitions/series_record.xml b/src/records/definitions/series_record.xml
index 960ba78189..e9e19a0963 100644
--- a/src/records/definitions/series_record.xml
+++ b/src/records/definitions/series_record.xml
@@ -1,4 +1,4 @@
-<record id="0x1003" name="Series" package="org.apache.poi.hssf.record">
+<record id="0x1003" name="Series" excel-record-id="SERIES" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The series record describes the overall data for a series.</description>
diff --git a/src/records/definitions/series_text_record.xml b/src/records/definitions/series_text_record.xml
index ed527768ef..4306c3cc04 100644
--- a/src/records/definitions/series_text_record.xml
+++ b/src/records/definitions/series_text_record.xml
@@ -1,4 +1,5 @@
-<record id="0x100d" name="SeriesText" package="org.apache.poi.hssf.record">
+<record id="0x100d" name="SeriesText" excel-record-id="SERIESTEXT"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Defines a series name</description>
diff --git a/src/records/definitions/sheet_properties_record.xml b/src/records/definitions/sheet_properties_record.xml
index 6596312640..58df542d43 100644
--- a/src/records/definitions/sheet_properties_record.xml
+++ b/src/records/definitions/sheet_properties_record.xml
@@ -1,4 +1,4 @@
-<record id="0x1044" name="SheetProperties" package="org.apache.poi.hssf.record">
+<record id="0x1044" name="SheetProperties" excel-record-id="SHTPROPS" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>Describes a chart sheet properties record.</description>
diff --git a/src/records/definitions/text_record.xml b/src/records/definitions/text_record.xml
index 17cf812b93..462c3a6b60 100644
--- a/src/records/definitions/text_record.xml
+++ b/src/records/definitions/text_record.xml
@@ -1,4 +1,4 @@
-<record id="0x1025" name="Text" package="org.apache.poi.hssf.record">
+<record id="0x1025" name="Text" excel-record-id="TEXT" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The text record is used to define text stored on a chart.</description>
diff --git a/src/records/definitions/tick_record.xml b/src/records/definitions/tick_record.xml
index 5a69e019ae..09a15ebeef 100644
--- a/src/records/definitions/tick_record.xml
+++ b/src/records/definitions/tick_record.xml
@@ -1,4 +1,4 @@
-<record id="0x101e" name="Tick" package="org.apache.poi.hssf.record">
+<record id="0x101e" name="Tick" excel-record-id="TICK" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The Tick record defines how tick marks and label positioning/formatting</description>
diff --git a/src/records/definitions/units_record.xml b/src/records/definitions/units_record.xml
index 70e250a1fc..11e6cb147c 100644
--- a/src/records/definitions/units_record.xml
+++ b/src/records/definitions/units_record.xml
@@ -1,4 +1,4 @@
-<record id="0x1001" name="Units" package="org.apache.poi.hssf.record">
+<record id="0x1001" name="Units" excel-record-id="UNITS" package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The units record describes units.</description>
diff --git a/src/records/definitions/value_range_record.xml b/src/records/definitions/value_range_record.xml
index fc595efe51..8a911efc20 100644
--- a/src/records/definitions/value_range_record.xml
+++ b/src/records/definitions/value_range_record.xml
@@ -1,4 +1,5 @@
-<record id="0x101f" name="ValueRange" package="org.apache.poi.hssf.record">
+<record id="0x101f" name="ValueRange" excel-record-id="VALUERANGE"
+    package="org.apache.poi.hssf.record">
     <suffix>Record</suffix>
     <extends>Record</extends>
     <description>The value range record defines the range of the value axis.</description>
diff --git a/src/records/styles/record.xsl b/src/records/styles/record.xsl
index 685af43c72..7c6dc48e11 100644
--- a/src/records/styles/record.xsl
+++ b/src/records/styles/record.xsl
@@ -76,7 +76,7 @@ public class <xsl:value-of select="@name"/>Record
     extends Record
 {
     public final static short      sid                             = <xsl:value-of select="@id"/>;
-<xsl:for-each select="//fields/field">    private  <xsl:value-of select="recutil:getType(@size,@type,10)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/>;
+<xsl:for-each select="//fields/field">    private  <xsl:value-of select="recutil:getType(@size,@type,10)"/><xsl:text> </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/><xsl:value-of select="recutil:initializeText(@size,@type)"/>;
 <xsl:apply-templates select="./bit|./const|./bit/const"/>
 </xsl:for-each>
 
@@ -100,6 +100,14 @@ public class <xsl:value-of select="@name"/>Record
     public <xsl:value-of select="@name"/>Record(short id, short size, byte [] data)
     {
         super(id, size, data);
+    <xsl:for-each select="//fields/field">
+    <xsl:if test="@default">
+        <xsl:text>        </xsl:text>
+        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
+        <xsl:value-of select="@default"/>;
+
+    </xsl:if>
+    </xsl:for-each>
     }
 
     /**
@@ -115,6 +123,14 @@ public class <xsl:value-of select="@name"/>Record
     public <xsl:value-of select="@name"/>Record(short id, short size, byte [] data, int offset)
     {
         super(id, size, data, offset);
+    <xsl:for-each select="//fields/field">
+    <xsl:if test="@default">
+        <xsl:text>        </xsl:text>
+        <xsl:value-of select="recutil:getFieldName(position(),@name,0)"/> =
+        <xsl:value-of select="@default"/>;
+
+    </xsl:if>
+    </xsl:for-each>
     }
 
     /**
@@ -132,9 +148,13 @@ public class <xsl:value-of select="@name"/>Record
 
     protected void fillFields(byte [] data, short size, int offset)
     {
-<xsl:variable name="fieldIterator" select="field:new()"/>
+
+<xsl:text>        int pos = 0;
+</xsl:text>
+
+ <xsl:variable name="fieldIterator" select="field:new()"/>
 <xsl:for-each select="//fields/field">
-<xsl:text>        </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,30)"/>  = <xsl:value-of select="field:fillDecoder($fieldIterator,@size,@type)"/>;
+    <xsl:text>        </xsl:text><xsl:value-of select="field:fillDecoder2($fieldIterator,position(),@name,@size,@type)"/>;
 </xsl:for-each>
     }
 
@@ -142,14 +162,16 @@ public class <xsl:value-of select="@name"/>Record
     {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append("[<xsl:value-of select="@name"/>]\n");
+        buffer.append("[<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
 <xsl:apply-templates select="//field" mode="tostring"/>
-        buffer.append("[/<xsl:value-of select="@name"/>]\n");
+        buffer.append("[/<xsl:value-of select="recutil:getRecordId(@name,@excel-record-id)"/>]\n");
         return buffer.toString();
     }
 
     public int serialize(int offset, byte[] data)
     {
+        int pos = 0;
+
         LittleEndian.putShort(data, 0 + offset, sid);
         LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
 <xsl:variable name="fieldIterator" select="field:new()"/>
@@ -178,11 +200,12 @@ public class <xsl:value-of select="@name"/>Record
     }
 
     public Object clone() {
-      <xsl:value-of select="@name"/>Record rec = new <xsl:value-of select="@name"/>Record();
-
-<xsl:for-each select="//fields/field"><xsl:text>      rec.</xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/><xsl:text> = </xsl:text><xsl:value-of select="recutil:getFieldName(position(),@name,0)"/><xsl:text>;
-</xsl:text></xsl:for-each>
-      return rec;
+        <xsl:value-of select="@name"/>Record rec = new <xsl:value-of select="@name"/>Record();
+    <xsl:for-each select="//fields/field">
+        <xsl:text>
+        </xsl:text><xsl:value-of select="recutil:clone(@name,@type,position())"/><xsl:text>;</xsl:text>
+    </xsl:for-each>
+        return rec;
     }
 
 
@@ -276,19 +299,29 @@ public class <xsl:value-of select="@name"/>Record
 </xsl:template>
 
 <xsl:template match="field" mode="tostring">
-        buffer.append("    .<xsl:value-of select="recutil:getFieldName(@name,20)"/> = ")<xsl:choose><xsl:when test="@type != 'string' and @type != 'hbstring' and @type != 'float' and @size != 'varword'">
-            .append("0x")
-            .append(HexDump.toHex((<xsl:value-of select="recutil:getType(@size,@type,00)"/>)get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()))</xsl:when></xsl:choose>
-            .append(" (").append(get<xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>()).append(" )\n");
-<xsl:apply-templates select="bit" mode="bittostring"/>
+    <xsl:value-of select="recutil:getToString(@name,@type,@size)"/>
+    <xsl:text>
+        buffer.append(System.getProperty("line.separator")); </xsl:text>
+    <xsl:apply-templates select="bit" mode="bittostring"/>
+    <xsl:text>&#10;</xsl:text>
 </xsl:template>
 
-<xsl:template match="bit" mode="bittostring">
-<xsl:if test="not (@mask)">        buffer.append("         .<xsl:value-of select="recutil:getFieldName(@name,20)"/>     = ").append(is<xsl:value-of select="recutil:getFieldName1stCap(@name,20)"/>()).append('\n');
-</xsl:if>
-<xsl:if test="@mask">        buffer.append("         .<xsl:value-of select="recutil:getFieldName(@name,20)"/>     = ").append(get<xsl:value-of select="recutil:getFieldName1stCap(@name,20)"/>()).append('\n');
-</xsl:if>
-</xsl:template>
+    <xsl:template match="bit" mode="bittostring">
+        <xsl:if test="not (@mask)">
+            <xsl:text>&#10;        buffer.append("         .</xsl:text>
+            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
+            <xsl:text>     = ").append(is</xsl:text>
+            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
+            <xsl:text>()).append('\n'); </xsl:text>
+        </xsl:if>
+        <xsl:if test="@mask">
+        <xsl:text>&#10;            buffer.append("         .</xsl:text>
+            <xsl:value-of select="recutil:getFieldName(@name,20)"/>
+            <xsl:text>     = ").append(get</xsl:text>
+            <xsl:value-of select="recutil:getFieldName1stCap(@name,0)"/>
+            <xsl:text>()).append('\n'); </xsl:text>
+        </xsl:if>
+    </xsl:template>
 
 <xsl:template match="author">
  * @author <xsl:value-of select="."/>