Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java Fri Jan 10 23:13:20 2020 @@ -48,7 +48,7 @@ public final class TestFeatRecord { int countFRH = 0; // Check on the workbook, but shouldn't be there! - for(Record r : wb.getRecords()) { + for(org.apache.poi.hssf.record.Record r : wb.getRecords()) { if(r instanceof FeatRecord) { countFR++; } else if (r.getSid() == FeatRecord.sid) { @@ -70,7 +70,7 @@ public final class TestFeatRecord { for(RecordBase rb : sheet.getRecords()) { if(rb instanceof Record) { - Record r = (Record)rb; + Record r = (org.apache.poi.hssf.record.Record)rb; if(r instanceof FeatRecord) { countFR++; } else if (r.getSid() == FeatRecord.sid) { @@ -102,7 +102,7 @@ public final class TestFeatRecord { // First check it isn't on the Workbook int countFR = 0; int countFRH = 0; - for(Record r : wb.getRecords()) { + for(org.apache.poi.hssf.record.Record r : wb.getRecords()) { if(r instanceof FeatRecord) { fr = (FeatRecord)r; countFR++; @@ -125,7 +125,7 @@ public final class TestFeatRecord { for(RecordBase rb : sheet.getRecords()) { if(rb instanceof Record) { - Record r = (Record)rb; + Record r = (org.apache.poi.hssf.record.Record)rb; if(r instanceof FeatRecord) { fr = (FeatRecord)r; countFR++;
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java Fri Jan 10 23:13:20 2020 @@ -52,7 +52,7 @@ public final class TestInterfaceEndRecor "E2 00 02 00 B0 04 " + //INTERFACEEND with extra two bytes "0A 00 00 00"; // EOF byte[] data = HexRead.readFromString(hex); - List<Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data)); + List<org.apache.poi.hssf.record.Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data)); assertEquals(3, records.size()); Record rec1 = records.get(1); assertEquals(InterfaceHdrRecord.class, rec1.getClass()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java Fri Jan 10 23:13:20 2020 @@ -59,7 +59,7 @@ public final class TestMergeCellsRecord @Test public void testMCTable_bug46009() { MergedCellsTable mct = new MergedCellsTable(); - List<Record> recList = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> recList = new ArrayList<>(); CellRangeAddress[] cras = new CellRangeAddress[] { new CellRangeAddress(0, 0, 0, 3), }; Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java Fri Jan 10 23:13:20 2020 @@ -182,7 +182,7 @@ public final class TestRecordFactory { "00 00 00 00 00 00 00"; byte[] data = HexRead.readFromString(dump); - List<Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data)); + List<org.apache.poi.hssf.record.Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data)); assertEquals(5, records.size()); assertTrue(records.get(0) instanceof ObjRecord); assertTrue(records.get(1) instanceof DrawingRecord); @@ -192,7 +192,7 @@ public final class TestRecordFactory { //serialize and verify that the serialized data is the same as the original ByteArrayOutputStream out = new ByteArrayOutputStream(); - for(Record rec : records){ + for(org.apache.poi.hssf.record.Record rec : records){ out.write(rec.serialize()); } @@ -211,7 +211,7 @@ public final class TestRecordFactory { EOFRecord.instance, }; ByteArrayOutputStream baos = new ByteArrayOutputStream(); - for (Record rec : recs) { + for (org.apache.poi.hssf.record.Record rec : recs) { try { baos.write(rec.serialize()); } catch (IOException e) { @@ -232,7 +232,7 @@ public final class TestRecordFactory { fs.createDocument(new ByteArrayInputStream(baos.toByteArray()), "dummy"); InputStream is = fs.getRoot().createDocumentInputStream("dummy"); - List<Record> outRecs = RecordFactory.createRecords(is); + List<org.apache.poi.hssf.record.Record> outRecs = RecordFactory.createRecords(is); // Buffer underrun - requested 512 bytes but 192 was available assertEquals(5, outRecs.size()); fs.close(); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java Fri Jan 10 23:13:20 2020 @@ -55,7 +55,7 @@ public final class TestCFRecordsAggregat HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet(); - List<Record> recs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>(); CFHeaderBase header = new CFHeaderRecord(); CFRuleBase rule1 = CFRuleRecord.create(sheet, "7"); CFRuleBase rule2 = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5"); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java Fri Jan 10 23:13:20 2020 @@ -69,7 +69,7 @@ public final class TestColumnInfoRecords // bug 45639 - ArrayIndexOutOfBoundsException agg.groupColumnRange( 1, 15, true); - List<Record> cirs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> cirs = new ArrayList<>(); agg.visitContainedRecords(cirs::add); assertEquals(5, cirs.size()); @@ -89,7 +89,7 @@ public final class TestColumnInfoRecords agg.groupColumnRange(1, 15, true); agg.groupColumnRange(4, 12, true); - List<Record> cirs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> cirs = new ArrayList<>(); // collapse both inner and outer groups agg.collapseColumn(6); @@ -116,7 +116,7 @@ public final class TestColumnInfoRecords confirmCIR(cirs, 3, 16, 16, 0, false, true); } - private static void confirmCIR(List<Record> cirs, int ix, int startColIx, int endColIx, int level, boolean isHidden, boolean isCollapsed) { + private static void confirmCIR(List<org.apache.poi.hssf.record.Record> cirs, int ix, int startColIx, int endColIx, int level, boolean isHidden, boolean isCollapsed) { assertTrue(cirs.get(ix) instanceof ColumnInfoRecord); ColumnInfoRecord cir = (ColumnInfoRecord)cirs.get(ix); assertEquals("startColIx", startColIx, cir.getFirstColumn()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java Fri Jan 10 23:13:20 2020 @@ -65,7 +65,7 @@ public final class TestFormulaRecordAggr SharedValueManager svm = SharedValueManager.createEmpty(); // bug 46213 -> String record was supplied but formula record flag is not set FormulaRecordAggregate fra = new FormulaRecordAggregate(fr, sr, svm); - List<Record> vraRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> vraRecs = new ArrayList<>(); fra.visitContainedRecords(vraRecs::add); assertEquals(1, vraRecs.size()); assertEquals(fr, vraRecs.get(0)); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java Fri Jan 10 23:13:20 2020 @@ -92,7 +92,7 @@ public final class TestPageSettingsBlock nr.setColumn((short) colIx); nr.setValue(3.0); - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { BOFRecord.createSheetBOF(), new HeaderRecord("&LSales Figures"), new FooterRecord("&LJanuary"), @@ -111,7 +111,7 @@ public final class TestPageSettingsBlock // bug 46480- two Page Settings Blocks found in the same sheet InternalSheet sheet = InternalSheet.createSheet(rs); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, rowIx); assertEquals(13, outRecs.size()); } @@ -129,7 +129,7 @@ public final class TestPageSettingsBlock nr.setColumn((short) colIx); nr.setValue(3.0); - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { BOFRecord.createSheetBOF(), new HeaderRecord("&LSales Figures"), new FooterRecord("&LJanuary"), @@ -141,7 +141,7 @@ public final class TestPageSettingsBlock RecordStream rs = new RecordStream(Arrays.asList(recs), 0); InternalSheet sheet = InternalSheet.createSheet(rs); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, 0); // Identified bug 46953 - EOF incorrectly appended to PSB assertNotEquals(EOFRecord.instance, outRecs.get(4)); @@ -170,7 +170,7 @@ public final class TestPageSettingsBlock BottomMarginRecord bottomMargin = new BottomMarginRecord(); bottomMargin.setMargin(0.787F); - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { BOFRecord.createSheetBOF(), new HeaderRecord("&LSales Figures"), new FooterRecord("&LJanuary"), @@ -184,7 +184,7 @@ public final class TestPageSettingsBlock // bug 47199a - failed to process late margins records InternalSheet sheet = InternalSheet.createSheet(rs); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, 0); assertEquals(recs.length+1, outRecs.size()); // +1 for index record @@ -201,7 +201,7 @@ public final class TestPageSettingsBlock @Test public void testDuplicatePSBRecord_bug47199() { // Hypothetical setup of PSB records which should cause POI to crash - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { new HeaderRecord("&LSales Figures"), new HeaderRecord("&LInventory"), }; @@ -220,7 +220,7 @@ public final class TestPageSettingsBlock @Test public void testMissingHeaderFooter() { // initialise PSB with some records, but not the header / footer - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { new HCenterRecord(), new VCenterRecord(), }; @@ -228,7 +228,7 @@ public final class TestPageSettingsBlock PageSettingsBlock psb = new PageSettingsBlock(rs); // serialize the PSB to see what records come out - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); psb.visitContainedRecords(outRecs::add); assertNotEquals("PageSettingsBlock didn't add missing header/footer records", 2, outRecs.size()); @@ -259,7 +259,7 @@ public final class TestPageSettingsBlock Record plsB = new UnknownRecord(UnknownRecord.PLS_004D, HexRead.readFromString("DE AD BE EF")); Record contB1 = new ContinueRecord(HexRead.readFromString("FE ED")); Record contB2 = new ContinueRecord(HexRead.readFromString("FA CE")); - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { new HeaderRecord("&LSales Figures"), new FooterRecord("&LInventory"), new HCenterRecord(), @@ -272,7 +272,7 @@ public final class TestPageSettingsBlock PageSettingsBlock psb = new PageSettingsBlock(rs); // serialize the PSB to see what records come out - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); psb.visitContainedRecords(outRecs::add); // records were assembled in standard order, so this simple check is OK @@ -282,7 +282,7 @@ public final class TestPageSettingsBlock @Test public void testDuplicateHeaderFooter_bug48026() { - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { BOFRecord.createSheetBOF(), new IndexRecord(), @@ -309,7 +309,7 @@ public final class TestPageSettingsBlock // bug 48026 - Duplicate PageSettingsBlock record (sid=0x89c) InternalSheet sheet = InternalSheet.createSheet(rs); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, 0); assertEquals(recs.length, outRecs.size()); @@ -382,7 +382,7 @@ public final class TestPageSettingsBlock // Bug 48026 : Duplicate PageSettingsBlock record (sid=0x89c) InternalSheet sheet = InternalSheet.createSheet(rs); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, 0); assertEquals(recs.length+1, outRecs.size()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java Fri Jan 10 23:13:20 2020 @@ -71,7 +71,7 @@ public final class TestRowRecordsAggrega @Test public void testArraysAndTables() throws Exception { try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testArraysAndTables.xls")) { - final List<Record> sheetRecs = new ArrayList<>(); + final List<org.apache.poi.hssf.record.Record> sheetRecs = new ArrayList<>(); wb.getSheetAt(0).getSheet().visitContainedRecords(sheetRecs::add, 0); int countArrayFormulas = verifySharedValues(sheetRecs, ArrayRecord.class); @@ -100,7 +100,7 @@ public final class TestRowRecordsAggrega } } - private static int verifySharedValues(List<Record> recs, Class<? extends SharedValueRecordBase> shfClass) { + private static int verifySharedValues(List<org.apache.poi.hssf.record.Record> recs, Class<? extends SharedValueRecordBase> shfClass) { int result =0; for(int i=0; i<recs.size(); i++) { @@ -137,7 +137,7 @@ public final class TestRowRecordsAggrega */ @Test public void testUnknownContinue_bug46280() { - Record[] inRecs = { + org.apache.poi.hssf.record.Record[] inRecs = { new RowRecord(0), new NumberRecord(), new UnknownRecord(0x5555, "dummydata".getBytes(LocaleUtil.CHARSET_1252)), @@ -154,7 +154,7 @@ public final class TestRowRecordsAggrega throw e; } - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); rra.visitContainedRecords(outRecs::add); assertEquals(5, outRecs.size()); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java Fri Jan 10 23:13:20 2020 @@ -67,7 +67,7 @@ public final class TestValueRecordsAggre */ @Test public void testSharedFormula() { - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); records.add(new FormulaRecord()); records.add(new SharedFormulaRecord()); records.add(new WindowTwoRecord()); @@ -82,7 +82,7 @@ public final class TestValueRecordsAggre assertTrue( "First record is a FormulaRecordsAggregate", ( record instanceof FormulaRecordAggregate ) ); } - private void constructValueRecord(List<Record> records) { + private void constructValueRecord(List<org.apache.poi.hssf.record.Record> records) { RowBlocksReader rbr = new RowBlocksReader(new RecordStream(records, 0)); SharedValueManager sfrh = rbr.getSharedFormulaManager(); RecordStream rs = rbr.getPlainRecordStream(); @@ -92,8 +92,8 @@ public final class TestValueRecordsAggre } } - private static List<Record> testData() { - List<Record> records = new ArrayList<>(); + private static List<org.apache.poi.hssf.record.Record> testData() { + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); FormulaRecord formulaRecord = new FormulaRecord(); BlankRecord blankRecord = new BlankRecord(); formulaRecord.setRow(1); @@ -174,7 +174,7 @@ public final class TestValueRecordsAggre } @Override - public void visitRecord(Record r) { + public void visitRecord(org.apache.poi.hssf.record.Record r) { r.serialize(_writeIndex, _buf); _writeIndex += r.getRecordSize(); } @@ -191,7 +191,7 @@ public final class TestValueRecordsAggre + "01 02 06 00 " // Blank + "02 00 02 00 00 00"); byte[] actualArray = new byte[expectedArray.length]; - List<Record> records = testData(); + List<org.apache.poi.hssf.record.Record> records = testData(); constructValueRecord(records); SerializerVisitor sv = new SerializerVisitor(actualArray); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java Fri Jan 10 23:13:20 2020 @@ -71,7 +71,7 @@ public final class TestChartTitleFormatR } @Override - public void processRecord(Record record) { + public void processRecord(org.apache.poi.hssf.record.Record record) { if(record instanceof ChartTitleFormatRecord) { chartTitleFormatRecords.add((ChartTitleFormatRecord)record); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java Fri Jan 10 23:13:20 2020 @@ -258,7 +258,7 @@ public class SanityChecker { private void checkWorkbookRecords(InternalWorkbook workbook) { - List<Record> records = workbook.getRecords(); + List<org.apache.poi.hssf.record.Record> records = workbook.getRecords(); assertTrue(records.get(0) instanceof BOFRecord); assertTrue(records.get(records.size() - 1) instanceof EOFRecord); @@ -338,7 +338,7 @@ public class SanityChecker { int checkIndex = 0; for (int recordIndex = 0; recordIndex < records.size(); recordIndex++) { - Record record = (Record) records.get(recordIndex); + Record record = (org.apache.poi.hssf.record.Record) records.get(recordIndex); if (check[checkIndex].getRecord().isInstance(record)) { if (check[checkIndex].getOccurance() == 'M') Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Fri Jan 10 23:13:20 2020 @@ -1641,7 +1641,7 @@ public final class TestBugs extends Base try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) { // Ensure the tab index TabIdRecord tr = null; - for (Record r : wb2.getWorkbook().getRecords()) { + for (org.apache.poi.hssf.record.Record r : wb2.getWorkbook().getRecords()) { if (r instanceof TabIdRecord) { tr = (TabIdRecord) r; } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java Fri Jan 10 23:13:20 2020 @@ -327,7 +327,7 @@ public final class TestHSSFCell extends confirmStringRecord(sheet, true); cell.setCellValue(123); - final List<Record> recs = new ArrayList<>(); + final List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>(); sheet.getSheet().visitContainedRecords(recs::add, 0); assertFalse("Identified bug - leftover StringRecord", recs.size() == 28 && recs.get(23) instanceof StringRecord); confirmStringRecord(sheet, false); @@ -347,11 +347,11 @@ public final class TestHSSFCell extends } private static void confirmStringRecord(HSSFSheet sheet, boolean isPresent) { - List<Record> recs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>(); sheet.getSheet().visitContainedRecords(recs::add, 0); assertEquals(isPresent ? 28 : 27, recs.size()); - ListIterator<Record> iter = recs.listIterator(22); + ListIterator<org.apache.poi.hssf.record.Record> iter = recs.listIterator(22); assertEquals(FormulaRecord.class, iter.next().getClass()); if (isPresent) { assertEquals(StringRecord.class, iter.next().getClass()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java Fri Jan 10 23:13:20 2020 @@ -414,7 +414,7 @@ public final class TestHSSFSheet extends try (HSSFWorkbook wb = new HSSFWorkbook()) { HSSFSheet s = wb.createSheet(); s.protectSheet("secret"); - List<Record> recs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>(); s.getSheet().visitContainedRecords(recs::add, 0); int nRecs = recs.size(); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java Fri Jan 10 23:13:20 2020 @@ -86,11 +86,11 @@ public final class TestHSSFSheetUpdateAr HSSFSheet s = wb.createSheet("Sheet1"); CellRange<HSSFCell> cr = s.setArrayFormula("123", CellRangeAddress.valueOf("B5:C6")); - List<Record> recs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>(); s.getSheet().visitContainedRecords(recs::add, 0); int ix = 0; - for (Record r : recs) { + for (org.apache.poi.hssf.record.Record r : recs) { if (r instanceof ArrayRecord) break; ix++; } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java Fri Jan 10 23:13:20 2020 @@ -47,7 +47,7 @@ public final class TestSanityChecker { @Test public void testCheckRecordOrder() { final SanityChecker c = new SanityChecker(); - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); records.add(new BOFRecord()); records.add(INTERFACEHDR); records.add(createBoundSheetRec()); @@ -121,7 +121,7 @@ public final class TestSanityChecker { } private static void confirmBadRecordOrder(final SanityChecker.CheckRecord[] check, Record[] recs) { final SanityChecker c = new SanityChecker(); - final List<Record> records = Arrays.asList(recs); + final List<org.apache.poi.hssf.record.Record> records = Arrays.asList(recs); try { new Runnable() { @Override Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java Fri Jan 10 23:13:20 2020 @@ -456,7 +456,7 @@ public final class TestWorkbook { return _count; } @Override - public void visitRecord(Record r) { + public void visitRecord(org.apache.poi.hssf.record.Record r) { if (r instanceof LabelSSTRecord) { _count++; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
