Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java Sat Sep 16 08:27:23 2017 @@ -109,8 +109,8 @@ public final class TestPackageCoreProper props.setKeywordsProperty("MyKeywords"); props.setLanguageProperty("MyLanguage"); props.setLastModifiedByProperty("Julien Chable"); - props.setLastPrintedProperty(new Nullable<Date>(dateToInsert)); - props.setModifiedProperty(new Nullable<Date>(dateToInsert)); + props.setLastPrintedProperty(new Nullable<>(dateToInsert)); + props.setModifiedProperty(new Nullable<>(dateToInsert)); props.setRevisionProperty("2"); props.setTitleProperty("MyTitle"); props.setSubjectProperty("MySubject"); @@ -168,10 +168,10 @@ public final class TestPackageCoreProper props.setCreatedProperty((String)null); assertEquals("", props.getCreatedPropertyString()); assertNull(props.getCreatedProperty().getValue()); - props.setCreatedProperty(new Nullable<Date>()); + props.setCreatedProperty(new Nullable<>()); assertEquals("", props.getCreatedPropertyString()); assertNull(props.getCreatedProperty().getValue()); - props.setCreatedProperty(new Nullable<Date>(date)); + props.setCreatedProperty(new Nullable<>(date)); assertEquals(strDate, props.getCreatedPropertyString()); assertEquals(date, props.getCreatedProperty().getValue()); props.setCreatedProperty(strDate); @@ -184,10 +184,10 @@ public final class TestPackageCoreProper props.setLastPrintedProperty((String)null); assertEquals("", props.getLastPrintedPropertyString()); assertNull(props.getLastPrintedProperty().getValue()); - props.setLastPrintedProperty(new Nullable<Date>()); + props.setLastPrintedProperty(new Nullable<>()); assertEquals("", props.getLastPrintedPropertyString()); assertNull(props.getLastPrintedProperty().getValue()); - props.setLastPrintedProperty(new Nullable<Date>(date)); + props.setLastPrintedProperty(new Nullable<>(date)); assertEquals(strDate, props.getLastPrintedPropertyString()); assertEquals(date, props.getLastPrintedProperty().getValue()); props.setLastPrintedProperty(strDate); @@ -198,9 +198,9 @@ public final class TestPackageCoreProper assertNull(props.getModifiedProperty().getValue()); props.setModifiedProperty((String)null); assertNull(props.getModifiedProperty().getValue()); - props.setModifiedProperty(new Nullable<Date>()); + props.setModifiedProperty(new Nullable<>()); assertNull(props.getModifiedProperty().getValue()); - props.setModifiedProperty(new Nullable<Date>(date)); + props.setModifiedProperty(new Nullable<>(date)); assertEquals(strDate, props.getModifiedPropertyString()); assertEquals(date, props.getModifiedProperty().getValue()); props.setModifiedProperty(strDate);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java Sat Sep 16 08:27:23 2017 @@ -75,7 +75,7 @@ public class ZipFileAssert { File filename) throws IOException { // store the zip content in memory // let s assume it is not Go ;-) - TreeMap<String, ByteArrayOutputStream> zipContent = new TreeMap<String, ByteArrayOutputStream>(); + TreeMap<String, ByteArrayOutputStream> zipContent = new TreeMap<>(); byte data[] = new byte[BUFFER_SIZE]; /* Open file to decompress */ Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java Sat Sep 16 08:27:23 2017 @@ -58,7 +58,7 @@ public class TestAgileEncryptionParamete HashAlgorithm haList[] = { HashAlgorithm.sha1, HashAlgorithm.sha256, HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.md5 }; ChainingMode cmList[] = { ChainingMode.cbc, ChainingMode.cfb }; - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); for (CipherAlgorithm ca : caList) { for (HashAlgorithm ha : haList) { for (ChainingMode cm : cmList) { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java Sat Sep 16 08:27:23 2017 @@ -248,7 +248,7 @@ public class TestSignatureInfo { sic.setOpcPackage(pkg); SignatureInfo si = new SignatureInfo(); si.setSignatureConfig(sic); - List<X509Certificate> result = new ArrayList<X509Certificate>(); + List<X509Certificate> result = new ArrayList<>(); for (SignaturePart sp : si.getSignatureParts()) { if (sp.validate()) { result.add(sp.getSigner()); @@ -283,7 +283,7 @@ public class TestSignatureInfo { sic.setOpcPackage(pkg); SignatureInfo si = new SignatureInfo(); si.setSignatureConfig(sic); - List<X509Certificate> result = new ArrayList<X509Certificate>(); + List<X509Certificate> result = new ArrayList<>(); for (SignaturePart sp : si.getSignatureParts()) { if (sp.validate()) { result.add(sp.getSigner()); @@ -313,7 +313,7 @@ public class TestSignatureInfo { sic.setOpcPackage(pkg); SignatureInfo si = new SignatureInfo(); si.setSignatureConfig(sic); - List<X509Certificate> result = new ArrayList<X509Certificate>(); + List<X509Certificate> result = new ArrayList<>(); for (SignaturePart sp : si.getSignatureParts()) { if (sp.validate()) { result.add(sp.getSigner()); @@ -384,7 +384,7 @@ public class TestSignatureInfo { si.setSignatureConfig(sic); // hash > sha1 doesn't work in excel viewer ... si.confirmSignature(); - List<X509Certificate> result = new ArrayList<X509Certificate>(); + List<X509Certificate> result = new ArrayList<>(); for (SignaturePart sp : si.getSignatureParts()) { if (sp.validate()) { result.add(sp.getSigner()); @@ -411,7 +411,7 @@ public class TestSignatureInfo { * We need at least 2 certificates for the XAdES-C complete certificate * refs construction. */ - List<X509Certificate> certificateChain = new ArrayList<X509Certificate>(); + List<X509Certificate> certificateChain = new ArrayList<>(); certificateChain.add(x509); certificateChain.add(x509); signatureConfig.setSigningCertificateChain(certificateChain); @@ -600,7 +600,7 @@ public class TestSignatureInfo { Key key = keystore.getKey("poitest", password.toCharArray()); Certificate chainList[] = keystore.getCertificateChain("poitest"); - List<X509Certificate> certChain = new ArrayList<X509Certificate>(); + List<X509Certificate> certChain = new ArrayList<>(); for (Certificate c : chainList) { certChain.add((X509Certificate)c); } @@ -752,7 +752,7 @@ public class TestSignatureInfo { // verify: signature si.getSignatureConfig().setOpcPackage(pkgCopy); - List<X509Certificate> result = new ArrayList<X509Certificate>(); + List<X509Certificate> result = new ArrayList<>(); for (SignaturePart sp : si.getSignatureParts()) { if (sp.validate()) { result.add(sp.getSigner()); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java Sat Sep 16 08:27:23 2017 @@ -123,7 +123,7 @@ public class TestFonts { BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); Graphics2D graphics = img.createGraphics(); - Map<String,String> fallbackMap = new HashMap<String,String>(); + Map<String,String> fallbackMap = new HashMap<>(); fallbackMap.put("NoSuchFont", "Mona"); // in XSLF the fonts default to the theme fonts (Calibri), if the font group is not overridden // see XSLFTextRun.XSLFTextInfo.getCTTextFont Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java Sat Sep 16 08:27:23 2017 @@ -49,7 +49,7 @@ public class TestEmbeddedExtractor { fis.close(); EmbeddedExtractor ee = new EmbeddedExtractor(); - List<EmbeddedData> edList = new ArrayList<EmbeddedData>(); + List<EmbeddedData> edList = new ArrayList<>(); for (Sheet s : wb) { edList.addAll(ee.extractAll(s)); } @@ -77,7 +77,7 @@ public class TestEmbeddedExtractor { fis.close(); EmbeddedExtractor ee = new EmbeddedExtractor(); - List<EmbeddedData> edList = new ArrayList<EmbeddedData>(); + List<EmbeddedData> edList = new ArrayList<>(); for (Sheet s : wb) { edList.addAll(ee.extractAll(s)); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/CombinedIteratorTest.java Sat Sep 16 08:27:23 2017 @@ -41,117 +41,117 @@ public class CombinedIteratorTest { @Test public void testNullMaster() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(1L, "B1"); base.put(2L, "B2"); base.put(3L, "B3"); - testIteration(new CombinedIterable<String>(base, null), "B1", "B2", + testIteration(new CombinedIterable<>(base, null), "B1", "B2", "B3"); } @Test public void testNoMatchesBaseFirst() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(1L, "B1"); base.put(2L, "B2"); base.put(3L, "B3"); - SortedMap<Long, String> master = new TreeMap<Long, String>(); + SortedMap<Long, String> master = new TreeMap<>(); master.put(4L, "M4"); master.put(5L, "M5"); master.put(6L, "M6"); - testIteration(new CombinedIterable<String>(base, master), "B1", "B2", + testIteration(new CombinedIterable<>(base, master), "B1", "B2", "B3", "M4", "M5", "M6"); } @Test public void testNoMatchesMasterFirst() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(4L, "B4"); base.put(5L, "B5"); base.put(6L, "B6"); - SortedMap<Long, String> master = new TreeMap<Long, String>(); + SortedMap<Long, String> master = new TreeMap<>(); master.put(1L, "M1"); master.put(2L, "M2"); master.put(3L, "M3"); - testIteration(new CombinedIterable<String>(base, master), "M1", "M2", + testIteration(new CombinedIterable<>(base, master), "M1", "M2", "M3", "B4", "B5", "B6"); } @Test public void testInterleaved1() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(1L, "B1"); base.put(3L, "B3"); base.put(5L, "B5"); - SortedMap<Long, String> master = new TreeMap<Long, String>(); + SortedMap<Long, String> master = new TreeMap<>(); master.put(2L, "M2"); master.put(4L, "M4"); master.put(6L, "M6"); - testIteration(new CombinedIterable<String>(base, master), "B1", "M2", + testIteration(new CombinedIterable<>(base, master), "B1", "M2", "B3", "M4", "B5", "M6"); } @Test public void testInterleaved2() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(1L, "B1"); base.put(2L, "B2"); base.put(5L, "B5"); base.put(6L, "B6"); - SortedMap<Long, String> master = new TreeMap<Long, String>(); + SortedMap<Long, String> master = new TreeMap<>(); master.put(3L, "M3"); master.put(4L, "M4"); master.put(7L, "M7"); master.put(8L, "M8"); - testIteration(new CombinedIterable<String>(base, master), "B1", "B2", + testIteration(new CombinedIterable<>(base, master), "B1", "B2", "M3", "M4", "B5", "B6", "M7", "M8"); } @Test public void testAllMatching() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(1L, "B1"); base.put(2L, "B2"); base.put(3L, "B3"); - SortedMap<Long, String> master = new TreeMap<Long, String>(); + SortedMap<Long, String> master = new TreeMap<>(); master.put(1L, "M1"); master.put(2L, "M2"); master.put(3L, "M3"); - testIteration(new CombinedIterable<String>(base, master), "B1", "B2", + testIteration(new CombinedIterable<>(base, master), "B1", "B2", "B3"); } @Test public void testAllMatching2() { - SortedMap<Long, String> base = new TreeMap<Long, String>(); + SortedMap<Long, String> base = new TreeMap<>(); base.put(1L, "B1"); base.put(2L, "B2"); base.put(3L, "B3"); - SortedMap<Long, String> master = new TreeMap<Long, String>(); + SortedMap<Long, String> master = new TreeMap<>(); master.put(1L, "M1"); master.put(2L, "M2"); master.put(3L, "M3"); master.put(4L, "M4"); - testIteration(new CombinedIterable<String>(base, master), "B1", "B2", + testIteration(new CombinedIterable<>(base, master), "B1", "B2", "B3", "M4"); } } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java Sat Sep 16 08:27:23 2017 @@ -66,7 +66,7 @@ public class TestPPTX2PNG { @Parameters(name="{0}") public static Collection<String> data() { - final Set<String> data = new TreeSet<String>(); + final Set<String> data = new TreeSet<>(); for (String f : files.split(", ?")) { if (basedir == null) { data.add(f); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java Sat Sep 16 08:27:23 2017 @@ -98,7 +98,7 @@ public class TestXSLFChart { strData.setPtArray(null); // unset old axis text numData.setPtArray(null); // unset old values - Map<String, Double> pieModel = new LinkedHashMap<String, Double>(); + Map<String, Double> pieModel = new LinkedHashMap<>(); pieModel.put("First", 1.0); pieModel.put("Second", 3.0); pieModel.put("Third", 4.0); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java Sat Sep 16 08:27:23 2017 @@ -114,7 +114,7 @@ public class TestXSLFPictureShape { XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1); ppt1.close(); // pictures keyed by file name - Map<String, XSLFPictureData> pics = new HashMap<String, XSLFPictureData>(); + Map<String, XSLFPictureData> pics = new HashMap<>(); for(XSLFPictureData p : ppt2.getPictureData()){ pics.put(p.getFileName(), p); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java Sat Sep 16 08:27:23 2017 @@ -45,7 +45,7 @@ public final class SXSSFITestDataProvide // an instance of all SXSSFWorkbooks opened by this TestDataProvider, // so that the temporary files created can be disposed up by cleanup() - private final Collection<SXSSFWorkbook> instances = new ArrayList<SXSSFWorkbook>(); + private final Collection<SXSSFWorkbook> instances = new ArrayList<>(); private SXSSFITestDataProvider() { // enforce singleton Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java Sat Sep 16 08:27:23 2017 @@ -127,7 +127,7 @@ public class TestXSSFBReader { private List<String> getSheets(String testFileName) throws Exception { OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream(testFileName)); - List<String> sheetTexts = new ArrayList<String>(); + List<String> sheetTexts = new ArrayList<>(); XSSFBReader r = new XSSFBReader(pkg); // assertNotNull(r.getWorkbookData()); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java Sat Sep 16 08:27:23 2017 @@ -287,7 +287,7 @@ public final class TestXSSFReader extend OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("61034.xlsx"); XSSFReader reader = new XSSFReader(pkg); XSSFReader.SheetIterator iter = (XSSFReader.SheetIterator) reader.getSheetsData(); - Set<String> seen = new HashSet<String>(); + Set<String> seen = new HashSet<>(); while (iter.hasNext()) { InputStream stream = iter.next(); String sheetName = iter.getSheetName(); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java Sat Sep 16 08:27:23 2017 @@ -133,7 +133,7 @@ public class TestXSSFExcelExtractor exte ExcelExtractor ole2Extractor = new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls")); - Map<String, POITextExtractor> extractors = new HashMap<String, POITextExtractor>(); + Map<String, POITextExtractor> extractors = new HashMap<>(); extractors.put("SampleSS.xlsx", ooxmlExtractor); extractors.put("SampleSS.xls", ole2Extractor); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java Sat Sep 16 08:27:23 2017 @@ -172,7 +172,7 @@ public final class TestSharedStringsTabl } private List<String> readStrings(String filename) throws IOException { - List<String> strs = new ArrayList<String>(); + List<String> strs = new ArrayList<>(); POIDataSamples samples = POIDataSamples.getSpreadSheetInstance(); BufferedReader br = new BufferedReader( new InputStreamReader(samples.openResourceAsStream(filename), "UTF-8")); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java Sat Sep 16 08:27:23 2017 @@ -73,7 +73,7 @@ public class TestThemesTable { simple = XSSFTestDataSamples.openSampleWorkbook(testFileSimple); complex = XSSFTestDataSamples.openSampleWorkbook(testFileComplex); // Files and descriptions - Map<String,XSSFWorkbook> workbooks = new LinkedHashMap<String, XSSFWorkbook>(); + Map<String,XSSFWorkbook> workbooks = new LinkedHashMap<>(); workbooks.put(testFileSimple, simple); workbooks.put("Re-Saved_" + testFileSimple, simpleRS); workbooks.put(testFileComplex, complex); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java Sat Sep 16 08:27:23 2017 @@ -28,10 +28,10 @@ import org.apache.poi.poifs.crypt.temp.S // afterwards, a test function can check whether these files were encrypted or not public class TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource extends SXSSFWorkbookWithCustomZipEntrySource { - private final List<File> tempFiles = new ArrayList<File>(); + private final List<File> tempFiles = new ArrayList<>(); List<File> getTempFiles() { - return new ArrayList<File>(tempFiles); + return new ArrayList<>(tempFiles); } @Override Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java Sat Sep 16 08:27:23 2017 @@ -55,7 +55,7 @@ public class TestAutoSizeColumnTracker { private AutoSizeColumnTracker tracker; private static final SortedSet<Integer> columns; static { - SortedSet<Integer>_columns = new TreeSet<Integer>(); + SortedSet<Integer>_columns = new TreeSet<>(); _columns.add(0); _columns.add(1); _columns.add(3); @@ -85,7 +85,7 @@ public class TestAutoSizeColumnTracker { public void trackAndUntrackColumn() { assumeTrue(tracker.getTrackedColumns().isEmpty()); tracker.trackColumn(0); - Set<Integer> expected = new HashSet<Integer>(); + Set<Integer> expected = new HashSet<>(); expected.add(0); assertEquals(expected, tracker.getTrackedColumns()); tracker.untrackColumn(0); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java Sat Sep 16 08:27:23 2017 @@ -68,7 +68,7 @@ public class TestSXSSFSheetAutoSizeColum private static final SortedSet<Integer> columns; static { - SortedSet<Integer>_columns = new TreeSet<Integer>(); + SortedSet<Integer>_columns = new TreeSet<>(); _columns.add(0); _columns.add(1); _columns.add(3); @@ -224,7 +224,7 @@ public class TestSXSSFSheetAutoSizeColum sheet = workbook.createSheet(); sheet.trackColumnForAutoSizing(0); - SortedSet<Integer> expected = new TreeSet<Integer>(); + SortedSet<Integer> expected = new TreeSet<>(); expected.add(0); assertEquals(expected, sheet.getTrackedColumnsForAutoSizing()); @@ -244,7 +244,7 @@ public class TestSXSSFSheetAutoSizeColum sheet = workbook.createSheet(); sheet.trackColumnsForAutoSizing(columns); - SortedSet<Integer> sorted = new TreeSet<Integer>(columns); + SortedSet<Integer> sorted = new TreeSet<>(columns); assertEquals(sorted, sheet.getTrackedColumnsForAutoSizing()); sheet.autoSizeColumn(sorted.first(), useMergedCells); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java Sat Sep 16 08:27:23 2017 @@ -132,7 +132,7 @@ public final class TestFormulaEvaluatorO sheet = workbook.getSheetAt( 0 ); evaluator = new XSSFFormulaEvaluator(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/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java Sat Sep 16 08:27:23 2017 @@ -117,7 +117,7 @@ public final class TestMultiSheetFormula sheet = workbook.getSheet( SS.TEST_SHEET_NAME ); evaluator = new XSSFFormulaEvaluator(workbook); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, null); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Sat Sep 16 08:27:23 2017 @@ -2463,7 +2463,6 @@ public final class TestXSSFBugs extends * .xlsx supports 64000 cell styles, the style indexes after * 32,767 must not be -32,768, then -32,767, -32,766 */ - @SuppressWarnings("resource") @Test public void bug57880() throws IOException { int numStyles = 33000; @@ -2475,7 +2474,7 @@ public final class TestXSSFBugs extends } assertEquals(numStyles, wb.getNumCellStyles()); - // avoid OOM in gump run + // avoid OOM in Gump run File file = XSSFTestDataSamples.writeOutAndClose(wb, "bug57880"); //noinspection UnusedAssignment wb = null; @@ -2513,7 +2512,7 @@ public final class TestXSSFBugs extends assertNotNull(sheet); Map<String, Object[]> data; - data = new TreeMap<String, Object[]>(); + data = new TreeMap<>(); data.put("1", new Object[]{"ID", "NAME", "LASTNAME"}); data.put("2", new Object[]{2, "Amit", "Shukla"}); data.put("3", new Object[]{1, "Lokesh", "Gupta"}); @@ -2773,7 +2772,7 @@ public final class TestXSSFBugs extends public void test51998() throws IOException { Workbook wb = XSSFTestDataSamples.openSampleWorkbook("51998.xlsx"); - Set<String> sheetNames = new HashSet<String>(); + Set<String> sheetNames = new HashSet<>(); for (int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++) { sheetNames.add(wb.getSheetName(sheetNum)); @@ -2983,7 +2982,7 @@ public final class TestXSSFBugs extends // Everything is fine at this point, cell is red - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(CellUtil.BORDER_BOTTOM, BorderStyle.THIN); CellUtil.setCellStyleProperties(cell, properties); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java Sat Sep 16 08:27:23 2017 @@ -159,7 +159,7 @@ public final class TestXSSFFormulaEvalua } // Setup the environment - Map<String,FormulaEvaluator> evaluators = new HashMap<String, FormulaEvaluator>(); + Map<String,FormulaEvaluator> evaluators = new HashMap<>(); evaluators.put("ref2-56737.xlsx", evaluator); evaluators.put("56737.xlsx", _testDataProvider.openSampleWorkbook("56737.xlsx").getCreationHelper().createFormulaEvaluator()); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java Sat Sep 16 08:27:23 2017 @@ -296,9 +296,9 @@ public final class TestXSSFSheet extends sheet.addMergedRegion(region_3); sheet.addMergedRegion(region_4); // test invalid indexes OOBE - Set<Integer> rmIdx = new HashSet<Integer>(Arrays.asList(5,6)); + Set<Integer> rmIdx = new HashSet<>(Arrays.asList(5, 6)); sheet.removeMergedRegions(rmIdx); - rmIdx = new HashSet<Integer>(Arrays.asList(1,3)); + rmIdx = new HashSet<>(Arrays.asList(1, 3)); sheet.removeMergedRegions(rmIdx); assertEquals("A1:B2", ctWorksheet.getMergeCells().getMergeCellArray(0).getRef()); assertEquals("E5:F6", ctWorksheet.getMergeCells().getMergeCellArray(1).getRef()); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java Sat Sep 16 08:27:23 2017 @@ -50,7 +50,7 @@ public final class TestXSSFTable { // read the original sheet header order XSSFRow row = wb1.getSheetAt(0).getRow(0); - List<String> headers = new ArrayList<String>(); + List<String> headers = new ArrayList<>(); for (Cell cell : row) { headers.add(cell.getStringCellValue()); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java Sat Sep 16 08:27:23 2017 @@ -151,7 +151,7 @@ public class MemoryUsage extends TestCas * @see #testXmlAttached() */ public void testXmlDetached(){ - List<CTRow> rows = new ArrayList<CTRow>(); + List<CTRow> rows = new ArrayList<>(); int i = 0; try { for(;;){ @@ -177,7 +177,7 @@ public class MemoryUsage extends TestCas */ public void testXmlAttached(){ printMemoryUsage("before"); - List<CTRow> rows = new ArrayList<CTRow>(); + List<CTRow> rows = new ArrayList<>(); int i = 0; //top-level element in sheet.xml CTWorksheet sh = CTWorksheet.Factory.newInstance(); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java Sat Sep 16 08:27:23 2017 @@ -121,7 +121,7 @@ public final class TestXWPFSDT { public void testNewLinesBetweenRuns() throws Exception { XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug55142.docx"); List<AbstractXWPFSDT> sdts = extractAllSDTs(doc); - List<String> targs = new ArrayList<String>(); + List<String> targs = new ArrayList<>(); //these test newlines and tabs in paragraphs/body elements targs.add("Rich-text1 abcdefghi"); targs.add("Rich-text2 abcd\t\tefgh"); @@ -152,7 +152,7 @@ public final class TestXWPFSDT { private List<AbstractXWPFSDT> extractAllSDTs(XWPFDocument doc) { - List<AbstractXWPFSDT> sdts = new ArrayList<AbstractXWPFSDT>(); + List<AbstractXWPFSDT> sdts = new ArrayList<>(); List<XWPFHeader> headers = doc.getHeaderList(); for (XWPFHeader header : headers) { @@ -175,7 +175,7 @@ public final class TestXWPFSDT { } private List<AbstractXWPFSDT> extractSDTsFromBodyElements(List<IBodyElement> elements) { - List<AbstractXWPFSDT> sdts = new ArrayList<AbstractXWPFSDT>(); + List<AbstractXWPFSDT> sdts = new ArrayList<>(); for (IBodyElement e : elements) { if (e instanceof XWPFSDT) { XWPFSDT sdt = (XWPFSDT) e; @@ -199,7 +199,7 @@ public final class TestXWPFSDT { private List<AbstractXWPFSDT> extractSDTsFromTable(XWPFTable table) { - List<AbstractXWPFSDT> sdts = new ArrayList<AbstractXWPFSDT>(); + List<AbstractXWPFSDT> sdts = new ArrayList<>(); for (XWPFTableRow r : table.getRows()) { for (ICell c : r.getTableICells()) { if (c instanceof XWPFSDTCell) { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java Sat Sep 16 08:27:23 2017 @@ -40,7 +40,7 @@ public final class TestXWPFStyles { @Test public void testGetUsedStyles() throws IOException { XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("Styles.docx"); - List<XWPFStyle> testUsedStyleList = new ArrayList<XWPFStyle>(); + List<XWPFStyle> testUsedStyleList = new ArrayList<>(); XWPFStyles styles = sampleDoc.getStyles(); XWPFStyle style = styles.getStyle("berschrift1"); testUsedStyleList.add(style); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java Sat Sep 16 08:27:23 2017 @@ -115,7 +115,7 @@ public final class Chunk { // Loop over the definitions, building the commands // and getting their values - ArrayList<Command> commandList = new ArrayList<Command>(); + ArrayList<Command> commandList = new ArrayList<>(); for(CommandDefinition cdef : commandDefinitions) { int type = cdef.getType(); int offset = cdef.getOffset(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java Sat Sep 16 08:27:23 2017 @@ -43,8 +43,8 @@ public final class ChunkFactory { /** * Key is a Chunk's type, value is an array of its CommandDefinitions */ - private final Map<Integer, CommandDefinition[]> chunkCommandDefinitions = - new HashMap<Integer, CommandDefinition[]>(); + private final Map<Integer, CommandDefinition[]> chunkCommandDefinitions = + new HashMap<>(); /** * What the name is of the chunk table definitions file? * This file comes from the scratchpad resources directory. @@ -87,7 +87,7 @@ public final class ChunkFactory { throw new IllegalStateException("Expecting start xxx, found " + line); } int chunkType = Integer.parseInt(line.substring(6)); - ArrayList<CommandDefinition> defsL = new ArrayList<CommandDefinition>(); + ArrayList<CommandDefinition> defsL = new ArrayList<>(); // Data entries while( (line = inp.readLine()) != null ) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java Sat Sep 16 08:27:23 2017 @@ -65,7 +65,7 @@ public final class VisioTextExtractor ex * @return An array of each Text item in the document */ public String[] getAllText() { - ArrayList<String> text = new ArrayList<String>(); + ArrayList<String> text = new ArrayList<>(); for(Stream stream : hdgf.getTopLevelStreams()) { findText(stream, text); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java Sat Sep 16 08:27:23 2017 @@ -47,7 +47,7 @@ public final class ChunkStream extends S * Process the contents of the stream out into chunks */ public void findChunks() { - ArrayList<Chunk> chunksA = new ArrayList<Chunk>(); + ArrayList<Chunk> chunksA = new ArrayList<>(); if(getPointer().getOffset() == 0x64b3) { int i = 0; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentEMFPlus.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentEMFPlus.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentEMFPlus.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentEMFPlus.java Sat Sep 16 08:27:23 2017 @@ -53,7 +53,7 @@ public class HemfCommentEMFPlus extends private static class HemfPlusParser { public static List<HemfPlusRecord> parse(byte[] bytes) { - List<HemfPlusRecord> records = new ArrayList<HemfPlusRecord>(); + List<HemfPlusRecord> records = new ArrayList<>(); int offset = 0; while (offset < bytes.length) { if (offset + 12 > bytes.length) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentPublic.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentPublic.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentPublic.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/HemfCommentPublic.java Sat Sep 16 08:27:23 2017 @@ -77,12 +77,12 @@ public class HemfCommentPublic { int currentOffset = 4 + 16;//4 public comment identifier, 16 for outputrect long countFormats = LittleEndian.getUInt(rawBytes, currentOffset); currentOffset += LittleEndianConsts.INT_SIZE; - List<EmrFormat> emrFormatList = new ArrayList<EmrFormat>(); + List<EmrFormat> emrFormatList = new ArrayList<>(); for (long i = 0; i < countFormats; i++) { emrFormatList.add(new EmrFormat(rawBytes, currentOffset)); currentOffset += 4 * LittleEndianConsts.INT_SIZE; } - List<HemfMultiFormatsData> list = new ArrayList<HemfMultiFormatsData>(); + List<HemfMultiFormatsData> list = new ArrayList<>(); for (EmrFormat emrFormat : emrFormatList) { byte[] data = IOUtils.safelyAllocate(emrFormat.size, MAX_RECORD_LENGTH); System.arraycopy(rawBytes, emrFormat.offset-4, data, 0, emrFormat.size); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/Attachment.java Sat Sep 16 08:27:23 2017 @@ -37,8 +37,8 @@ import org.apache.poi.hsmf.datatypes.MAP * and list methods to get all of them. */ public final class Attachment { - private final List<TNEFAttribute> attributes = new ArrayList<TNEFAttribute>(); - private final List<MAPIAttribute> mapiAttributes = new ArrayList<MAPIAttribute>(); + private final List<TNEFAttribute> attributes = new ArrayList<>(); + private final List<MAPIAttribute> mapiAttributes = new ArrayList<>(); protected void addAttribute(TNEFAttribute attr) { attributes.add(attr); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java Sat Sep 16 08:27:23 2017 @@ -44,9 +44,9 @@ public final class HMEFMessage { @SuppressWarnings("unused") private int fileId; - private final List<TNEFAttribute> messageAttributes = new ArrayList<TNEFAttribute>(); - private final List<MAPIAttribute> mapiAttributes = new ArrayList<MAPIAttribute>(); - private final List<Attachment> attachments = new ArrayList<Attachment>(); + private final List<TNEFAttribute> messageAttributes = new ArrayList<>(); + private final List<MAPIAttribute> mapiAttributes = new ArrayList<>(); + private final List<Attachment> attachments = new ArrayList<>(); public HMEFMessage(InputStream inp) throws IOException { try { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java Sat Sep 16 08:27:23 2017 @@ -100,7 +100,7 @@ public class MAPIAttribute { // First up, get the number of attributes int count = LittleEndian.readInt(inp); - List<MAPIAttribute> attrs = new ArrayList<MAPIAttribute>(); + List<MAPIAttribute> attrs = new ArrayList<>(); // Now, read each one in in turn for(int i=0; i<count; i++) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java Sat Sep 16 08:27:23 2017 @@ -30,7 +30,7 @@ import java.util.Map; * ones, so we can't just re-use the HSMF ones. */ public final class TNEFProperty { - private static Map<Integer, List<TNEFProperty>> properties = new HashMap<Integer, List<TNEFProperty>>(); + private static Map<Integer, List<TNEFProperty>> properties = new HashMap<>(); // Types taken from http://msdn.microsoft.com/en-us/library/microsoft.exchange.data.contenttypes.tnef.tnefattributetype%28v=EXCHG.140%29.aspx public static final int TYPE_TRIPLES = 0x0000; @@ -175,7 +175,7 @@ public final class TNEFProperty { // Store it for lookup if(! properties.containsKey(id)) { - properties.put(id, new ArrayList<TNEFProperty>()); + properties.put(id, new ArrayList<>()); } properties.get(id).add(this); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java Sat Sep 16 08:27:23 2017 @@ -41,7 +41,7 @@ public abstract class EscherPart extends DefaultEscherRecordFactory erf = new DefaultEscherRecordFactory(); - ArrayList<EscherRecord> ec = new ArrayList<EscherRecord>(); + ArrayList<EscherRecord> ec = new ArrayList<>(); byte data[] = getData(); int left = data.length; while(left > 0) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java Sat Sep 16 08:27:23 2017 @@ -195,7 +195,7 @@ public final class PowerPointExtractor e } public List<OLEShape> getOLEShapes() { - List<OLEShape> list = new ArrayList<OLEShape>(); + List<OLEShape> list = new ArrayList<>(); for (HSLFSlide slide : _slides) { for (HSLFShape shape : slide.getShapes()) { @@ -298,7 +298,7 @@ public final class PowerPointExtractor e // Not currently using _notes, as that can have the notes of // master sheets in. Grab Slide list, then work from there, // but ensure no duplicates - Set<Integer> seenNotes = new HashSet<Integer>(); + Set<Integer> seenNotes = new HashSet<>(); String headerText = ""; String footerText = ""; HeadersFooters hf = _show.getNotesHeadersFooters(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java Sat Sep 16 08:27:23 2017 @@ -137,7 +137,7 @@ public final class QuickButCruddyTextExt * strings, one per text record */ public List<String> getTextAsVector() { - List<String> textV = new ArrayList<String>(); + List<String> textV = new ArrayList<>(); // Set to the start of the file int walkPos = 0; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TabStopPropCollection.java Sat Sep 16 08:27:23 2017 @@ -79,7 +79,7 @@ public class TabStopPropCollection exten } } - private List<TabStop> tabStops = new ArrayList<TabStop>(); + private List<TabStop> tabStops = new ArrayList<>(); public TabStopPropCollection() { super(0, 0x100000, "tabStops"); @@ -113,7 +113,7 @@ public class TabStopPropCollection exten @Override public TabStopPropCollection clone() { TabStopPropCollection other = (TabStopPropCollection)super.clone(); - other.tabStops = new ArrayList<TabStop>(); + other.tabStops = new ArrayList<>(); for (TabStop ts : tabStops) { TabStop tso = new TabStop(ts.getPosition(), ts.getType()); other.tabStops.add(tso); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java Sat Sep 16 08:27:23 2017 @@ -94,7 +94,7 @@ public class TextPropCollection { // indentLevel is only valid for paragraph collection // if it's set to -1, it must be omitted - see 2.9.36 TextMasterStyleLevel private short indentLevel; - private final Map<String,TextProp> textProps = new HashMap<String,TextProp>(); + private final Map<String,TextProp> textProps = new HashMap<>(); private int maskSpecial; private final TextPropType textPropType; @@ -119,7 +119,7 @@ public class TextPropCollection { /** Fetch the TextProps that define this styling in the record order */ public List<TextProp> getTextPropList() { - List<TextProp> orderedList = new ArrayList<TextProp>(); + List<TextProp> orderedList = new ArrayList<>(); for (TextProp potProp : getPotentialProperties()) { TextProp textProp = textProps.get(potProp.getName()); if (textProp != null) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java Sat Sep 16 08:27:23 2017 @@ -206,7 +206,7 @@ public final class Document extends Posi } public void removeSlideListWithText(SlideListWithText slwt) { - ArrayList<SlideListWithText> lst = new ArrayList<SlideListWithText>(); + ArrayList<SlideListWithText> lst = new ArrayList<>(); for(SlideListWithText s : slwts) { if(s != slwt) lst.add(s); else { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java Sat Sep 16 08:27:23 2017 @@ -43,7 +43,7 @@ public class ExObjList extends RecordCon * Returns all the ExHyperlinks */ public ExHyperlink[] getExHyperlinks() { - ArrayList<ExHyperlink> links = new ArrayList<ExHyperlink>(); + ArrayList<ExHyperlink> links = new ArrayList<>(); for(int i=0; i<_children.length; i++) { if(_children[i] instanceof ExHyperlink) { links.add( (ExHyperlink)_children[i] ); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java Sat Sep 16 08:27:23 2017 @@ -33,7 +33,7 @@ import org.apache.poi.util.POILogger; */ public final class FontCollection extends RecordContainer { - private final Map<String,HSLFFontInfo> fonts = new LinkedHashMap<String,HSLFFontInfo>(); + private final Map<String,HSLFFontInfo> fonts = new LinkedHashMap<>(); private byte[] _header; protected FontCollection(byte[] source, int start, int len) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java Sat Sep 16 08:27:23 2017 @@ -38,7 +38,7 @@ import org.apache.poi.util.LittleEndian; */ public class HSLFEscherClientDataRecord extends EscherClientDataRecord { - private final List<Record> _childRecords = new ArrayList<Record>(); + private final List<Record> _childRecords = new ArrayList<>(); public List<? extends Record> getHSLFChildRecords() { return _childRecords; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java Sat Sep 16 08:27:23 2017 @@ -63,8 +63,8 @@ public final class MainMaster extends Sh // Find our children _children = Record.findChildRecords(source,start+8,len-8); - ArrayList<TxMasterStyleAtom> tx = new ArrayList<TxMasterStyleAtom>(); - ArrayList<ColorSchemeAtom> clr = new ArrayList<ColorSchemeAtom>(); + ArrayList<TxMasterStyleAtom> tx = new ArrayList<>(); + ArrayList<ColorSchemeAtom> clr = new ArrayList<>(); // Find the interesting ones in there for(int i=0; i<_children.length; i++) { if(_children[i] instanceof SlideAtom) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java Sat Sep 16 08:27:23 2017 @@ -54,7 +54,7 @@ public final class MasterTextPropAtom ex LittleEndian.putShort(_header, 2, (short)getRecordType()); LittleEndian.putInt(_header, 4, _data.length); - indents = new ArrayList<IndentProp>(); + indents = new ArrayList<>(); } /** @@ -121,7 +121,7 @@ public final class MasterTextPropAtom ex */ private void read() { int pos = 0; - indents = new ArrayList<IndentProp>(_data.length/6); + indents = new ArrayList<>(_data.length / 6); while (pos <= _data.length - 6) { int count = LittleEndian.getInt(_data, pos); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java Sat Sep 16 08:27:23 2017 @@ -55,7 +55,7 @@ public final class PPDrawing extends Rec private byte[] _header; private long _type; - private final List<EscherRecord> childRecords = new ArrayList<EscherRecord>(); + private final List<EscherRecord> childRecords = new ArrayList<>(); private EscherTextboxWrapper[] textboxWrappers; //cached EscherDgRecord @@ -112,13 +112,13 @@ public final class PPDrawing extends Rec textboxWrappers = findInDgContainer(dgContainer); } else { // Find and EscherTextboxRecord's, and wrap them up - final List<EscherTextboxWrapper> textboxes = new ArrayList<EscherTextboxWrapper>(); + final List<EscherTextboxWrapper> textboxes = new ArrayList<>(); findEscherTextboxRecord(childRecords, textboxes); this.textboxWrappers = textboxes.toArray(new EscherTextboxWrapper[textboxes.size()]); } } private EscherTextboxWrapper[] findInDgContainer(final EscherContainerRecord dgContainer) { - final List<EscherTextboxWrapper> found = new LinkedList<EscherTextboxWrapper>(); + final List<EscherTextboxWrapper> found = new LinkedList<>(); final EscherContainerRecord spgrContainer = findFirstEscherContainerRecordOfType(RecordTypes.EscherSpgrContainer, dgContainer); final EscherContainerRecord[] spContainers = findAllEscherContainerRecordOfType(RecordTypes.EscherSpContainer, spgrContainer); for (EscherContainerRecord spContainer : spContainers) { @@ -397,7 +397,7 @@ public final class PPDrawing extends Rec protected EscherContainerRecord[] findAllEscherContainerRecordOfType(RecordTypes type, EscherContainerRecord parent) { if (null == parent) { return new EscherContainerRecord[0]; } final List<EscherContainerRecord> children = parent.getChildContainers(); - final List<EscherContainerRecord> result = new LinkedList<EscherContainerRecord>(); + final List<EscherContainerRecord> result = new LinkedList<>(); for (EscherContainerRecord child : children) { if (type.typeID == child.getRecordId()) { result.add(child); @@ -407,7 +407,7 @@ public final class PPDrawing extends Rec } public StyleTextProp9Atom[] getNumberedListInfo() { - final List<StyleTextProp9Atom> result = new LinkedList<StyleTextProp9Atom>(); + final List<StyleTextProp9Atom> result = new LinkedList<>(); EscherContainerRecord dgContainer = getDgContainer(); final EscherContainerRecord spgrContainer = findFirstEscherContainerRecordOfType(RecordTypes.EscherSpgrContainer, dgContainer); final EscherContainerRecord[] spContainers = findAllEscherContainerRecordOfType(RecordTypes.EscherSpContainer, spgrContainer); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java Sat Sep 16 08:27:23 2017 @@ -108,7 +108,7 @@ public final class PersistPtrHolder exte // base number for these entries // count * 32 bit offsets // Repeat as many times as you have data - _slideLocations = new HashMap<Integer,Integer>(); + _slideLocations = new HashMap<>(); _ptrData = new byte[len-8]; System.arraycopy(source,start+8,_ptrData,0,_ptrData.length); @@ -180,7 +180,7 @@ public final class PersistPtrHolder exte } private void normalizePersistDirectory() { - TreeMap<Integer,Integer> orderedSlideLocations = new TreeMap<Integer,Integer>(_slideLocations); + TreeMap<Integer,Integer> orderedSlideLocations = new TreeMap<>(_slideLocations); @SuppressWarnings("resource") BufAccessBAOS bos = new BufAccessBAOS(); // NOSONAR Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java Sat Sep 16 08:27:23 2017 @@ -108,7 +108,7 @@ public abstract class Record * Default method for finding child records of a container record */ public static Record[] findChildRecords(byte[] b, int start, int len) { - List<Record> children = new ArrayList<Record>(5); + List<Record> children = new ArrayList<>(5); // Jump our little way along, creating records as we go int pos = start; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java Sat Sep 16 08:27:23 2017 @@ -139,7 +139,7 @@ public abstract class RecordContainer ex */ public Record removeChild(Record ch) { Record rm = null; - ArrayList<Record> lst = new ArrayList<Record>(); + ArrayList<Record> lst = new ArrayList<>(); for(Record r : _children) { if(r != ch) { lst.add(r); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java Sat Sep 16 08:27:23 2017 @@ -210,7 +210,7 @@ public enum RecordTypes { private static final Map<Short,RecordTypes> LOOKUP; static { - LOOKUP = new HashMap<Short,RecordTypes>(); + LOOKUP = new HashMap<>(); for(RecordTypes s : values()) { LOOKUP.put(s.typeID, s); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java Sat Sep 16 08:27:23 2017 @@ -83,7 +83,7 @@ public final class SlideListWithText ext // Group our children together into SlideAtomsSets // That way, model layer code can just grab the sets to use, // without having to try to match the children together - List<SlideAtomsSet> sets = new ArrayList<SlideAtomsSet>(); + List<SlideAtomsSet> sets = new ArrayList<>(); for(int i=0; i<_children.length; i++) { if(_children[i] instanceof SlidePersistAtom) { // Find where the next SlidePersistAtom is Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java Sat Sep 16 08:27:23 2017 @@ -48,7 +48,7 @@ public final class StyleTextProp9Atom ex */ protected StyleTextProp9Atom(byte[] source, int start, int len) { // Get the header. - final List<TextPFException9> schemes = new LinkedList<TextPFException9>(); + final List<TextPFException9> schemes = new LinkedList<>(); header = new byte[8]; System.arraycopy(source,start, header,0,8); this.version = LittleEndian.getShort(header, 0); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java Sat Sep 16 08:27:23 2017 @@ -137,8 +137,8 @@ public final class StyleTextPropAtom ext reserved = new byte[0]; // Set empty lists, ready for when they call setParentTextSize - paragraphStyles = new ArrayList<TextPropCollection>(); - charStyles = new ArrayList<TextPropCollection>(); + paragraphStyles = new ArrayList<>(); + charStyles = new ArrayList<>(); } @@ -156,8 +156,8 @@ public final class StyleTextPropAtom ext LittleEndian.putInt(_header,4,10); // Set empty paragraph and character styles - paragraphStyles = new ArrayList<TextPropCollection>(); - charStyles = new ArrayList<TextPropCollection>(); + paragraphStyles = new ArrayList<>(); + charStyles = new ArrayList<>(); addParagraphTextPropCollection(parentTextSize); addCharacterTextPropCollection(parentTextSize); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java Sat Sep 16 08:27:23 2017 @@ -165,7 +165,7 @@ public final class TextSpecInfoAtom exte public TextSpecInfoRun[] getTextSpecInfoRuns(){ LittleEndianByteArrayInputStream bis = new LittleEndianByteArrayInputStream(_data); // NOSONAR - List<TextSpecInfoRun> lst = new ArrayList<TextSpecInfoRun>(); + List<TextSpecInfoRun> lst = new ArrayList<>(); while (bis.available() > 0) { lst.add(new TextSpecInfoRun(bis)); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java Sat Sep 16 08:27:23 2017 @@ -144,8 +144,8 @@ public final class TxMasterStyleAtom ext short levels = LittleEndian.getShort(_data, 0); pos += LittleEndian.SHORT_SIZE; - paragraphStyles = new ArrayList<TextPropCollection>(levels); - charStyles = new ArrayList<TextPropCollection>(levels); + paragraphStyles = new ArrayList<>(levels); + charStyles = new ArrayList<>(levels); for(short i = 0; i < levels; i++) { TextPropCollection prprops = new TextPropCollection(0, TextPropType.paragraph); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java Sat Sep 16 08:27:23 2017 @@ -186,8 +186,8 @@ public final class HSLFFreeformShape ext Rectangle2D bounds = path.getBounds2D(); PathIterator it = path.getPathIterator(new AffineTransform()); - List<byte[]> segInfo = new ArrayList<byte[]>(); - List<Point2D.Double> pntInfo = new ArrayList<Point2D.Double>(); + List<byte[]> segInfo = new ArrayList<>(); + List<Point2D.Double> pntInfo = new ArrayList<>(); boolean isClosed = false; int numPoints = 0; while (!it.isDone()) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java Sat Sep 16 08:27:23 2017 @@ -274,7 +274,7 @@ implements HSLFShapeContainer, GroupShap public List<HSLFShape> getShapes() { // Our escher container record should contain several // SpContainers, the first of which is the group shape itself - List<HSLFShape> shapeList = new ArrayList<HSLFShape>(); + List<HSLFShape> shapeList = new ArrayList<>(); boolean isFirst = true; for (EscherRecord r : getSpContainer()) { if (isFirst) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java Sat Sep 16 08:27:23 2017 @@ -328,7 +328,7 @@ public final class HSLFHyperlink impleme */ @SuppressWarnings("resource") protected static List<HSLFHyperlink> find(List<HSLFTextParagraph> paragraphs){ - List<HSLFHyperlink> lst = new ArrayList<HSLFHyperlink>(); + List<HSLFHyperlink> lst = new ArrayList<>(); if (paragraphs == null || paragraphs.isEmpty()) return lst; HSLFTextParagraph firstPara = paragraphs.get(0); @@ -358,7 +358,7 @@ public final class HSLFHyperlink impleme HSLFEscherClientDataRecord cldata = shape.getClientData(false); if (exobj != null && cldata != null) { - List<HSLFHyperlink> lst = new ArrayList<HSLFHyperlink>(); + List<HSLFHyperlink> lst = new ArrayList<>(); find(cldata.getHSLFChildRecords(), exobj, lst); return lst.isEmpty() ? null : lst.get(0); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java Sat Sep 16 08:27:23 2017 @@ -35,7 +35,7 @@ import org.apache.poi.util.POILogger; public final class HSLFNotes extends HSLFSheet implements Notes<HSLFShape,HSLFTextParagraph> { protected static final POILogger logger = POILogFactory.getLogger(HSLFNotes.class); - private List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>(); + private List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>(); /** * Constructs a Notes Sheet from the given Notes record. Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java Sat Sep 16 08:27:23 2017 @@ -163,7 +163,7 @@ public abstract class HSLFSheet implemen throw new IllegalStateException("spgr not found"); } - List<HSLFShape> shapeList = new ArrayList<HSLFShape>(); + List<HSLFShape> shapeList = new ArrayList<>(); boolean isFirst = true; for (EscherRecord r : spgr) { if (isFirst) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java Sat Sep 16 08:27:23 2017 @@ -59,7 +59,7 @@ import org.apache.poi.sl.usermodel.Slide public final class HSLFSlide extends HSLFSheet implements Slide<HSLFShape,HSLFTextParagraph> { private int _slideNo; private SlideAtomsSet _atomSet; - private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>(); + private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>(); private HSLFNotes _notes; // usermodel needs to set this /** Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java Sat Sep 16 08:27:23 2017 @@ -36,7 +36,7 @@ import org.apache.poi.util.Internal; * @author Yegor Kozlov */ public final class HSLFSlideMaster extends HSLFMasterSheet { - private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<List<HSLFTextParagraph>>(); + private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>(); /** * all TxMasterStyleAtoms available in this master Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java?rev=1808516&r1=1808515&r2=1808516&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java Sat Sep 16 08:27:23 2017 @@ -96,7 +96,7 @@ public final class HSLFSlideShow impleme enum LoadSavePhase { INIT, LOADED } - private static final ThreadLocal<LoadSavePhase> loadSavePhase = new ThreadLocal<LoadSavePhase>(); + private static final ThreadLocal<LoadSavePhase> loadSavePhase = new ThreadLocal<>(); // What we're based on private final HSLFSlideShowImpl _hslfSlideShow; @@ -112,10 +112,10 @@ public final class HSLFSlideShow impleme private Document _documentRecord; // Friendly objects for people to deal with - private final List<HSLFSlideMaster> _masters = new ArrayList<HSLFSlideMaster>(); - private final List<HSLFTitleMaster> _titleMasters = new ArrayList<HSLFTitleMaster>(); - private final List<HSLFSlide> _slides = new ArrayList<HSLFSlide>(); - private final List<HSLFNotes> _notes = new ArrayList<HSLFNotes>(); + private final List<HSLFSlideMaster> _masters = new ArrayList<>(); + private final List<HSLFTitleMaster> _titleMasters = new ArrayList<>(); + private final List<HSLFSlide> _slides = new ArrayList<>(); + private final List<HSLFNotes> _notes = new ArrayList<>(); private FontCollection _fonts; // For logging @@ -196,7 +196,7 @@ public final class HSLFSlideShow impleme */ private void findMostRecentCoreRecords() { // To start with, find the most recent in the byte offset domain - Map<Integer,Integer> mostRecentByBytes = new HashMap<Integer,Integer>(); + Map<Integer,Integer> mostRecentByBytes = new HashMap<>(); for (Record record : _hslfSlideShow.getRecords()) { if (record instanceof PersistPtrHolder) { PersistPtrHolder pph = (PersistPtrHolder) record; @@ -224,14 +224,14 @@ public final class HSLFSlideShow impleme // We'll also want to be able to turn the slide IDs into a position // in this array - _sheetIdToCoreRecordsLookup = new HashMap<Integer,Integer>(); + _sheetIdToCoreRecordsLookup = new HashMap<>(); Integer[] allIDs = mostRecentByBytes.keySet().toArray(new Integer[mostRecentByBytes.size()]); Arrays.sort(allIDs); for (int i = 0; i < allIDs.length; i++) { _sheetIdToCoreRecordsLookup.put(allIDs[i], i); } - Map<Integer,Integer> mostRecentByBytesRev = new HashMap<Integer,Integer>(mostRecentByBytes.size()); + Map<Integer,Integer> mostRecentByBytesRev = new HashMap<>(mostRecentByBytes.size()); for (Map.Entry<Integer,Integer> me : mostRecentByBytes.entrySet()) { mostRecentByBytesRev.put(me.getValue(), me.getKey()); } @@ -340,7 +340,7 @@ public final class HSLFSlideShow impleme findMasterSlides(); // Having sorted out the masters, that leaves the notes and slides - Map<Integer,Integer> slideIdToNotes = new HashMap<Integer,Integer>(); + Map<Integer,Integer> slideIdToNotes = new HashMap<>(); // Start by finding the notes records findNotesSlides(slideIdToNotes); @@ -626,7 +626,7 @@ public final class HSLFSlideShow impleme _slides.get(newSlideNumber - 1).setSlideNumber(newSlideNumber); _slides.get(oldSlideNumber - 1).setSlideNumber(oldSlideNumber); - ArrayList<Record> lst = new ArrayList<Record>(); + ArrayList<Record> lst = new ArrayList<>(); for (SlideAtomsSet s : sas) { lst.add(s.getSlidePersistAtom()); lst.addAll(Arrays.asList(s.getSlideRecords())); @@ -657,8 +657,8 @@ public final class HSLFSlideShow impleme SlideListWithText slwt = _documentRecord.getSlideSlideListWithText(); SlideAtomsSet[] sas = slwt.getSlideAtomsSets(); - List<Record> records = new ArrayList<Record>(); - List<SlideAtomsSet> sa = new ArrayList<SlideAtomsSet>(Arrays.asList(sas)); + List<Record> records = new ArrayList<>(); + List<SlideAtomsSet> sa = new ArrayList<>(Arrays.asList(sas)); HSLFSlide removedSlide = _slides.remove(index); _notes.remove(removedSlide.getNotes()); @@ -685,8 +685,8 @@ public final class HSLFSlideShow impleme int notesId = removedSlide.getSlideRecord().getSlideAtom().getNotesID(); if (notesId != 0) { SlideListWithText nslwt = _documentRecord.getNotesSlideListWithText(); - records = new ArrayList<Record>(); - ArrayList<SlideAtomsSet> na = new ArrayList<SlideAtomsSet>(); + records = new ArrayList<>(); + ArrayList<SlideAtomsSet> na = new ArrayList<>(); for (SlideAtomsSet ns : nslwt.getSlideAtomsSets()) { if (ns.getSlidePersistAtom().getSlideIdentifier() == notesId) { continue; @@ -1090,7 +1090,7 @@ public final class HSLFSlideShow impleme } protected static Map<String,ClassID> getOleMap() { - Map<String,ClassID> olemap = new HashMap<String,ClassID>(); + Map<String,ClassID> olemap = new HashMap<>(); olemap.put(POWERPOINT_DOCUMENT, ClassID.PPT_SHOW); olemap.put("Workbook", ClassID.EXCEL97); // as per BIFF8 spec olemap.put("WORKBOOK", ClassID.EXCEL97); // Typically from third party programs @@ -1107,7 +1107,7 @@ public final class HSLFSlideShow impleme // As we go along, update, and hand over, to any Position Dependent // records we happen across Map<RecordTypes,PositionDependentRecord> interestingRecords = - new HashMap<RecordTypes,PositionDependentRecord>(); + new HashMap<>(); try { _hslfSlideShow.updateAndWriteDependantRecords(null,interestingRecords); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
