diff options
author | PJ Fanning <fanningpj@apache.org> | 2020-01-10 23:13:20 +0000 |
---|---|---|
committer | PJ Fanning <fanningpj@apache.org> | 2020-01-10 23:13:20 +0000 |
commit | 2797d07486b036e5486f959b4db769b01320afee (patch) | |
tree | ba39b24f0af64287c39eb57307167caa86cb9b13 /src/integrationtest/org/apache | |
parent | 12d49035c0d39bd19ac6cfb0d30de545f65a9b7f (diff) | |
download | poi-2797d07486b036e5486f959b4db769b01320afee.tar.gz poi-2797d07486b036e5486f959b4db769b01320afee.zip |
try to fix some jdk 14 build issues due to java.lang.Record causing existing POI Record classes to be ambiguous
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1872610 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/integrationtest/org/apache')
-rw-r--r-- | src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java | 4 | ||||
-rw-r--r-- | src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java b/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java index 740068fd9e..d277d40e8a 100644 --- a/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java +++ b/src/integrationtest/org/apache/poi/hssf/usermodel/RecordsStresser.java @@ -33,8 +33,8 @@ import org.junit.Test; */ public class RecordsStresser { public static void handleWorkbook(HSSFWorkbook wb) { - List<Record> records = wb.getWorkbook().getRecords(); - for(Record record : records) { + List<org.apache.poi.hssf.record.Record> records = wb.getWorkbook().getRecords(); + for(org.apache.poi.hssf.record.Record record : records) { // some Records do not implement clone ?! // equals instead of instanceof is on purpose here to only skip exactly this class and not any derived ones // if(record.getClass().equals(InterfaceHdrRecord.class) || diff --git a/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java b/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java index 15209d3d76..3adbcd0a08 100644 --- a/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java +++ b/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java @@ -36,9 +36,9 @@ public class HSLFFileHandler extends SlideShowHandler { assertNotNull(slide.getEmbeddedObjects()); assertNotNull(slide.getUnderlyingBytes()); assertNotNull(slide.getPictureData()); - Record[] records = slide.getRecords(); + org.apache.poi.hssf.record.Record[] records = slide.getRecords(); assertNotNull(records); - for(Record record : records) { + for(org.apache.poi.hssf.record.Record record : records) { assertNotNull("Found a record which was null", record); assertTrue(record.getRecordType() >= 0); } |