moving other chart records into dedicated package

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

src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/AreaRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/AxisRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/BarRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/BeginRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**

src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndianOutput;

src/java/org/apache/poi/hssf/record/chart/ChartRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java

@@ -18,8 +18,10 @@
 /*
  * HSSF Chart Title Format Record Type
  */
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**

src/java/org/apache/poi/hssf/record/chart/DatRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/EndRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**

src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/FrameRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/LegendRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.hssf.record.formula.Ptg;
 import org.apache.poi.ss.formula.Formula;
 import org.apache.poi.util.BitField;

src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**

src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**

src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java

@@ -15,10 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.StringUtil;
 

src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/TextRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/TickRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 

src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java

@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;

src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java

@@ -21,51 +21,20 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.hssf.record.AreaFormatRecord;
-import org.apache.poi.hssf.record.AxisLineFormatRecord;
-import org.apache.poi.hssf.record.AxisOptionsRecord;
-import org.apache.poi.hssf.record.AxisParentRecord;
-import org.apache.poi.hssf.record.AxisRecord;
-import org.apache.poi.hssf.record.AxisUsedRecord;
+import org.apache.poi.hssf.record.chart.*;
 import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BarRecord;
-import org.apache.poi.hssf.record.BeginRecord;
-import org.apache.poi.hssf.record.CategorySeriesAxisRecord;
-import org.apache.poi.hssf.record.ChartFormatRecord;
-import org.apache.poi.hssf.record.ChartRecord;
-import org.apache.poi.hssf.record.ChartTitleFormatRecord;
-import org.apache.poi.hssf.record.DataFormatRecord;
-import org.apache.poi.hssf.record.DefaultDataLabelTextPropertiesRecord;
 import org.apache.poi.hssf.record.DimensionsRecord;
 import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.EndRecord;
-import org.apache.poi.hssf.record.FontBasisRecord;
-import org.apache.poi.hssf.record.FontIndexRecord;
 import org.apache.poi.hssf.record.FooterRecord;
-import org.apache.poi.hssf.record.FrameRecord;
 import org.apache.poi.hssf.record.HCenterRecord;
 import org.apache.poi.hssf.record.HeaderRecord;
-import org.apache.poi.hssf.record.LegendRecord;
-import org.apache.poi.hssf.record.LineFormatRecord;
-import org.apache.poi.hssf.record.LinkedDataRecord;
-import org.apache.poi.hssf.record.PlotAreaRecord;
-import org.apache.poi.hssf.record.PlotGrowthRecord;
 import org.apache.poi.hssf.record.PrintSetupRecord;
 import org.apache.poi.hssf.record.ProtectRecord;
 import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.record.RecordBase;
 import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.SeriesIndexRecord;
-import org.apache.poi.hssf.record.SeriesRecord;
-import org.apache.poi.hssf.record.SeriesTextRecord;
-import org.apache.poi.hssf.record.SeriesToChartGroupRecord;
-import org.apache.poi.hssf.record.SheetPropertiesRecord;
-import org.apache.poi.hssf.record.TextRecord;
-import org.apache.poi.hssf.record.TickRecord;
-import org.apache.poi.hssf.record.UnitsRecord;
 import org.apache.poi.hssf.record.UnknownRecord;
 import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.ValueRangeRecord;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
 

src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java

@@ -20,11 +20,14 @@ package org.apache.poi.hssf.usermodel;
 import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.SeriesRecord;
+import org.apache.poi.hssf.record.chart.SeriesRecord;
 
+/**
+ * Tests for {@link HSSFChart}
+ */
 public final class TestHSSFChart extends TestCase {
 
-	public void testSingleChart() throws Exception {
+	public void testSingleChart() {
 		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithChart.xls");
 		
 		HSSFSheet s1 = wb.getSheetAt(0);
@@ -53,7 +56,7 @@ public final class TestHSSFChart extends TestCase {
 		assertEquals(15040512, charts[0].getChartHeight());
 	}
 
-	public void testTwoCharts() throws Exception {
+	public void testTwoCharts() {
 		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithTwoCharts.xls");
 		
 		HSSFSheet s1 = wb.getSheetAt(0);
@@ -85,7 +88,7 @@ public final class TestHSSFChart extends TestCase {
 		assertEquals(null, charts[0].getChartTitle());
 	}
 	
-	public void testThreeCharts() throws Exception {
+	public void testThreeCharts() {
 		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithThreeCharts.xls");
 		
 		HSSFSheet s1 = wb.getSheetAt(0);

src/testcases/org/apache/poi/hssf/record/AllRecordTests.java

@@ -22,11 +22,12 @@ import junit.framework.TestSuite;
 
 import org.apache.poi.hssf.record.aggregates.AllRecordAggregateTests;
 import org.apache.poi.hssf.record.cf.TestCellRange;
+import org.apache.poi.hssf.record.chart.AllChartRecordTests;
 import org.apache.poi.hssf.record.constant.TestConstantValueParser;
 import org.apache.poi.hssf.record.formula.AllFormulaTests;
 
 /**
- * Collects all tests for package <tt>org.apache.poi.hssf.record</tt>.
+ * Collects all tests for package <tt>org.apache.poi.hssf.record</tt> and sub-packages.
  * 
  * @author Josh Micich
  */
@@ -35,28 +36,15 @@ public final class AllRecordTests {
 	public static Test suite() {
 		TestSuite result = new TestSuite(AllRecordTests.class.getName());
 
+		result.addTest(AllChartRecordTests.suite());
 		result.addTest(AllFormulaTests.suite());
 		result.addTest(AllRecordAggregateTests.suite());
 
-		result.addTestSuite(TestAreaFormatRecord.class);
-		result.addTestSuite(TestAreaRecord.class);
-		result.addTestSuite(TestAxisLineFormatRecord.class);
-		result.addTestSuite(TestAxisOptionsRecord.class);
-		result.addTestSuite(TestAxisParentRecord.class);
-		result.addTestSuite(TestAxisRecord.class);
-		result.addTestSuite(TestAxisUsedRecord.class);
 		result.addTestSuite(TestBOFRecord.class);
-		result.addTestSuite(TestBarRecord.class);
 		result.addTestSuite(TestBoundSheetRecord.class);
-		result.addTestSuite(TestCategorySeriesAxisRecord.class);
 		result.addTestSuite(TestCFHeaderRecord.class);
 		result.addTestSuite(TestCFRuleRecord.class);
-		result.addTestSuite(TestChartRecord.class);
-		result.addTestSuite(TestChartTitleFormatRecord.class);
 		result.addTestSuite(TestCommonObjectDataSubRecord.class);
-		result.addTestSuite(TestDatRecord.class);
-		result.addTestSuite(TestDataFormatRecord.class);
-		result.addTestSuite(TestDefaultDataLabelTextPropertiesRecord.class);
 		result.addTestSuite(TestDrawingGroupRecord.class);
 		result.addTestSuite(TestEmbeddedObjectRefSubRecord.class);
 		result.addTestSuite(TestEndSubRecord.class);
@@ -64,40 +52,22 @@ public final class AllRecordTests {
 		result.addTestSuite(TestExtendedFormatRecord.class);
 		result.addTestSuite(TestExternalNameRecord.class);
 		result.addTestSuite(TestFontRecord.class);
-		result.addTestSuite(TestFontBasisRecord.class);
-		result.addTestSuite(TestFontIndexRecord.class);
 		result.addTestSuite(TestFormulaRecord.class);
-		result.addTestSuite(TestFrameRecord.class);
 		result.addTestSuite(TestHyperlinkRecord.class);
 		result.addTestSuite(TestLabelRecord.class);
-		result.addTestSuite(TestLegendRecord.class);
-		result.addTestSuite(TestLineFormatRecord.class);
-		result.addTestSuite(TestLinkedDataRecord.class);
 		result.addTestSuite(TestMergeCellsRecord.class);
 		result.addTestSuite(TestNameRecord.class);
 		result.addTestSuite(TestNoteRecord.class);
 		result.addTestSuite(TestNoteStructureSubRecord.class);
-		result.addTestSuite(TestNumberFormatIndexRecord.class);
 		result.addTestSuite(TestObjRecord.class);
-		result.addTestSuite(TestObjectLinkRecord.class);
 		result.addTestSuite(TestPaletteRecord.class);
 		result.addTestSuite(TestPaneRecord.class);
-		result.addTestSuite(TestPlotAreaRecord.class);
-		result.addTestSuite(TestPlotGrowthRecord.class);
 		result.addTestSuite(TestRecordInputStream.class);
 		result.addTestSuite(TestRecordFactory.class);
 		result.addTestSuite(TestSCLRecord.class);
 		result.addTestSuite(TestSSTDeserializer.class);
 		result.addTestSuite(TestSSTRecord.class);
 		result.addTestSuite(TestSSTRecordSizeCalculator.class);
-		result.addTestSuite(TestSeriesChartGroupIndexRecord.class);
-		result.addTestSuite(TestSeriesIndexRecord.class);
-		result.addTestSuite(TestSeriesLabelsRecord.class);
-		result.addTestSuite(TestSeriesListRecord.class);
-		result.addTestSuite(TestSeriesRecord.class);
-		result.addTestSuite(TestSeriesTextRecord.class);
-		result.addTestSuite(TestSeriesToChartGroupRecord.class);
-		result.addTestSuite(TestSheetPropertiesRecord.class);
 		result.addTestSuite(TestSharedFormulaRecord.class);
 		result.addTestSuite(TestStringRecord.class);
 		result.addTestSuite(TestStyleRecord.class);
@@ -106,12 +76,8 @@ public final class AllRecordTests {
 		result.addTestSuite(TestTableRecord.class);
 		result.addTestSuite(TestTextObjectBaseRecord.class);
 		result.addTestSuite(TestTextObjectRecord.class);
-		result.addTestSuite(TestTextRecord.class);
-		result.addTestSuite(TestTickRecord.class);
 		result.addTestSuite(TestUnicodeNameRecord.class);
 		result.addTestSuite(TestUnicodeString.class);
-		result.addTestSuite(TestUnitsRecord.class);
-		result.addTestSuite(TestValueRangeRecord.class);
 		result.addTestSuite(TestCellRange.class);
 		result.addTestSuite(TestConstantValueParser.class);
 		return result;

src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java

@@ -0,0 +1,71 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.chart;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Collects all tests for package <tt>org.apache.poi.hssf.record.class</tt>.
+ * 
+ * @author Josh Micich
+ */
+public final class AllChartRecordTests {
+	
+	public static Test suite() {
+		TestSuite result = new TestSuite(AllChartRecordTests.class.getName());
+
+		result.addTestSuite(TestAreaFormatRecord.class);
+		result.addTestSuite(TestAreaRecord.class);
+		result.addTestSuite(TestAxisLineFormatRecord.class);
+		result.addTestSuite(TestAxisOptionsRecord.class);
+		result.addTestSuite(TestAxisParentRecord.class);
+		result.addTestSuite(TestAxisRecord.class);
+		result.addTestSuite(TestAxisUsedRecord.class);
+		result.addTestSuite(TestBarRecord.class);
+		result.addTestSuite(TestCategorySeriesAxisRecord.class);
+		result.addTestSuite(TestChartRecord.class);
+		result.addTestSuite(TestChartTitleFormatRecord.class);
+		result.addTestSuite(TestDatRecord.class);
+		result.addTestSuite(TestDataFormatRecord.class);
+		result.addTestSuite(TestDefaultDataLabelTextPropertiesRecord.class);
+		result.addTestSuite(TestFontBasisRecord.class);
+		result.addTestSuite(TestFontIndexRecord.class);
+		result.addTestSuite(TestFrameRecord.class);
+		result.addTestSuite(TestLegendRecord.class);
+		result.addTestSuite(TestLineFormatRecord.class);
+		result.addTestSuite(TestLinkedDataRecord.class);
+		result.addTestSuite(TestNumberFormatIndexRecord.class);
+		result.addTestSuite(TestObjectLinkRecord.class);
+		result.addTestSuite(TestPlotAreaRecord.class);
+		result.addTestSuite(TestPlotGrowthRecord.class);
+		result.addTestSuite(TestSeriesChartGroupIndexRecord.class);
+		result.addTestSuite(TestSeriesIndexRecord.class);
+		result.addTestSuite(TestSeriesLabelsRecord.class);
+		result.addTestSuite(TestSeriesListRecord.class);
+		result.addTestSuite(TestSeriesRecord.class);
+		result.addTestSuite(TestSeriesTextRecord.class);
+		result.addTestSuite(TestSeriesToChartGroupRecord.class);
+		result.addTestSuite(TestSheetPropertiesRecord.class);
+		result.addTestSuite(TestTextRecord.class);
+		result.addTestSuite(TestTickRecord.class);
+		result.addTestSuite(TestUnitsRecord.class);
+		result.addTestSuite(TestValueRangeRecord.class);
+		return result;
+	}
+}

src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java

@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -27,6 +27,7 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
 import org.apache.poi.hssf.eventusermodel.HSSFListener;
 import org.apache.poi.hssf.eventusermodel.HSSFRequest;
+import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
         
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java

@@ -15,7 +15,9 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
+
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 
 import junit.framework.TestCase;
 

src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java

@@ -15,11 +15,12 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
 import junit.framework.TestCase;
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
 

src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java

@@ -15,11 +15,14 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.poi.hssf.record.RecordFormatException;
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 import org.apache.poi.util.HexRead;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**

src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java

@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**