Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/extractor/HemfExtractorTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/extractor/HemfExtractorTest.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/extractor/HemfExtractorTest.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/extractor/HemfExtractorTest.java Sat Sep 16 08:27:23 2017 @@ -135,7 +135,7 @@ public class HemfExtractorTest { long lastX = -1; long fudgeFactorX = 1000;//derive this from the font or frame/bounds information StringBuilder sb = new StringBuilder(); - Set<String> expectedParts = new HashSet<String>(); + Set<String> expectedParts = new HashSet<>(); expectedParts.add("C:\\Users\\tallison\\"); expectedParts.add("testPDF.pdf"); int foundExpected = 0;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/HemfPlusExtractorTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/HemfPlusExtractorTest.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/HemfPlusExtractorTest.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/HemfPlusExtractorTest.java Sat Sep 16 08:27:23 2017 @@ -54,7 +54,7 @@ public class HemfPlusExtractorTest { //test that the HemfCommentEMFPlus record at offset 1 //contains 6 HemfCommentEMFPlus records within it - List<HemfPlusRecordType> expected = new ArrayList<HemfPlusRecordType>(); + List<HemfPlusRecordType> expected = new ArrayList<>(); expected.add(HemfPlusRecordType.setPixelOffsetMode); expected.add(HemfPlusRecordType.setAntiAliasMode); expected.add(HemfPlusRecordType.setCompositingQuality); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java Sat Sep 16 08:27:23 2017 @@ -77,8 +77,8 @@ public final class TestReWriteSanity { // Find the location of the PersistPtrIncrementalBlocks and // UserEditAtoms Record[] r = wss.getRecords(); - Map<Integer,Record> pp = new HashMap<Integer,Record>(); - Map<Integer,Object> ue = new HashMap<Integer,Object>(); + Map<Integer,Record> pp = new HashMap<>(); + Map<Integer,Object> ue = new HashMap<>(); ue.put(Integer.valueOf(0),Integer.valueOf(0)); // Will show 0 if first int pos = 0; int lastUEPos = -1; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java Sat Sep 16 08:27:23 2017 @@ -159,7 +159,7 @@ public final class TestHyperlink { } private static List<HSLFHyperlink> findHyperlinks(List<HSLFTextParagraph> paras) { - List<HSLFHyperlink> links = new ArrayList<HSLFHyperlink>(); + List<HSLFHyperlink> links = new ArrayList<>(); for (HSLFTextParagraph p : paras) { for (HSLFTextRun r : p) { HSLFHyperlink hl = r.getHyperlink(); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java Sat Sep 16 08:27:23 2017 @@ -291,7 +291,7 @@ public final class TestShapes { private void textBoxSet(String filename) throws IOException { HSLFSlideShow ss = new HSLFSlideShow(_slTests.openResourceAsStream(filename)); for (HSLFSlide sld : ss.getSlides()) { - ArrayList<String> lst1 = new ArrayList<String>(); + ArrayList<String> lst1 = new ArrayList<>(); for (List<HSLFTextParagraph> txt : sld.getTextParagraphs()) { for (HSLFTextParagraph p : txt) { for (HSLFTextRun r : p) { @@ -300,7 +300,7 @@ public final class TestShapes { } } - ArrayList<String> lst2 = new ArrayList<String>(); + ArrayList<String> lst2 = new ArrayList<>(); for (HSLFShape sh : sld.getShapes()) { if (sh instanceof HSLFTextShape){ HSLFTextShape tbox = (HSLFTextShape)sh; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java Sat Sep 16 08:27:23 2017 @@ -77,7 +77,7 @@ public final class TestExHyperlink { assertNotNull(exObjList); // Within that, grab out the Hyperlink atoms - List<ExHyperlink> linksA = new ArrayList<ExHyperlink>(); + List<ExHyperlink> linksA = new ArrayList<>(); for (Record ch : exObjList._children) { if(ch instanceof ExHyperlink) { linksA.add((ExHyperlink) ch); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java Sat Sep 16 08:27:23 2017 @@ -201,7 +201,7 @@ public final class TestTxMasterStyleAtom * There must be a TxMasterStyleAtom per each type of text defined in TextHeaderAtom */ protected TxMasterStyleAtom[] getMasterStyles(){ - List<TxMasterStyleAtom> lst = new ArrayList<TxMasterStyleAtom>(); + List<TxMasterStyleAtom> lst = new ArrayList<>(); Record[] coreRecs = _ppt.getMostRecentCoreRecords(); for (final Record coreRec : coreRecs) { Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java Sat Sep 16 08:27:23 2017 @@ -150,7 +150,7 @@ public final class TestBugs { HSLFSlideShow ppt = open("42474-2.ppt"); //map slide number and starting phrase of its notes - Map<Integer, String> notesMap = new HashMap<Integer, String>(); + Map<Integer, String> notesMap = new HashMap<>(); notesMap.put(Integer.valueOf(4), "For decades before calculators"); notesMap.put(Integer.valueOf(5), "Several commercial applications"); notesMap.put(Integer.valueOf(6), "There are three variations of LNS that are discussed here"); @@ -308,7 +308,7 @@ public final class TestBugs { List<List<HSLFTextParagraph>> paras = slide.get(0).getTextParagraphs(); assertEquals(4, paras.size()); - Set<String> expected = new HashSet<String>(); + Set<String> expected = new HashSet<>(); expected.add("\u201CHAPPY BIRTHDAY SCOTT\u201D"); expected.add("Have a HAPPY DAY"); expected.add("PS Nobody is allowed to hassle Scott TODAY\u2026"); @@ -344,7 +344,7 @@ public final class TestBugs { assertEquals("Second run", HSLFTextParagraph.getRawText(slTr.get(2))); // Check the shape based text runs - List<HSLFTextParagraph> lst = new ArrayList<HSLFTextParagraph>(); + List<HSLFTextParagraph> lst = new ArrayList<>(); for (HSLFShape shape : slide.getShapes()) { if (shape instanceof HSLFTextShape){ List<HSLFTextParagraph> textRun = ((HSLFTextShape)shape).getTextParagraphs(); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java Sat Sep 16 08:27:23 2017 @@ -67,8 +67,8 @@ public class TestFontRendering { // setup fonts (especially needed, when run under *nix systems) GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Map<String,String> fontMap = new HashMap<String,String>(); - Map<String,String> fallbackMap = new HashMap<String,String>(); + Map<String,String> fontMap = new HashMap<>(); + Map<String,String> fallbackMap = new HashMap<>(); for (String fontFile[] : fontFiles) { File f = new File(fontFile[0]); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java Sat Sep 16 08:27:23 2017 @@ -74,7 +74,7 @@ public final class TestTextShape { public void read() throws IOException { HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("text_shapes.ppt"); - List<String> lst1 = new ArrayList<String>(); + List<String> lst1 = new ArrayList<>(); HSLFSlide slide = ppt.getSlides().get(0); for (HSLFShape shape : slide.getShapes()) { assertTrue("Expected TextShape but found " + shape.getClass().getName(), shape instanceof HSLFTextShape); @@ -112,7 +112,7 @@ public final class TestTextShape { lst1.add(rawText); } - List<String> lst2 = new ArrayList<String>(); + List<String> lst2 = new ArrayList<>(); for (List<HSLFTextParagraph> paras : slide.getTextParagraphs()) { lst2.add(HSLFTextParagraph.getRawText(paras)); } @@ -163,7 +163,7 @@ public final class TestTextShape { HSLFSlide slide = ppt.getSlides().get(0); - Map<String,HSLFTextShape> map = new HashMap<String,HSLFTextShape>(); + Map<String,HSLFTextShape> map = new HashMap<>(); for (HSLFShape shape : slide.getShapes()) { if(shape instanceof HSLFTextShape){ HSLFTextShape tx = (HSLFTextShape)shape; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java Sat Sep 16 08:27:23 2017 @@ -114,8 +114,8 @@ public final class TestFixedSizedPropert // Ask to have the values looked up Map<MAPIProperty,List<PropertyValue>> props = mainChunks.getProperties(); - HashSet<Class<? extends PropertyValue>> seenTypes = - new HashSet<Class<? extends PropertyValue>>(); + HashSet<Class<? extends PropertyValue>> seenTypes = + new HashSet<>(); for (List<PropertyValue> pvs : props.values()) { for (PropertyValue pv : pvs) { seenTypes.add(pv.getClass()); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java Sat Sep 16 08:27:23 2017 @@ -50,7 +50,7 @@ public class TestExcelConverterSuite @Parameterized.Parameters(name="{index}: {0}") public static Iterable<Object[]> files() { - List<Object[]> files = new ArrayList<Object[]>(); + List<Object[]> files = new ArrayList<>(); File directory = POIDataSamples.getDocumentInstance().getFile( "../spreadsheet" ); for ( final File child : directory.listFiles( new FilenameFilter() Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java Sat Sep 16 08:27:23 2017 @@ -52,7 +52,7 @@ public class TestWordToConverterSuite @Parameterized.Parameters(name="{index}: {0}") public static Iterable<Object[]> files() { - List<Object[]> files = new ArrayList<Object[]>(); + List<Object[]> files = new ArrayList<>(); File directory = POIDataSamples.getDocumentInstance().getFile( "../document" ); for ( final File child : directory.listFiles( new FilenameFilter() Modified: poi/trunk/src/testcases/org/apache/poi/POITestCase.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/POITestCase.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/POITestCase.java (original) +++ poi/trunk/src/testcases/org/apache/poi/POITestCase.java Sat Sep 16 08:27:23 2017 @@ -176,7 +176,7 @@ public final class POITestCase { @Override @SuppressForbidden("Test only") public List<Field> run() throws Exception { - List<Field> flds = new ArrayList<Field>(); + List<Field> flds = new ArrayList<>(); for (Class<?> c = expected.getClass(); c != null; c = c.getSuperclass()) { Field[] fs = c.getDeclaredFields(); AccessibleObject.setAccessible(fs, true); Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java Sat Sep 16 08:27:23 2017 @@ -60,7 +60,7 @@ public class TestReadAllFiles { @Parameters(name="{index}: {0} using {1}") public static Iterable<Object[]> files() { - final List<Object[]> files = new ArrayList<Object[]>(); + final List<Object[]> files = new ArrayList<>(); _samples.getFile("").listFiles(new FileFilter() { @Override @@ -112,7 +112,7 @@ public class TestReadAllFiles { @Test public void recreate() throws IOException, HPSFException { /* Read the POI filesystem's property set streams: */ - Map<String,PropertySet> psMap = new HashMap<String,PropertySet>(); + Map<String,PropertySet> psMap = new HashMap<>(); /* Create a new POI filesystem containing the origin file's * property set streams: */ Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java Sat Sep 16 08:27:23 2017 @@ -480,7 +480,7 @@ public class TestWrite { final POIFSFileSystem poiFs = new POIFSFileSystem(); final PropertySet ps1 = new PropertySet(); final Section s = ps1.getSections().get(0); - final Map<Long,String> m = new HashMap<Long,String>(3, 1.0f); + final Map<Long,String> m = new HashMap<>(3, 1.0f); m.put(Long.valueOf(1), "String 1"); m.put(Long.valueOf(2), "String 2"); m.put(Long.valueOf(3), "String 3"); @@ -744,7 +744,7 @@ public class TestWrite { final POIFSFileSystem poiFs = new POIFSFileSystem(); final PropertySet ps1 = new PropertySet(); final Section s = ps1.getSections().get(0); - final Map<Long,String> m = new HashMap<Long, String>(3, 1.0f); + final Map<Long,String> m = new HashMap<>(3, 1.0f); m.put(Long.valueOf(1), "String 1"); m.put(Long.valueOf(2), "String 2"); m.put(Long.valueOf(3), "String 3"); Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java Sat Sep 16 08:27:23 2017 @@ -550,7 +550,7 @@ public class TestWriteWellKnown { final int ID_2 = 3; final String NAME_1 = "Schl\u00fcssel \u00e4"; final String VALUE_1 = "Wert 1"; - final Map<Long,String> dictionary = new HashMap<Long, String>(); + final Map<Long,String> dictionary = new HashMap<>(); DocumentSummaryInformation dsi = PropertySetFactory.newDocumentSummaryInformation(); CustomProperties cps; Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/Util.java Sat Sep 16 08:27:23 2017 @@ -60,7 +60,7 @@ final class Util { */ public static List<POIFile> readPOIFiles(final File poiFs, final String... poiFiles) throws FileNotFoundException, IOException { - final List<POIFile> files = new ArrayList<POIFile>(); + final List<POIFile> files = new ArrayList<>(); POIFSReader r = new POIFSReader(); POIFSReaderListener pfl = new POIFSReaderListener() { @Override @@ -116,7 +116,7 @@ final class Util { * @exception IOException if an I/O exception occurs */ public static List<POIFile> readPropertySets(final File poiFs) throws IOException { - final List<POIFile> files = new ArrayList<POIFile>(7); + final List<POIFile> files = new ArrayList<>(7); final POIFSReader r = new POIFSReader(); POIFSReaderListener pfl = new POIFSReaderListener() { @Override Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java Sat Sep 16 08:27:23 2017 @@ -54,7 +54,7 @@ public abstract class BaseXLSIteratingTe public ExpectedException thrown = ExpectedException.none(); protected static final Map<String,Class<? extends Throwable>> EXCLUDED = - new HashMap<String,Class<? extends Throwable>>(); + new HashMap<>(); @Parameters(name="{index}: {0}") public static Iterable<Object[]> files() { @@ -63,7 +63,7 @@ public abstract class BaseXLSIteratingTe dataDirName = "test-data"; } - List<Object[]> files = new ArrayList<Object[]>(); + List<Object[]> files = new ArrayList<>(); findFile(files, dataDirName + "/spreadsheet"); findFile(files, dataDirName + "/hpsf"); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java Sat Sep 16 08:27:23 2017 @@ -150,8 +150,8 @@ public final class TestEventWorkbookBuil private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<Record>(); - private final List<Record> _frecs = new ArrayList<Record>(); + private final List<Record> _records = new ArrayList<>(); + private final List<Record> _frecs = new ArrayList<>(); @Override public void processRecord(Record record) { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java Sat Sep 16 08:27:23 2017 @@ -106,7 +106,7 @@ public final class TestFormatTrackingHSS private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<Record>(); + private final List<Record> _records = new ArrayList<>(); @Override public void processRecord(Record record) { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java Sat Sep 16 08:27:23 2017 @@ -121,7 +121,7 @@ public final class TestHSSFEventFactory } private static class MockHSSFListener implements HSSFListener { - private final List<Record> records = new ArrayList<Record>(); + private final List<Record> records = new ArrayList<>(); public MockHSSFListener() {} public Record[] getRecords() { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java Sat Sep 16 08:27:23 2017 @@ -364,7 +364,7 @@ public final class TestMissingRecordAwar private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<Record>(); + private final List<Record> _records = new ArrayList<>(); private final boolean logToStdOut = false; @Override Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java Sat Sep 16 08:27:23 2017 @@ -102,7 +102,7 @@ public class TestDrawingAggregate { } } if(info != null){ - info.aggRecords = new ArrayList<RecordBase>( + info.aggRecords = new ArrayList<>( records.subList(info.startRecordIndex, info.endRecordIndex + 1)); } return info; @@ -134,7 +134,7 @@ public class TestDrawingAggregate { */ private static void assertWriteAndReadBack(HSSFWorkbook wb) throws IOException { // map aggregate info by sheet index - Map<Integer, DrawingAggregateInfo> aggs = new HashMap<Integer, DrawingAggregateInfo>(); + Map<Integer, DrawingAggregateInfo> aggs = new HashMap<>(); for(int i = 0; i < wb.getNumberOfSheets(); i++){ HSSFSheet sheet = wb.getSheetAt(i); DrawingAggregateInfo info = DrawingAggregateInfo.get(sheet); @@ -223,7 +223,7 @@ public class TestDrawingAggregate { "+2eqbvLdxQ0ndhy5KJ/lc1ZZK9okY5X/gSbrHZTH1vE/ozagTcwAAAA="; byte[] dgBytes = decompress(data); - List<EscherRecord> records = new ArrayList<EscherRecord>(); + List<EscherRecord> records = new ArrayList<>(); EscherRecordFactory recordFactory = new DefaultEscherRecordFactory(); int pos = 0; while (pos < dgBytes.length) { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java Sat Sep 16 08:27:23 2017 @@ -175,7 +175,7 @@ public final class TestLinkTable extends }; final List<Record> recList = Arrays.asList(recs); final WorkbookRecordList wrl = new WorkbookRecordList(); - final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<String, NameCommentRecord>(); + final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<>(); final LinkTable lt = new LinkTable(recList, 0, wrl, commentRecords); assertNotNull(lt); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java Sat Sep 16 08:27:23 2017 @@ -72,7 +72,7 @@ public final class TestRVA { workbook = new HSSFWorkbook(poifs); sheet = workbook.getSheetAt(0); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); for (int rowIdx = 0; true; rowIdx++) { HSSFRow row = sheet.getRow(rowIdx); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java Sat Sep 16 08:27:23 2017 @@ -87,7 +87,7 @@ public final class TestSheet { @Test public void testCreateSheet() { // Check we're adding row and cell aggregates - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(BOFRecord.createSheetBOF()); records.add( new DimensionsRecord() ); records.add(createWindow2Record()); @@ -205,7 +205,7 @@ public final class TestSheet { */ @Test public void testMovingMergedRegion() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); CellRangeAddress[] cras = { new CellRangeAddress(0, 1, 0, 2), @@ -244,7 +244,7 @@ public final class TestSheet { */ @Test public void testRowAggregation() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(InternalSheet.createBOF()); records.add(new DimensionsRecord()); @@ -479,7 +479,7 @@ public final class TestSheet { @Test public void testUncalcSize_bug45066() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(BOFRecord.createSheetBOF()); records.add(new UncalcedRecord()); records.add(new DimensionsRecord()); @@ -640,7 +640,7 @@ public final class TestSheet { nr.setColumn((short) colIx); nr.setValue(3.0); - List<Record> inRecs = new ArrayList<Record>(); + List<Record> inRecs = new ArrayList<>(); inRecs.add(BOFRecord.createSheetBOF()); inRecs.add(new RowRecord(rowIx)); inRecs.add(nr); @@ -777,7 +777,7 @@ public final class TestSheet { r2.setStr(new HSSFRichTextString("Aggregated")); NoteRecord n2 = new NoteRecord(); - List<Record> recordStream = new ArrayList<Record>(); + List<Record> recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); @@ -787,7 +787,7 @@ public final class TestSheet { confirmAggregatedRecords(recordStream); - recordStream = new ArrayList<Record>(); + recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); @@ -798,7 +798,7 @@ public final class TestSheet { confirmAggregatedRecords(recordStream); - recordStream = new ArrayList<Record>(); + recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java Sat Sep 16 08:27:23 2017 @@ -88,7 +88,7 @@ public final class TestBoundSheetRecord bs2.setPositionOfBof(33); bs3.setPositionOfBof(22); - List<BoundSheetRecord> l = new ArrayList<BoundSheetRecord>(); + List<BoundSheetRecord> l = new ArrayList<>(); l.add(bs1); l.add(bs2); l.add(bs3); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java Sat Sep 16 08:27:23 2017 @@ -70,7 +70,7 @@ public final class TestEscherAggregate e ObjRecord r2 = new ObjRecord(); - List<RecordBase> records = new ArrayList<RecordBase>(); + List<RecordBase> records = new ArrayList<>(); records.add( d1 ); records.add( r1 ); records.add( d2 ); 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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -65,7 +65,7 @@ public final class TestMergeCellsRecord }; public void testMCTable_bug46009() { MergedCellsTable mct = new MergedCellsTable(); - List<Record> recList = new ArrayList<Record>(); + List<Record> recList = new ArrayList<>(); CellRangeAddress[] cras = new CellRangeAddress[] { new CellRangeAddress(0, 0, 0, 3), }; Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java Sat Sep 16 08:27:23 2017 @@ -59,7 +59,7 @@ public final class TestSSTDeserializer { RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings(1, in ); @@ -72,7 +72,7 @@ public final class TestSSTDeserializer { byte[] continueBytes = readSampleHexData("evencontinuation.txt", "continue1", ContinueRecord.sid); RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 2, in); @@ -91,7 +91,7 @@ public final class TestSSTDeserializer { RecordInputStream in = TestcaseRecordInputStream.create(concat(header, concat(continue1, continue2))); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 2, in); @@ -105,7 +105,7 @@ public final class TestSSTDeserializer { byte[] continueBytes = readSampleHexData("extendedtextstrings.txt", "rich-continue1", ContinueRecord.sid); RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 1, in); @@ -116,7 +116,7 @@ public final class TestSSTDeserializer { continueBytes = readSampleHexData("extendedtextstrings.txt", "norich-continue1", ContinueRecord.sid); in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - strings = new IntMapper<UnicodeString>(); + strings = new IntMapper<>(); deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 1, in); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java Sat Sep 16 08:27:23 2017 @@ -33,7 +33,7 @@ public final class TestSSTRecordSizeCalc private static final int COMPRESSED_PLAIN_STRING_OVERHEAD = 3; private static final int OPTION_FIELD_SIZE = 1; - private final IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + private final IntMapper<UnicodeString> strings = new IntMapper<>(); private void confirmSize(int expectedSize) { ContinuableRecordOutput cro = ContinuableRecordOutput.createForCountingOnly(); 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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -49,7 +49,7 @@ public final class TestCFRecordsAggregat HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet(); - List<Record> recs = new ArrayList<Record>(); + List<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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -64,7 +64,7 @@ public final class TestColumnInfoRecords private static final class CIRCollector implements RecordVisitor { - private final List<Record> _list = new ArrayList<Record>(); + private final List<Record> _list = new ArrayList<>(); @Override public void visitRecord(Record r) { 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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -52,7 +52,7 @@ public final class TestValueRecordsAggre private final ValueRecordsAggregate valueRecord = new ValueRecordsAggregate(); private List<CellValueRecordInterface> getValueRecords() { - List<CellValueRecordInterface> list = new ArrayList<CellValueRecordInterface>(); + List<CellValueRecordInterface> list = new ArrayList<>(); for ( CellValueRecordInterface rec : valueRecord ) { list.add(rec); } @@ -65,7 +65,7 @@ public final class TestValueRecordsAggre */ @Test public void testSharedFormula() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(new FormulaRecord()); records.add(new SharedFormulaRecord()); records.add(new WindowTwoRecord()); @@ -91,7 +91,7 @@ public final class TestValueRecordsAggre } private static List<Record> testData() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); FormulaRecord formulaRecord = new FormulaRecord(); BlankRecord blankRecord = new BlankRecord(); formulaRecord.setRow(1); 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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -67,7 +67,7 @@ public final class TestChartTitleFormatR private final List<ChartTitleFormatRecord> chartTitleFormatRecords; public ChartTitleFormatRecordGrabber() { - chartTitleFormatRecords = new ArrayList<ChartTitleFormatRecord>(); + chartTitleFormatRecords = new ArrayList<>(); } @Override Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java Sat Sep 16 08:27:23 2017 @@ -39,7 +39,7 @@ public final class RecordInspector { private final List<Record> _list; public RecordCollector() { - _list = new ArrayList<Record>(128); + _list = new ArrayList<>(128); } @Override Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java Sat Sep 16 08:27:23 2017 @@ -82,7 +82,7 @@ public final class StreamUtility { private static int[] diffInternal(InputStream isA, InputStream isB, int[] allowableDifferenceRegions) throws IOException { int offset = 0; - List<Integer> temp = new ArrayList<Integer>(); + List<Integer> temp = new ArrayList<>(); while (true) { int b = isA.read(); int b2 = isB.read(); 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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -2055,7 +2055,7 @@ public final class TestBugs extends Base "Good", "Heading 1", "Heading 2", "Heading 3", "Heading 4", "Input", "Linked Cell", "Neutral", "Note", "Output", "Title", "Total", "Warning Text"); - List<String> collecteddStyles = new ArrayList<String>(); + List<String> collecteddStyles = new ArrayList<>(); for (int i = 0; i < numCellStyles; i++) { HSSFCellStyle cellStyle = wb.getCellStyleAt(i); String styleName = cellStyle.getUserStyleName(); @@ -2492,7 +2492,7 @@ public final class TestBugs extends Base @Test public void bug51675() throws Exception { - final List<Short> list = new ArrayList<Short>(); + final List<Short> list = new ArrayList<>(); HSSFWorkbook wb = openSample("51675.xls"); HSSFSheet sh = wb.getSheetAt(0); InternalSheet ish = HSSFTestHelper.getSheetForTest(sh); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java Sat Sep 16 08:27:23 2017 @@ -225,7 +225,7 @@ public final class TestHSSFWorkbook exte } private static List<Integer> arrayToList(int[] array) { - List<Integer> list = new ArrayList<Integer>(array.length); + List<Integer> list = new ArrayList<>(array.length); for ( Integer element : array ) { list.add(element); } 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=1808516&r1=1808515&r2=1808516&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 Sat Sep 16 08:27:23 2017 @@ -47,7 +47,7 @@ public final class TestSanityChecker { @Test public void testCheckRecordOrder() { final SanityChecker c = new SanityChecker(); - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(new BOFRecord()); records.add(INTERFACEHDR); records.add(createBoundSheetRec()); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java Sat Sep 16 08:27:23 2017 @@ -103,7 +103,7 @@ public final class TestPOIFSReaderRegist else { Set<POIFSReaderListener> registeredListeners = - new HashSet<POIFSReaderListener>(); + new HashSet<>(); while (listeners.hasNext()) { @@ -135,7 +135,7 @@ public final class TestPOIFSReaderRegist Iterator<POIFSReaderListener> listeners = registry.getListeners(path, name); Set<POIFSReaderListener> registeredListeners = - new HashSet<POIFSReaderListener>(); + new HashSet<>(); while (listeners.hasNext()) { Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java Sat Sep 16 08:27:23 2017 @@ -58,7 +58,7 @@ public class ReaderWriter { this.filesystem = filesystem; root = this.filesystem.getRoot(); - dataMap = new HashMap<DocumentDescriptor, byte[]>(); + dataMap = new HashMap<>(); } /** Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java Sat Sep 16 08:27:23 2017 @@ -85,7 +85,7 @@ public class TestEntryUtils { fsD = new POIFSFileSystem(); assertEquals(0, fsD.getRoot().getEntryCount()); - EntryUtils.copyNodes(fs, fsD, new ArrayList<String>()); + EntryUtils.copyNodes(fs, fsD, new ArrayList<>()); assertEquals(3, fsD.getRoot().getEntryCount()); assertNotNull(fsD.getRoot().getEntry(dirA.getName())); assertNotNull(fsD.getRoot().getEntry(dirB.getName())); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java Sat Sep 16 08:27:23 2017 @@ -65,7 +65,7 @@ public final class TestFileSystemBugs ex } protected DirectoryNode[] openSamples(InputStream[] inps, boolean oldFails) throws Exception { NPOIFSFileSystem nfs = new NPOIFSFileSystem(inps[0]); - if (openedFSs == null) openedFSs = new ArrayList<NPOIFSFileSystem>(); + if (openedFSs == null) openedFSs = new ArrayList<>(); openedFSs.add(nfs); OPOIFSFileSystem ofs = null; @@ -131,7 +131,7 @@ public final class TestFileSystemBugs ex public void testHeavilyNestedReWrite() throws Exception { for (DirectoryNode root : openSSSample("ex42570-20305.xls", false)) { // Record the structure - Map<String,Integer> entries = new HashMap<String, Integer>(); + Map<String,Integer> entries = new HashMap<>(); fetchSizes("/", root, entries); // Prepare to copy Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java Sat Sep 16 08:27:23 2017 @@ -51,7 +51,7 @@ public final class TestFilteringDirector } public void testNoFiltering() throws Exception { - FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), new HashSet<String>()); + FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), new HashSet<>()); assertEquals(3, d.getEntryCount()); assertEquals(dirA.getName(), d.getEntry(dirA.getName()).getName()); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java Sat Sep 16 08:27:23 2017 @@ -64,7 +64,7 @@ public class TestOle10Native { for (File f : files) { NPOIFSFileSystem fs = new NPOIFSFileSystem(f, true); - List<Entry> entries = new ArrayList<Entry>(); + List<Entry> entries = new ArrayList<>(); findOle10(entries, fs.getRoot(), "/", ""); for (Entry e : entries) { Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java Sat Sep 16 08:27:23 2017 @@ -123,7 +123,7 @@ public final class TestPropertySorter ex DirectoryNode vba = (DirectoryNode)vba_project.getEntry(VBA); DirectoryProperty p = (DirectoryProperty)vba.getProperty(); - List<Property> lst = new ArrayList<Property>(); + List<Property> lst = new ArrayList<>(); for (Iterator<Property> it = p.getChildren(); it.hasNext();){ Property ch = it.next(); lst.add(ch); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java Sat Sep 16 08:27:23 2017 @@ -64,7 +64,7 @@ public class TestVBAMacroReader { } static { - final Map<POIDataSamples, String> _expectedMacroContents = new HashMap<POIDataSamples, String>(); + final Map<POIDataSamples, String> _expectedMacroContents = new HashMap<>(); final POIDataSamples[] dataSamples = { POIDataSamples.getSpreadSheetInstance(), POIDataSamples.getSlideShowInstance(), Modified: poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java Sat Sep 16 08:27:23 2017 @@ -102,7 +102,7 @@ public final class TestDirectoryProperty private void verifyChildren(int count) { Iterator<Property> iter = _property.getChildren(); - List<Property> children = new ArrayList<Property>(); + List<Property> children = new ArrayList<>(); while (iter.hasNext()) { Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java Sat Sep 16 08:27:23 2017 @@ -39,7 +39,7 @@ public final class LocalRawDataBlockList throws IOException { super(new ByteArrayInputStream(new byte[ 0 ]), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS); - _list = new ArrayList<RawDataBlock>(); + _list = new ArrayList<>(); _array = null; } Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java Sat Sep 16 08:27:23 2017 @@ -337,7 +337,7 @@ public final class TestBATBlock extends public void testGetBATBlockAndIndex() throws Exception { HeaderBlock header = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS); - List<BATBlock> blocks = new ArrayList<BATBlock>(); + List<BATBlock> blocks = new ArrayList<>(); int offset; Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java Sat Sep 16 08:27:23 2017 @@ -174,7 +174,7 @@ public final class TestBlockListImpl { // that includes a reserved (XBAT) block, and one that // points off into space somewhere BlockListImpl list = create(); - List<RawDataBlock> raw_blocks = new ArrayList<RawDataBlock>(); + List<RawDataBlock> raw_blocks = new ArrayList<>(); byte[] data = new byte[ 512 ]; int offset = 0; Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ public final class TestPropertyBlock { public void testCreatePropertyBlocks() throws Exception { // test with 0 properties - List<Property> properties = new ArrayList<Property>(); + List<Property> properties = new ArrayList<>(); BlockWritable[] blocks = PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties); Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java Sat Sep 16 08:27:23 2017 @@ -37,7 +37,7 @@ import org.apache.poi.poifs.property.Roo public final class TestSmallBlockTableWriter extends TestCase { public void testWritingConstructor() throws IOException { - List<OPOIFSDocument> documents = new ArrayList<OPOIFSDocument>(); + List<OPOIFSDocument> documents = new ArrayList<>(); documents.add( new OPOIFSDocument( Modified: poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java (original) +++ poi/trunk/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java Sat Sep 16 08:27:23 2017 @@ -52,7 +52,7 @@ public final class TestSmallDocumentBloc throws IOException { ByteArrayInputStream stream = new ByteArrayInputStream(_testdata); - List<DocumentBlock> documents = new ArrayList<DocumentBlock>(); + List<DocumentBlock> documents = new ArrayList<>(); while (true) { @@ -138,7 +138,7 @@ public final class TestSmallDocumentBloc { for (int j = 0; j <= 8; j++) { - List<SmallDocumentBlock> blocks = new ArrayList<SmallDocumentBlock>(); + List<SmallDocumentBlock> blocks = new ArrayList<>(); for (int k = 0; k < j; k++) { Modified: poi/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java Sat Sep 16 08:27:23 2017 @@ -103,7 +103,7 @@ public class CellFormatTestBase { readFlags(workbook); - Set<String> runCategories = new TreeSet<String>( + Set<String> runCategories = new TreeSet<>( String.CASE_INSENSITIVE_ORDER); String runCategoryList = flagString("Categories", ""); if (runCategoryList != null) { @@ -155,7 +155,7 @@ public class CellFormatTestBase { */ private void readFlags(Workbook wb) { Sheet flagSheet = wb.getSheet("Flags"); - testFlags = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); + testFlags = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); if (flagSheet != null) { int end = flagSheet.getLastRowNum(); // Skip the header row, therefore "+ 1" Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java Sat Sep 16 08:27:23 2017 @@ -96,9 +96,9 @@ public class TestEvaluationCache extends public EvalListener(HSSFWorkbook wb) { _book = wb; - _logList = new ArrayList<String>(); - _formulaCellsByCacheEntry = new HashMap<ICacheEntry,EvaluationCell>(); - _plainCellLocsByCacheEntry = new HashMap<ICacheEntry, Loc>(); + _logList = new ArrayList<>(); + _formulaCellsByCacheEntry = new HashMap<>(); + _plainCellLocsByCacheEntry = new HashMap<>(); } @Override public void onCacheHit(int sheetIndex, int rowIndex, int columnIndex, ValueEval result) { Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java Sat Sep 16 08:27:23 2017 @@ -117,7 +117,7 @@ public class TestMissingWorkbook extends FormulaEvaluator lMainWorkbookEvaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator(); FormulaEvaluator lSourceEvaluator = sourceWorkbook.getCreationHelper().createFormulaEvaluator(); - Map<String,FormulaEvaluator> workbooks = new HashMap<String, FormulaEvaluator>(); + Map<String,FormulaEvaluator> workbooks = new HashMap<>(); workbooks.put(MAIN_WORKBOOK_FILENAME, lMainWorkbookEvaluator); workbooks.put(SOURCE_DUMMY_WORKBOOK_FILENAME, lSourceEvaluator); lMainWorkbookEvaluator.setupReferencedWorkbooks(workbooks); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java Sat Sep 16 08:27:23 2017 @@ -88,7 +88,7 @@ public class TestNetworkdaysFunction ext public MockAreaEval(String... holidays) { this(0, 0, 0, holidays.length - 1); - this.holidays = new ArrayList<ValueEval>(); + this.holidays = new ArrayList<>(); for (String holiday : holidays) { this.holidays.add(new StringEval(holiday)); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java Sat Sep 16 08:27:23 2017 @@ -177,7 +177,7 @@ public class TestWorkdayFunction { public MockAreaEval(String... holidays) { this(0, 0, 0, holidays.length - 1); - this.holidays = new ArrayList<ValueEval>(); + this.holidays = new ArrayList<>(); for (String holiday : holidays) { this.holidays.add(new StringEval(holiday)); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java Sat Sep 16 08:27:23 2017 @@ -124,7 +124,7 @@ public final class TestFormulasFromSprea sheet = workbook.getSheetAt( 0 ); evaluator = new HSSFFormulaEvaluator(workbook); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); processFunctionGroup(data, SS.START_OPERATORS_ROW_INDEX, null); processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, null); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java Sat Sep 16 08:27:23 2017 @@ -159,10 +159,10 @@ public final class ExcelFileFormatDocFun public FunctionDataCollector(PrintStream ps) { _ps = ps; - _allFunctionsByIndex = new HashMap<Integer, FunctionData>(); - _allFunctionsByName = new HashMap<String, FunctionData>(); - _groupFunctionIndexes = new HashSet<Integer>(); - _groupFunctionNames = new HashSet<String>(); + _allFunctionsByIndex = new HashMap<>(); + _allFunctionsByName = new HashMap<>(); + _groupFunctionIndexes = new HashSet<>(); + _groupFunctionNames = new HashSet<>(); } public void addFuntion(int funcIx, boolean hasFootnote, String funcName, int minParams, int maxParams, @@ -265,11 +265,11 @@ public final class ExcelFileFormatDocFun public EFFDocHandler(FunctionDataCollector fdc) { _fdc = fdc; - _elemNameStack = new Stack<String>(); + _elemNameStack = new Stack<>(); _isInsideTable = false; - _rowData = new ArrayList<String>(); + _rowData = new ArrayList<>(); _textNodeBuffer = new StringBuffer(); - _rowNoteFlags = new ArrayList<Boolean>(); + _rowNoteFlags = new ArrayList<>(); } private boolean matchesTargetPath() { Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java Sat Sep 16 08:27:23 2017 @@ -87,7 +87,7 @@ public abstract class BaseTestFunctionsF HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook(filename); confirmReadMeSheet(workbook, clazz); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); int nSheets = workbook.getNumberOfSheets(); for(int sheetIdx=1; sheetIdx< nSheets; sheetIdx++) { Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Sat Sep 16 08:27:23 2017 @@ -936,7 +936,7 @@ public abstract class BaseTestBugzillaIs Workbook wb3 = _testDataProvider.createWorkbook(); wb3.createSheet().createRow(1).createCell(0).setCellValue(otherCellText); - Map<String,FormulaEvaluator> evaluators = new HashMap<String, FormulaEvaluator>(); + Map<String,FormulaEvaluator> evaluators = new HashMap<>(); evaluators.put(refLocal, wb3.getCreationHelper().createFormulaEvaluator()); evaluators.put(refHttp, wb3.getCreationHelper().createFormulaEvaluator()); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Sat Sep 16 08:27:23 2017 @@ -430,7 +430,7 @@ public abstract class BaseTestSheet { Workbook wb = _testDataProvider.createWorkbook(); Sheet sheet = wb.createSheet(); - Map<Integer, CellRangeAddress> mergedRegions = new HashMap<Integer, CellRangeAddress>(); + Map<Integer, CellRangeAddress> mergedRegions = new HashMap<>(); for (int r=0; r<10; r++) { CellRangeAddress region = new CellRangeAddress(r, r, 0, 1); mergedRegions.put(r, region); @@ -447,8 +447,8 @@ public abstract class BaseTestSheet { } private static <T> void assertCollectionEquals(Collection<T> expected, Collection<T> actual) { - Set<T> e = new HashSet<T>(expected); - Set<T> a = new HashSet<T>(actual); + Set<T> e = new HashSet<>(expected); + Set<T> a = new HashSet<>(actual); assertEquals(e, a); } Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java Sat Sep 16 08:27:23 2017 @@ -323,7 +323,7 @@ public abstract class BaseTestSheetShift sheet.shiftRows(4, sheet.getLastRowNum(), 1); // all regions should still start at row 3, and elongate by 1 row - List<CellRangeAddress> expectedMergedRegions = new ArrayList<CellRangeAddress>(); + List<CellRangeAddress> expectedMergedRegions = new ArrayList<>(); CellRangeAddress A4_B8 = CellRangeAddress.valueOf("A4:B8"); //A4:B7 should be elongated by 1 row CellRangeAddress C4_D8 = CellRangeAddress.valueOf("C4:D8"); //C4:B7 should be elongated by 1 row expectedMergedRegions.add(A4_B8); Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java Sat Sep 16 08:27:23 2017 @@ -84,7 +84,7 @@ public class TestExcelStyleDateFormatter "\u004a", "\u004a", "\u0041", "\u0053", "\u004f", "\u004e", "\u0044"); - Map<Locale, List<String>> testMap = new HashMap<Locale, List<String>>(); + Map<Locale, List<String>> testMap = new HashMap<>(); testMap.put(germanLocale, germanResultList); testMap.put(russianLocale, russianResultList); testMap.put(austrianLocale, austrianResultList); Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java Sat Sep 16 08:27:23 2017 @@ -118,7 +118,7 @@ public class BaseTestCellUtil { // Add multiple border properties to cell should create a single new style int styCnt1 = wb.getNumCellStyles(); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(CellUtil.BORDER_TOP, BorderStyle.THIN); props.put(CellUtil.BORDER_BOTTOM, BorderStyle.THIN); props.put(CellUtil.BORDER_LEFT, BorderStyle.THIN); @@ -376,7 +376,7 @@ public class BaseTestCellUtil { public void setFillForegroundColorBeforeFillBackgroundColor() throws IOException { Workbook wb1 = _testDataProvider.createWorkbook(); Cell A1 = wb1.createSheet().createRow(0).createCell(0); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(CellUtil.FILL_PATTERN, FillPatternType.BRICKS); properties.put(CellUtil.FILL_FOREGROUND_COLOR, IndexedColors.BLUE.index); properties.put(CellUtil.FILL_BACKGROUND_COLOR, IndexedColors.RED.index); @@ -396,7 +396,7 @@ public class BaseTestCellUtil { public void setFillForegroundColorBeforeFillBackgroundColorEnum() throws IOException { Workbook wb1 = _testDataProvider.createWorkbook(); Cell A1 = wb1.createSheet().createRow(0).createCell(0); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(CellUtil.FILL_PATTERN, FillPatternType.BRICKS); properties.put(CellUtil.FILL_FOREGROUND_COLOR, IndexedColors.BLUE.index); properties.put(CellUtil.FILL_BACKGROUND_COLOR, IndexedColors.RED.index); Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java Sat Sep 16 08:27:23 2017 @@ -66,7 +66,7 @@ final class NumberComparisonExamples { private static ComparisonExample[] initExamples() { - List<ComparisonExample> temp = new ArrayList<ComparisonExample>(); + List<ComparisonExample> temp = new ArrayList<>(); addStepTransition(temp, 0x4010000000000005L); addStepTransition(temp, 0x4010000000000010L); Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java Sat Sep 16 08:27:23 2017 @@ -58,7 +58,7 @@ public class NumberRenderingSpreadsheetG writeHeaderRow(wb, sheet); _sheet = sheet; _rowIndex = 1; - _replacementNaNs = new ArrayList<Long>(); + _replacementNaNs = new ArrayList<>(); } public void addTestRow(long rawBits, String expectedExcelRendering) { Modified: poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java (original) +++ poi/trunk/src/testcases/org/apache/poi/util/DummyPOILogger.java Sat Sep 16 08:27:23 2017 @@ -25,10 +25,10 @@ import java.util.List; */ @Internal public class DummyPOILogger extends POILogger { - public List<String>logged = new ArrayList<String>(); + public List<String>logged = new ArrayList<>(); public void reset() { - logged = new ArrayList<String>(); + logged = new ArrayList<>(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
