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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -43,7 +43,7 @@ import org.junit.runners.Parameterized.P @RunWith(Parameterized.class) public class TestAgileEncryptionParameters { - static byte testData[]; + static byte[] testData; @Parameter(value = 0) public CipherAlgorithm ca; @@ -54,9 +54,9 @@ public class TestAgileEncryptionParamete @Parameters(name="{0} {1} {2}") public static Collection<Object[]> data() { - CipherAlgorithm caList[] = { CipherAlgorithm.aes128, CipherAlgorithm.aes192, CipherAlgorithm.aes256, CipherAlgorithm.rc2, CipherAlgorithm.des, CipherAlgorithm.des3 }; - HashAlgorithm haList[] = { HashAlgorithm.sha1, HashAlgorithm.sha256, HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.md5 }; - ChainingMode cmList[] = { ChainingMode.cbc, ChainingMode.cfb }; + CipherAlgorithm[] caList = {CipherAlgorithm.aes128, CipherAlgorithm.aes192, CipherAlgorithm.aes256, CipherAlgorithm.rc2, CipherAlgorithm.des, CipherAlgorithm.des3}; + HashAlgorithm[] haList = {HashAlgorithm.sha1, HashAlgorithm.sha256, HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.md5}; + ChainingMode[] cmList = {ChainingMode.cbc, ChainingMode.cfb}; List<Object[]> data = new ArrayList<>(); for (CipherAlgorithm ca : caList) { @@ -101,7 +101,7 @@ public class TestAgileEncryptionParamete boolean passed = dec.verifyPassword("foobaa"); assertTrue(passed); InputStream is = dec.getDataStream(fsDec); - byte actualData[] = IOUtils.toByteArray(is); + byte[] actualData = IOUtils.toByteArray(is); is.close(); fsDec.close(); assertArrayEquals("Failed roundtrip - "+ca+"-"+ha+"-"+cm, testData, actualData);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java Tue Dec 25 09:59:58 2018 @@ -80,7 +80,7 @@ public class TestCertificateEncryption { */ static final String certDN = "CN=poitest"; // static final File pfxFile = TempFile.createTempFile("poitest", ".pfx"); - static byte pfxFileBytes[]; + static byte[] pfxFileBytes; static class CertData { KeyPair keypair; @@ -171,7 +171,7 @@ public class TestCertificateEncryption { File file = POIDataSamples.getDocumentInstance().getFile("VariousPictures.docx"); InputStream fis = new FileInputStream(file); - byte byteExpected[] = IOUtils.toByteArray(fis); + byte[] byteExpected = IOUtils.toByteArray(fis); fis.close(); OutputStream os = enc.getDataStream(fs); @@ -189,7 +189,7 @@ public class TestCertificateEncryption { assertTrue("certificate verification failed", passed); fis = agDec.getDataStream(fs); - byte byteActual[] = IOUtils.toByteArray(fis); + byte[] byteActual = IOUtils.toByteArray(fis); fis.close(); assertThat(byteExpected, equalTo(byteActual)); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java Tue Dec 25 09:59:58 2018 @@ -89,7 +89,7 @@ public class TestDecryptor { continue; } assertEquals(entry.getSize() - 1, zin.skip(entry.getSize() - 1)); - byte buf[] = new byte[10]; + byte[] buf = new byte[10]; int readBytes = zin.read(buf); // zin.available() doesn't work for entries assertEquals("size failed for " + entry.getName(), 1, readBytes); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java Tue Dec 25 09:59:58 2018 @@ -126,11 +126,11 @@ public class TestEncryptor { } // check that same verifier/salt lead to same hashes - final byte verifierSaltExpected[] = infoExpected.getVerifier().getSalt(); - final byte verifierExpected[] = decExpected.getVerifier(); - final byte keySalt[] = infoExpected.getHeader().getKeySalt(); - final byte keySpec[] = decExpected.getSecretKey().getEncoded(); - final byte integritySalt[] = decExpected.getIntegrityHmacKey(); + final byte[] verifierSaltExpected = infoExpected.getVerifier().getSalt(); + final byte[] verifierExpected = decExpected.getVerifier(); + final byte[] keySalt = infoExpected.getHeader().getKeySalt(); + final byte[] keySpec = decExpected.getSecretKey().getEncoded(); + final byte[] integritySalt = decExpected.getIntegrityHmacKey(); // the hmacs of the file always differ, as we use PKCS5-padding to pad the bytes // whereas office just uses random bytes // byte integrityHash[] = d.getIntegrityHmacValue(); @@ -210,10 +210,10 @@ public class TestEncryptor { } // check that same verifier/salt lead to same hashes - final byte verifierSaltExpected[] = infoExpected.getVerifier().getSalt(); - final byte verifierExpected[] = d.getVerifier(); - final byte keySpec[] = d.getSecretKey().getEncoded(); - final byte keySalt[] = infoExpected.getHeader().getKeySalt(); + final byte[] verifierSaltExpected = infoExpected.getVerifier().getSalt(); + final byte[] verifierExpected = d.getVerifier(); + final byte[] keySpec = d.getSecretKey().getEncoded(); + final byte[] keySalt = infoExpected.getHeader().getKeySalt(); final EncryptionInfo infoActual = new EncryptionInfo( 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -302,11 +302,11 @@ public class TestSignatureInfo { @Test public void getSignerUnsigned() throws Exception { - String testFiles[] = { - "hello-world-unsigned.docx", - "hello-world-unsigned.pptx", - "hello-world-unsigned.xlsx", - "hello-world-office-2010-technical-preview-unsigned.docx" + String[] testFiles = { + "hello-world-unsigned.docx", + "hello-world-unsigned.pptx", + "hello-world-unsigned.xlsx", + "hello-world-office-2010-technical-preview-unsigned.docx" }; for (String testFile : testFiles) { @@ -330,17 +330,17 @@ public class TestSignatureInfo { @Test public void getSigner() throws Exception { - String testFiles[] = { - "hyperlink-example-signed.docx", - "hello-world-signed.docx", - "hello-world-signed.pptx", - "hello-world-signed.xlsx", - "hello-world-office-2010-technical-preview.docx", - "ms-office-2010-signed.docx", - "ms-office-2010-signed.pptx", - "ms-office-2010-signed.xlsx", - "Office2010-SP1-XAdES-X-L.docx", - "signed.docx", + String[] testFiles = { + "hyperlink-example-signed.docx", + "hello-world-signed.docx", + "hello-world-signed.pptx", + "hello-world-signed.xlsx", + "hello-world-office-2010-technical-preview.docx", + "ms-office-2010-signed.docx", + "ms-office-2010-signed.pptx", + "ms-office-2010-signed.xlsx", + "Office2010-SP1-XAdES-X-L.docx", + "signed.docx", }; for (String testFile : testFiles) { @@ -594,7 +594,7 @@ public class TestSignatureInfo { String certDigestXQuery = declareNS + "$this//xades:SigningCertificate/xades:Cert/xades:CertDigest"; - XmlObject xoList[] = sigDoc.selectPath(certDigestXQuery); + XmlObject[] xoList = sigDoc.selectPath(certDigestXQuery); assertEquals(xoList.length, 1); DigestAlgAndValueType certDigest = (DigestAlgAndValueType) xoList[0]; assertNotNull(certDigest.getDigestValue()); @@ -682,7 +682,7 @@ public class TestSignatureInfo { is.close(); Key key = keystore.getKey("poitest", password.toCharArray()); - Certificate chainList[] = keystore.getCertificateChain("poitest"); + Certificate[] chainList = keystore.getCertificateChain("poitest"); List<X509Certificate> certChain = new ArrayList<>(); for (Certificate c : chainList) { certChain.add((X509Certificate)c); @@ -726,8 +726,8 @@ public class TestSignatureInfo { signatureConfig.setKey(keyPair.getPrivate()); signatureConfig.setSigningCertificateChain(Collections.singletonList(x509)); - HashAlgorithm testAlgo[] = { HashAlgorithm.sha224, HashAlgorithm.sha256 - , HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.ripemd160 }; + HashAlgorithm[] testAlgo = {HashAlgorithm.sha224, HashAlgorithm.sha256 + , HashAlgorithm.sha384, HashAlgorithm.sha512, HashAlgorithm.ripemd160}; for (HashAlgorithm ha : testAlgo) { OPCPackage pkg = null; @@ -932,7 +932,7 @@ public class TestSignatureInfo { } private void initKeyPair(String alias, String subjectDN, String pfxInput) throws Exception { - final char password[] = "test".toCharArray(); + final char[] password = "test".toCharArray(); File file = new File("build/test.pfx"); KeyStore keystore = KeyStore.getInstance("PKCS12"); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -68,7 +68,7 @@ public class TestFonts { "\u304C\u597D\u304D\u3067\u3001\u5C0F\u3055\u3044\u9803\u3001\u53E4\u4EE3\u751F\u7269\u306E\u56F3" + "\u9451\u3092\u4E00\u7DD2\u306B\u898B\u3066\u305F\u306E\u601D\u3044\u51FA\u3059\u301C\u3068\u3044"; - private static final String INIT_FONTS[] = { "mona.ttf" }; + private static final String[] INIT_FONTS = {"mona.ttf"}; // currently linux and mac return quite different values private static final int[] expected_sizes = { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java Tue Dec 25 09:59:58 2018 @@ -110,12 +110,12 @@ public class TestTable { } private void testTextDirection(SlideShow<?,?> ppt1) throws IOException { - - TextDirection tds[] = { - TextDirection.HORIZONTAL, - TextDirection.VERTICAL, - TextDirection.VERTICAL_270, - // TextDirection.STACKED is not supported on HSLF + + TextDirection[] tds = { + TextDirection.HORIZONTAL, + TextDirection.VERTICAL, + TextDirection.VERTICAL_270, + // TextDirection.STACKED is not supported on HSLF }; TableShape<?,?> tbl1 = ppt1.createSlide().createTable(1, 3); @@ -148,7 +148,7 @@ public class TestTable { @Test public void tableSpan() throws IOException { - String files[] = (xslfOnly()) ? new String[]{ "bug60993.pptx" } : new String[]{ "bug60993.pptx", "bug60993.ppt" }; + String[] files = (xslfOnly()) ? new String[]{"bug60993.pptx"} : new String[]{"bug60993.pptx", "bug60993.ppt"}; for (String f : files) { SlideShow<?,?> ppt = openSampleSlideshow(f); Slide<?,?> slide = ppt.getSlides().get(0); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -108,7 +108,7 @@ public class TestEmbeddedExtractor { public static String md5hash(byte[] input) { try { MessageDigest md = MessageDigest.getInstance("MD5"); - byte hash[] = md.digest(input); + byte[] hash = md.digest(input); return DatatypeConverter.printBase64Binary(hash); } catch (NoSuchAlgorithmException e) { // doesn't happen Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java Tue Dec 25 09:59:58 2018 @@ -82,7 +82,7 @@ public class TestEmbedOLEPackage { static void validateEmbeddedObjects(Workbook wb) throws IOException { boolean ooxml = wb.getClass().getName().toLowerCase(Locale.ROOT).contains("xssf"); - byte data[] = (ooxml) ? samplePPTX : samplePPT; + byte[] data = (ooxml) ? samplePPTX : samplePPT; Iterator<Integer> shapeIds = Arrays.asList(1025,1026,2049).iterator(); EmbeddedExtractor ee = new EmbeddedExtractor(); for (Sheet sheet : wb) { @@ -101,7 +101,7 @@ public class TestEmbedOLEPackage { static void addEmbeddedObjects(Workbook wb) throws IOException { boolean ooxml = wb.getClass().getName().toLowerCase(Locale.ROOT).contains("xssf"); int picIdx = wb.addPicture(samplePNG, Workbook.PICTURE_TYPE_PNG); - byte data[] = (ooxml) ? samplePPTX : samplePPT; + byte[] data = (ooxml) ? samplePPTX : samplePPT; String ext = (ooxml) ? ".pptx" : ".ppt"; int oleIdx1a = wb.addOlePackage(data, "dummy1a"+ext, "dummy1a"+ext, "dummy1a"+ext); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java Tue Dec 25 09:59:58 2018 @@ -43,7 +43,7 @@ public class TestTempFileThreaded { private static final int NUMBER_OF_TESTS = 200; private volatile Throwable exception; - private int executions[]; + private int[] executions; // the actual thread-safe temp-file strategy private static TempFileCreationStrategy createTempFileCreationStrategy(File poiTempFileDirectory) { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java Tue Dec 25 09:59:58 2018 @@ -290,7 +290,7 @@ public class TestXSLFBugs { @Test public void bug60499() throws IOException, InvalidFormatException { InputStream is = slTests.openResourceAsStream("bug60499.pptx"); - byte buf[] = IOUtils.toByteArray(is); + byte[] buf = IOUtils.toByteArray(is); is.close(); PackagePartName ppn = PackagingURIHelper.createPartName("/ppt/media/image1.png"); @@ -775,8 +775,8 @@ public class TestXSLFBugs { assertTrue(actualStyle instanceof SolidPaint); SolidPaint ps = (SolidPaint)actualStyle; Color actual = DrawPaint.applyColorTransform(ps.getSolidColor()); - float expRGB[] = expected.getRGBComponents(null); - float actRGB[] = actual.getRGBComponents(null); + float[] expRGB = expected.getRGBComponents(null); + float[] actRGB = actual.getRGBComponents(null); assertArrayEquals(expRGB, actRGB, 0.0001f); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java Tue Dec 25 09:59:58 2018 @@ -109,7 +109,7 @@ public class TestXSLFFreeformShape { } private void comparePoint(PathIterator pi, int type, double x0, double y0) { - double points[] = new double[6]; + double[] points = new double[6]; int piType = pi.currentSegment(points); assertEquals(type, piType); assertEquals(x0, points[0], 0); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java Tue Dec 25 09:59:58 2018 @@ -126,20 +126,20 @@ public class TestXSLFSlideShow { @Test public void testSlideLayoutNames() throws IOException { - final String names[] = { - "Blank", "Title Only", "Section Header", "Picture with Caption", "Title and Content" - , "Title Slide", "Title and Vertical Text", "Vertical Title and Text", "Comparison" - , "Two Content", "Content with Caption" + final String[] names = { + "Blank", "Title Only", "Section Header", "Picture with Caption", "Title and Content" + , "Title Slide", "Title and Vertical Text", "Vertical Title and Text", "Comparison" + , "Two Content", "Content with Caption" }; XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("layouts.pptx"); for (String name : names) { assertNotNull(ppt.findLayout(name)); } - final SlideLayout layTypes[] = { - SlideLayout.BLANK, SlideLayout.TITLE_ONLY, SlideLayout.SECTION_HEADER - , SlideLayout.PIC_TX, SlideLayout.TITLE_AND_CONTENT, SlideLayout.TITLE - , SlideLayout.VERT_TX, SlideLayout.VERT_TITLE_AND_TX, SlideLayout.TWO_TX_TWO_OBJ - , SlideLayout.TWO_OBJ, SlideLayout.OBJ_TX + final SlideLayout[] layTypes = { + SlideLayout.BLANK, SlideLayout.TITLE_ONLY, SlideLayout.SECTION_HEADER + , SlideLayout.PIC_TX, SlideLayout.TITLE_AND_CONTENT, SlideLayout.TITLE + , SlideLayout.VERT_TX, SlideLayout.VERT_TITLE_AND_TX, SlideLayout.TWO_TX_TWO_OBJ + , SlideLayout.TWO_OBJ, SlideLayout.OBJ_TX }; for (SlideLayout sl : layTypes){ assertNotNull(ppt.getSlideMasters().get(0).getLayout(sl)); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -44,9 +44,9 @@ public class TestThemesTable { private final String testFileSimple = "Themes.xlsx"; private final String testFileComplex = "Themes2.xlsx"; // TODO .xls version available too, add HSSF support then check - + // What colours they should show up as - private static String rgbExpected[] = { + private static String[] rgbExpected = { "ffffff", // Lt1 "000000", // Dk1 "eeece1", // Lt2 Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java Tue Dec 25 09:59:58 2018 @@ -470,13 +470,13 @@ public final class TestSXSSFWorkbook ext public void testZipBombNotTriggeredOnUselessContent() throws IOException { SXSSFWorkbook swb = new SXSSFWorkbook(null, 1, true, true); SXSSFSheet s = swb.createSheet(); - char useless[] = new char[32767]; + char[] useless = new char[32767]; Arrays.fill(useless, ' '); for (int row=0; row<1; row++) { Row r = s.createRow(row); for (int col=0; col<10; col++) { - char prefix[] = Integer.toHexString(row*1000+col).toCharArray(); + char[] prefix = Integer.toHexString(row * 1000 + col).toCharArray(); Arrays.fill(useless, 0, 10, ' '); System.arraycopy(prefix, 0, useless, 0, prefix.length); String ul = new String(useless); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java Tue Dec 25 09:59:58 2018 @@ -82,7 +82,7 @@ public final class TestUnfixedBugs { private void verifyBug54084Unicode(Workbook wb) { // expected data is stored in UTF-8 in a text-file - byte data[] = HSSFTestDataSamples.getTestDataFileContent("54084 - Greek - beyond BMP.txt"); + byte[] data = HSSFTestDataSamples.getTestDataFileContent("54084 - Greek - beyond BMP.txt"); String testData = new String(data, StandardCharsets.UTF_8).trim(); Sheet sheet = wb.getSheetAt(0); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -1581,10 +1581,10 @@ public final class TestXSSFBugs extends ByteArrayOutputStream bos = new ByteArrayOutputStream(8096); wb.write(bos); - byte firstSave[] = bos.toByteArray(); + byte[] firstSave = bos.toByteArray(); bos.reset(); wb.write(bos); - byte secondSave[] = bos.toByteArray(); + byte[] secondSave = bos.toByteArray(); /*OutputStream stream = new FileOutputStream("C:\\temp\\poi.xlsx"); try { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java Tue Dec 25 09:59:58 2018 @@ -177,7 +177,7 @@ public class TestXSSFVMLDrawing { Pattern p = Pattern.compile("<br/>"); int count = 0; for (XmlObject xo : vml.getItems()) { - String split[] = p.split(xo.toString()); + String[] split = p.split(xo.toString()); count += split.length-1; } assertEquals(16, count); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java Tue Dec 25 09:59:58 2018 @@ -126,7 +126,7 @@ public class TestXWPFBugs { @Test public void bug59058() throws IOException, XmlException { - String files[] = { "bug57031.docx", "bug59058.docx" }; + String[] files = {"bug57031.docx", "bug59058.docx"}; for (String f : files) { ZipFile zf = new ZipFile(samples.getFile(f)); ZipArchiveEntry entry = zf.getEntry("word/document.xml"); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java Tue Dec 25 09:59:58 2018 @@ -87,7 +87,7 @@ public final class VSDDumper { dumpVal("First few bytes are", ds, indent+1); if (stream instanceof PointerContainingStream) { - Stream streams[] = ((PointerContainingStream)stream).getPointedToStreams(); + Stream[] streams = ((PointerContainingStream) stream).getPointedToStreams(); dumpVal("Nbr of children", streams.length, indent+1); for(Stream s : streams) { @@ -95,7 +95,7 @@ public final class VSDDumper { } } if(stream instanceof ChunkStream) { - Chunk chunks[] = ((ChunkStream)stream).getChunks(); + Chunk[] chunks = ((ChunkStream) stream).getChunks(); dumpVal("Nbr of chunks", chunks.length, indent+1); for(Chunk chunk : chunks) { @@ -109,7 +109,7 @@ public final class VSDDumper { dumpVal("Length is", chunk._getContents().length, indent); dumpVal("OD Size is", chunk.getOnDiskSize(), indent); dumpVal("T / S is", chunk.getTrailer() + " / " + chunk.getSeparator(), indent); - Command commands[] = chunk.getCommands(); + Command[] commands = chunk.getCommands(); dumpVal("Nbr of commands", commands.length, indent); for(Command command : commands) { dumpVal(command.getDefinition().getName(), ""+command.getValue(), indent+1); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java Tue Dec 25 09:59:58 2018 @@ -136,7 +136,7 @@ public class HemfDraw { * The cubic Bezier curves SHOULD be drawn using the current pen. */ - Point2D pnt[] = { new Point2D.Double(), new Point2D.Double(), new Point2D.Double() }; + Point2D[] pnt = {new Point2D.Double(), new Point2D.Double(), new Point2D.Double()}; int i=0; if (hasStartPoint()) { @@ -754,7 +754,7 @@ public class HemfDraw { long size = readRectL(leis, bounds); int count = (int)leis.readUInt(); size += LittleEndianConsts.INT_SIZE; - Point2D points[] = new Point2D[count]; + Point2D[] points = new Point2D[count]; for (int i=0; i<count; i++) { points[i] = new Point2D.Double(); size += readPoint(leis, points[i]); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java Tue Dec 25 09:59:58 2018 @@ -476,7 +476,7 @@ public class HemfFont extends HwmfFont { @Override protected int readString(LittleEndianInputStream leis, StringBuilder sb, int limit) throws IOException { sb.setLength(0); - byte buf[] = new byte[limit*2]; + byte[] buf = new byte[limit * 2]; leis.readFully(buf); int b1, b2, readBytes = 0; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java Tue Dec 25 09:59:58 2018 @@ -143,7 +143,7 @@ public final class HMEFDumper { thisLen = len - offset; } - byte data[] = IOUtils.safelyAllocate(thisLen, MAX_RECORD_LENGTH); + byte[] data = IOUtils.safelyAllocate(thisLen, MAX_RECORD_LENGTH); System.arraycopy(attr.getData(), offset, data, 0, thisLen); System.out.print( 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -47,7 +47,7 @@ public abstract class EscherPart extends new DefaultEscherRecordFactory(); ArrayList<EscherRecord> ec = new ArrayList<>(); - byte data[] = getData(); + byte[] data = getData(); int left = data.length; while(left > 0) { EscherRecord er = erf.createRecord(data, 0); @@ -74,7 +74,7 @@ public abstract class EscherPart extends size += records[i].getRecordSize(); } - byte data[] = IOUtils.safelyAllocate(size, MAX_RECORD_LENGTH); + byte[] data = IOUtils.safelyAllocate(size, MAX_RECORD_LENGTH); size = 0; for(int i=0; i<records.length; i++) { int thisSize = Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java Tue Dec 25 09:59:58 2018 @@ -102,7 +102,7 @@ public abstract class HPBFPart { return data; } - protected final void setData(byte data[]) { + protected final void setData(byte[] data) { this.data = data.clone(); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java Tue Dec 25 09:59:58 2018 @@ -46,7 +46,7 @@ public final class QuillContents extends // Now parse the first 512 bytes, and produce // all our bits - byte data[] = getData(); + byte[] data = getData(); // Check first 8 bytes String f8 = new String(data, 0, 8, LocaleUtil.CHARSET_1252); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java Tue Dec 25 09:59:58 2018 @@ -48,7 +48,7 @@ public abstract class QCBit { */ public String getBitType() { return bitType; } public final byte[] getData() { return data; } - protected final void setData(byte data[]) { + protected final void setData(byte[] data) { this.data = data.clone(); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java Tue Dec 25 09:59:58 2018 @@ -74,7 +74,7 @@ public abstract class QCPLCBit extends Q return plcValB; } - final void setPreData(int preData[]) { + final void setPreData(int[] preData) { this.preData = preData.clone(); } @@ -115,18 +115,19 @@ public abstract class QCPLCBit extends Q super(thingType, bitType, data); // Grab our 4x pre-data - int preData[] = { - LittleEndian.getUShort(data, 8+0), - LittleEndian.getUShort(data, 8+2), - LittleEndian.getUShort(data, 8+4), - LittleEndian.getUShort(data, 8+6) - }; + int[] preData = { + LittleEndian.getUShort(data, 8 + 0), + LittleEndian.getUShort(data, 8 + 2), + LittleEndian.getUShort(data, 8 + 4), + LittleEndian.getUShort(data, 8 + 6) + }; setPreData(preData); // And grab the 2 byte values int cntPlcs = getNumberOfPLCs(); - long plcValA[] = new long[cntPlcs], plcValB[] = new long[cntPlcs]; - for(int i=0; i<cntPlcs; i++) { + long[] plcValA = new long[cntPlcs]; + long[] plcValB = new long[cntPlcs]; + for(int i=0; i<cntPlcs; i++) { plcValA[i] = LittleEndian.getUShort(data, 16+(4*i)); plcValB[i] = LittleEndian.getUShort(data, 16+(4*i)+2); } @@ -144,18 +145,19 @@ public abstract class QCPLCBit extends Q super(thingType, bitType, data); // Grab our 4x pre-data - int preData[] = { - LittleEndian.getUShort(data, 8+0), - LittleEndian.getUShort(data, 8+2), - LittleEndian.getUShort(data, 8+4), - LittleEndian.getUShort(data, 8+6) - }; + int[] preData = { + LittleEndian.getUShort(data, 8 + 0), + LittleEndian.getUShort(data, 8 + 2), + LittleEndian.getUShort(data, 8 + 4), + LittleEndian.getUShort(data, 8 + 6) + }; setPreData(preData); // And grab the 4 byte values int cntPlcs = getNumberOfPLCs(); - long plcValA[] = new long[cntPlcs], plcValB[] = new long[cntPlcs]; - for(int i=0; i<cntPlcs; i++) { + long[] plcValA = new long[cntPlcs]; + long[] plcValB = new long[cntPlcs]; + for(int i=0; i<cntPlcs; i++) { plcValA[i] = LittleEndian.getUInt(data, 16+(8*i)); plcValB[i] = LittleEndian.getUInt(data, 16+(8*i)+4); } @@ -173,21 +175,22 @@ public abstract class QCPLCBit extends Q super(thingType, bitType, data); // Grab our 7x pre-data - int preData[] = { - LittleEndian.getUShort(data, 8+0), - LittleEndian.getUShort(data, 8+2), - LittleEndian.getUShort(data, 8+4), - LittleEndian.getUShort(data, 8+6), - LittleEndian.getUShort(data, 8+8), - LittleEndian.getUShort(data, 8+10), - LittleEndian.getUShort(data, 8+12) - }; + int[] preData = { + LittleEndian.getUShort(data, 8 + 0), + LittleEndian.getUShort(data, 8 + 2), + LittleEndian.getUShort(data, 8 + 4), + LittleEndian.getUShort(data, 8 + 6), + LittleEndian.getUShort(data, 8 + 8), + LittleEndian.getUShort(data, 8 + 10), + LittleEndian.getUShort(data, 8 + 12) + }; setPreData(preData); // And grab the 4 byte values int cntPlcs = getNumberOfPLCs(); - long plcValA[] = new long[cntPlcs], plcValB[] = new long[cntPlcs]; - for(int i=0; i<cntPlcs; i++) { + long[] plcValA = new long[cntPlcs]; + long[] plcValB = new long[cntPlcs]; + for(int i=0; i<cntPlcs; i++) { plcValA[i] = LittleEndian.getUInt(data, 22+(8*i)); plcValB[i] = LittleEndian.getUInt(data, 22+(8*i)+4); } @@ -221,7 +224,7 @@ public abstract class QCPLCBit extends Q // We have 4 bytes, then the start point of each // hyperlink, then the end point of the text. - int preData[] = new int[1+cntPlcs+1]; + int[] preData = new int[1 + cntPlcs + 1]; for(int i=0; i<preData.length; i++) { preData[i] = (int)LittleEndian.getUInt(data, 8+(i*4)); } @@ -238,8 +241,8 @@ public abstract class QCPLCBit extends Q until = twoStartsAt + (cntPlcs-2)*threePlusIncrement; } - long plcValA[] = new long[(until-at)/2]; - long plcValB[] = new long[0]; + long[] plcValA = new long[(until - at) / 2]; + long[] plcValB = new long[0]; for(int i=0; i<plcValA.length; i++) { plcValA[i] = LittleEndian.getUShort(data, at+(i*2)); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java Tue Dec 25 09:59:58 2018 @@ -41,7 +41,7 @@ public final class QCTextBit extends QCB } public void setText(String text) { - byte data[] = IOUtils.safelyAllocate(text.length()*2, MAX_RECORD_LENGTH); + byte[] data = IOUtils.safelyAllocate(text.length() * 2, MAX_RECORD_LENGTH); StringUtil.putUnicodeLE(text, data, 0); setData(data); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java Tue Dec 25 09:59:58 2018 @@ -267,10 +267,10 @@ public final class PPTXMLDump { if(nl && length > 0)out.write(CR); } - private static final byte hexval[] = - {(byte) '0', (byte) '1', (byte) '2', (byte) '3', - (byte) '4', (byte) '5', (byte) '6', (byte) '7', - (byte) '8', (byte) '9', (byte) 'A', (byte) 'B', - (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F'}; + private static final byte[] hexval = + {(byte) '0', (byte) '1', (byte) '2', (byte) '3', + (byte) '4', (byte) '5', (byte) '6', (byte) '7', + (byte) '8', (byte) '9', (byte) 'A', (byte) 'B', + (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F'}; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java Tue Dec 25 09:59:58 2018 @@ -65,7 +65,7 @@ public final class SlideShowDumper { * right now this function takes one parameter: a ppt file, and outputs * a dump of what it contains */ - public static void main(String args[]) throws IOException + public static void main(String[] args) throws IOException { if(args.length == 0) { System.err.println("Useage: SlideShowDumper [-escher|-basicescher] <filename>"); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java Tue Dec 25 09:59:58 2018 @@ -55,7 +55,7 @@ public final class SlideShowRecordDumper * right now this function takes one parameter: a ppt file, and outputs a * dump of what it contains */ - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { String filename = ""; boolean verbose = false; boolean escher = false; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java Tue Dec 25 09:59:58 2018 @@ -29,7 +29,7 @@ import org.apache.poi.sl.usermodel.Pictu * Utility to extract pictures from a PowerPoint file. */ public final class ImageExtractor { - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { if (args.length < 1) { System.err.println("Usage:"); System.err.println("\tImageExtractor <file>"); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -55,7 +55,7 @@ public final class PowerPointExtractor e /** * Basic extractor. Returns all the text, and optionally all the notes */ - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { if (args.length < 1) { System.err.println("Useage:"); System.err.println("\tPowerPointExtractor [-notes] <file>"); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -61,7 +61,7 @@ public final class QuickButCruddyTextExt * Really basic text extractor, that will also return lots of crud text. * Takes a single argument, the file to extract from */ - public static void main(String args[]) throws IOException + public static void main(String[] args) throws IOException { if(args.length < 1) { System.err.println("Useage:"); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java Tue Dec 25 09:59:58 2018 @@ -69,7 +69,7 @@ public class HSLFMetroShape<T extends Sh */ @SuppressWarnings("unchecked") public T getShape() { - byte metroBytes[] = getMetroBytes(); + byte[] metroBytes = getMetroBytes(); if (metroBytes == null) { return null; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java Tue Dec 25 09:59:58 2018 @@ -55,7 +55,7 @@ public class HSLFTabStopPropCollection e * @param data the data stream * @param offset the offset within the data */ - public void parseProperty(byte data[], int offset) { + public void parseProperty(byte[] data, int offset) { tabStops.addAll(readTabStops(new LittleEndianByteArrayInputStream(data, offset))); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java Tue Dec 25 09:59:58 2018 @@ -112,7 +112,7 @@ public final class DocumentEncryptionAto public void writeOut(OutputStream out) throws IOException { // Data - byte data[] = new byte[1024]; + byte[] data = new byte[1024]; LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(data, 0); bos.writeShort(ei.getVersionMajor()); bos.writeShort(ei.getVersionMinor()); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -58,7 +58,7 @@ public class HSLFEscherClientDataRecord @Override public int fillFields(byte[] data, int offset, EscherRecordFactory recordFactory) { int bytesRemaining = readHeader( data, offset ); - byte remainingData[] = IOUtils.safelyAllocate(bytesRemaining, MAX_RECORD_LENGTH); + byte[] remainingData = IOUtils.safelyAllocate(bytesRemaining, MAX_RECORD_LENGTH); System.arraycopy(data, offset+8, remainingData, 0, bytesRemaining); setRemainingData(remainingData); return bytesRemaining + 8; @@ -70,8 +70,8 @@ public class HSLFEscherClientDataRecord LittleEndian.putShort(data, offset, getOptions()); LittleEndian.putShort(data, offset+2, getRecordId()); - - byte childBytes[] = getRemainingData(); + + byte[] childBytes = getRemainingData(); LittleEndian.putInt(data, offset+4, childBytes.length); System.arraycopy(childBytes, 0, data, offset+8, childBytes.length); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -189,7 +189,7 @@ public final class PersistPtrHolder exte @SuppressWarnings("resource") BufAccessBAOS bos = new BufAccessBAOS(); // NOSONAR - byte intbuf[] = new byte[4]; + byte[] intbuf = new byte[4]; int lastPersistEntry = -1; int lastSlideId = -1; for (Entry<Integer,Integer> me : orderedSlideLocations.entrySet()) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java Tue Dec 25 09:59:58 2018 @@ -201,8 +201,8 @@ public class SSSlideInfoAtom extends Rec out.write(_header); writeLittleEndian(_slideTime, out); writeLittleEndian(_soundIdRef, out); - - byte byteBuf[] = new byte[LittleEndianConsts.BYTE_SIZE]; + + byte[] byteBuf = new byte[LittleEndianConsts.BYTE_SIZE]; LittleEndian.putUByte(byteBuf, 0, _effectDirection); out.write(byteBuf); LittleEndian.putUByte(byteBuf, 0, _effectType); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -398,8 +398,8 @@ public final class StyleTextPropAtom ext } out.append(" original byte stream \n"); - - byte buf[] = IOUtils.safelyAllocate(rawContents.length+reserved.length, MAX_RECORD_LENGTH); + + byte[] buf = IOUtils.safelyAllocate(rawContents.length + reserved.length, MAX_RECORD_LENGTH); System.arraycopy(rawContents, 0, buf, 0, rawContents.length); System.arraycopy(reserved, 0, buf, rawContents.length, reserved.length); out.append( HexDump.dump(buf, 0, 0) ); 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -135,7 +135,7 @@ public final class TextSpecInfoAtom exte assert(size > 0); int covered = 0; ByteArrayOutputStream bos = new ByteArrayOutputStream(); - TextSpecInfoRun runs[] = getTextSpecInfoRuns(); + TextSpecInfoRun[] runs = getTextSpecInfoRuns(); assert(runs.length > 0); for (int i=0; i<runs.length && covered < size; i++) { TextSpecInfoRun run = runs[i]; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java Tue Dec 25 09:59:58 2018 @@ -173,18 +173,18 @@ public class TextSpecInfoRun { * @throws java.io.IOException if an error occurs. */ public void writeOut(OutputStream out) throws IOException { - final byte buf[] = new byte[4]; + final byte[] buf = new byte[4]; LittleEndian.putInt(buf, 0, length); out.write(buf); LittleEndian.putInt(buf, 0, mask); out.write(buf); - Object flds[] = { - spellFld, spellInfo, "spell info", - langFld, langId, "lang id", - altLangFld, altLangId, "alt lang id", - bidiFld, bidi, "bidi", - pp10extFld, pp10extMask, "pp10 extension field", - smartTagFld, smartTagsBytes, "smart tags" + Object[] flds = { + spellFld, spellInfo, "spell info", + langFld, langId, "lang id", + altLangFld, altLangId, "alt lang id", + bidiFld, bidi, "bidi", + pp10extFld, pp10extMask, "pp10 extension field", + smartTagFld, smartTagsBytes, "smart tags" }; for (int i=0; i<flds.length-1; i+=3) { @@ -193,7 +193,7 @@ public class TextSpecInfoRun { if (!fld.isSet(mask)) continue; boolean valid; if (valO instanceof byte[]) { - byte bufB[] = (byte[])valO; + byte[] bufB = (byte[]) valO; valid = bufB.length > 0; out.write(bufB); } else if (valO instanceof Integer) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java Tue Dec 25 09:59:58 2018 @@ -382,8 +382,8 @@ public abstract class HSLFShape implemen boolean fSystemRGB = ecr.hasSystemRGBFlag(); boolean fSchemeIndex = ecr.hasSchemeIndexFlag(); boolean fSysIndex = ecr.hasSysIndexFlag(); - - int rgb[] = ecr.getRGB(); + + int[] rgb = ecr.getRGB(); HSLFSheet sheet = getSheet(); if (fSchemeIndex && sheet != null) { 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=1849716&r1=1849715&r2=1849716&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 Tue Dec 25 09:59:58 2018 @@ -1020,7 +1020,7 @@ public final class HSLFSlideShow impleme ExEmbed exEmbed = new ExEmbed(); // remove unneccessary infos, so we don't need to specify the type // of the ole object multiple times - Record children[] = exEmbed.getChildRecords(); + Record[] children = exEmbed.getChildRecords(); exEmbed.removeChild(children[2]); exEmbed.removeChild(children[3]); exEmbed.removeChild(children[4]); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java Tue Dec 25 09:59:58 2018 @@ -60,18 +60,18 @@ public class HSLFSlideShowEncrypted impl private static final BitField fieldRecInst = new BitField(0xFFF0); - private static final int BLIB_STORE_ENTRY_PARTS[] = { - 1, // btWin32 - 1, // btMacOS - 16, // rgbUid - 2, // tag - 4, // size - 4, // cRef - 4, // foDelay - 1, // unused1 - 1, // cbName (@ index 33) - 1, // unused2 - 1, // unused3 + private static final int[] BLIB_STORE_ENTRY_PARTS = { + 1, // btWin32 + 1, // btMacOS + 16, // rgbUid + 2, // tag + 4, // size + 4, // cRef + 4, // foDelay + 1, // unused1 + 1, // cbName (@ index 33) + 1, // unused2 + 1, // unused3 }; protected HSLFSlideShowEncrypted(DocumentEncryptionAtom dea) { @@ -359,7 +359,7 @@ public class HSLFSlideShowEncrypted impl } } - protected Record[] updateEncryptionRecord(Record records[]) { + protected Record[] updateEncryptionRecord(Record[] records) { String password = Biff8EncryptionKey.getCurrentUserPassword(); if (password == null) { if (dea == null) { @@ -376,12 +376,12 @@ public class HSLFSlideShowEncrypted impl dea = new DocumentEncryptionAtom(); } EncryptionInfo ei = dea.getEncryptionInfo(); - byte salt[] = ei.getVerifier().getSalt(); + byte[] salt = ei.getVerifier().getSalt(); Encryptor enc = getEncryptionInfo().getEncryptor(); if (salt == null) { enc.confirmPassword(password); } else { - byte verifier[] = ei.getDecryptor().getVerifier(); + byte[] verifier = ei.getDecryptor().getVerifier(); enc.confirmPassword(password, null, null, verifier, salt, null); } @@ -396,7 +396,7 @@ public class HSLFSlideShowEncrypted impl * Before this method is called, make sure that the offsets are correct, * i.e. call {@link HSLFSlideShowImpl#updateAndWriteDependantRecords(OutputStream, Map)} */ - protected static Record[] normalizeRecords(Record records[]) { + protected static Record[] normalizeRecords(Record[] records) { // http://msdn.microsoft.com/en-us/library/office/gg615594(v=office.14).aspx // repeated slideIds can be overwritten, i.e. ignored @@ -456,7 +456,7 @@ public class HSLFSlideShowEncrypted impl } - protected static Record[] removeEncryptionRecord(Record records[]) { + protected static Record[] removeEncryptionRecord(Record[] records) { int deaSlideId = -1; int deaOffset = -1; PersistPtrHolder ptr = null; @@ -502,7 +502,7 @@ public class HSLFSlideShowEncrypted impl } - protected static Record[] addEncryptionRecord(Record records[], DocumentEncryptionAtom dea) { + protected static Record[] addEncryptionRecord(Record[] records, DocumentEncryptionAtom dea) { assert(dea != null); int ueaIdx = -1, ptrIdx = -1, deaIdx = -1, idx = -1; for (Record r : records) { @@ -530,7 +530,7 @@ public class HSLFSlideShowEncrypted impl uea.setEncryptSessionPersistIdRef(nextSlideId); uea.setMaxPersistWritten(nextSlideId); - Record newRecords[] = new Record[records.length+1]; + Record[] newRecords = new Record[records.length + 1]; if (ptrIdx > 0) { System.arraycopy(records, 0, newRecords, 0, ptrIdx); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java Tue Dec 25 09:59:58 2018 @@ -157,7 +157,7 @@ implements HSLFShapeContainer, TableShap super.afterInsert(sh); Set<HSLFLine> lineSet = new HashSet<>(); - for (HSLFTableCell row[] : cells) { + for (HSLFTableCell[] row : cells) { for (HSLFTableCell c : row) { addShape(c); for (HSLFLine bt : new HSLFLine[]{ c.borderTop, c.borderRight, c.borderBottom, c.borderLeft }) { @@ -343,7 +343,7 @@ implements HSLFShapeContainer, TableShap if (cells == null) { initTable(); } else { - for (HSLFTableCell cols[] : cells) { + for (HSLFTableCell[] cols : cells) { for (HSLFTableCell col : cols) { col.setSheet(sheet); } @@ -412,7 +412,7 @@ implements HSLFShapeContainer, TableShap } double currentWidth = cells[0][col].getAnchor().getWidth(); double dx = width - currentWidth; - for (HSLFTableCell cols[] : cells) { + for (HSLFTableCell[] cols : cells) { Rectangle2D anchor = cols[col].getAnchor(); anchor.setRect(anchor.getX(), anchor.getY(), width, anchor.getHeight()); cols[col].setAnchor(anchor); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Tue Dec 25 09:59:58 2018 @@ -284,7 +284,7 @@ public final class HSLFTextParagraph imp * @return text run records */ public Record[] getRecords() { - Record r[] = _headerAtom.getParentRecord().getChildRecords(); + Record[] r = _headerAtom.getParentRecord().getChildRecords(); return getRecords(r, new int[] { 0 }, _headerAtom); } @@ -313,7 +313,7 @@ public final class HSLFTextParagraph imp } } - Record result[] = new Record[length]; + Record[] result = new Record[length]; System.arraycopy(records, startIdx[0], result, 0, length); startIdx[0] += length; @@ -812,7 +812,7 @@ public final class HSLFTextParagraph imp * are queried */ protected <T extends TextProp> T getPropVal(TextPropCollection props, String propName) { - String propNames[] = propName.split(","); + String[] propNames = propName.split(","); for (String pn : propNames) { T prop = props.findByName(pn); if (isValidProp(prop)) { @@ -835,7 +835,7 @@ public final class HSLFTextParagraph imp } } - final String propNames[] = propName.split(","); + final String[] propNames = propName.split(","); final HSLFSheet sheet = getSheet(); final int txtype = getRunType(); final HSLFMasterSheet master; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java Tue Dec 25 09:59:58 2018 @@ -238,7 +238,7 @@ implements TextShape<HSLFShape,HSLFTextP if (sheet != null) { PPDrawing drawing = sheet.getPPDrawing(); if (drawing != null) { - EscherTextboxWrapper wrappers[] = drawing.getTextboxWrappers(); + EscherTextboxWrapper[] wrappers = drawing.getTextboxWrappers(); if (wrappers != null) { for (EscherTextboxWrapper w : wrappers) { // check for object identity Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java Tue Dec 25 09:59:58 2018 @@ -155,7 +155,7 @@ public class HwmfGraphics { int cap = ps.getLineCap().awtFlag; int join = ps.getLineJoin().awtFlag; float miterLimit = (float)getProperties().getPenMiterLimit(); - float dashes[] = ps.getLineDashes(); + float[] dashes = ps.getLineDashes(); boolean dashAlt = ps.isAlternateDash(); // This value is not an integer index into the dash pattern array. // Instead, it is a floating-point value that specifies a linear distance. Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java Tue Dec 25 09:59:58 2018 @@ -215,13 +215,13 @@ public class HwmfBitmapDib { private long headerColorUsed = -1; @SuppressWarnings("unused") private long headerColorImportant = -1; - private Color colorTable[]; + private Color[] colorTable; @SuppressWarnings("unused") private int colorMaskR,colorMaskG,colorMaskB; // size of header and color table, for start of image data calculation private int introSize; - private byte imageData[]; + private byte[] imageData; public int init(LittleEndianInputStream leis, int recordSize) throws IOException { leis.mark(10000); @@ -442,7 +442,7 @@ public class HwmfBitmapDib { int imageSize = (int)Math.max(imageData.length, introSize+headerImageSize); // create the image data and leave the parsing to the ImageIO api - byte buf[] = IOUtils.safelyAllocate(BMP_HEADER_SIZE+imageSize, MAX_RECORD_LENGTH); + byte[] buf = IOUtils.safelyAllocate(BMP_HEADER_SIZE + imageSize, MAX_RECORD_LENGTH); // https://en.wikipedia.org/wiki/BMP_file_format # Bitmap file header buf[0] = (byte)'B'; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java Tue Dec 25 09:59:58 2018 @@ -182,7 +182,7 @@ public class HwmfEscape implements HwmfR /** * An array of bytes of size ByteCount. */ - private byte escapeData[]; + private byte[] escapeData; @Override public HwmfRecordType getWmfRecordType() { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java Tue Dec 25 09:59:58 2018 @@ -502,7 +502,9 @@ public class HwmfFont implements FontInf } protected int readString(LittleEndianInputStream leis, StringBuilder sb, int limit) throws IOException { - byte buf[] = new byte[limit], b, readBytes = 0; + byte[] buf = new byte[limit]; + byte b; + byte readBytes = 0; do { if (readBytes == limit) { return -1; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java Tue Dec 25 09:59:58 2018 @@ -357,7 +357,7 @@ public enum HwmfTernaryRasterOp { } public String describeCmd() { - String stack[] = new String[10]; + String[] stack = new String[10]; int stackPnt = 0; for (char c : opCmd.toCharArray()) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java Tue Dec 25 09:59:58 2018 @@ -330,9 +330,9 @@ public class HwmfText { */ protected byte[] rawTextBytes; /** - * An optional array of 16-bit signed integers that indicate the distance between - * origins of adjacent character cells. For example, Dx[i] logical units separate the origins of - * character cell i and character cell i + 1. If this field is present, there MUST be the same + * An optional array of 16-bit signed integers that indicate the distance between + * origins of adjacent character cells. For example, Dx[i] logical units separate the origins of + * character cell i and character cell i + 1. If this field is present, there MUST be the same * number of values as there are characters in the string. */ protected final List<Integer> dx = new ArrayList<>(); @@ -442,7 +442,7 @@ public class HwmfText { * The META_SETTEXTALIGN record defines text-alignment values in the playback device context. */ public static class WmfSetTextAlign implements HwmfRecord { - + /** * The drawing position in the playback device context MUST be updated after each text * output call. It MUST be used as the reference point.<p> Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java Tue Dec 25 09:59:58 2018 @@ -529,12 +529,12 @@ public class HwmfWindowing { * A 16-bit unsigned integer that defines the horizontal (x-axis) coordinate, * in logical units, of the left endpoint of the scanline. */ - private int left_scanline[]; + private int[] left_scanline; /** * A 16-bit unsigned integer that defines the horizontal (x-axis) coordinate, * in logical units, of the right endpoint of the scanline. */ - private int right_scanline[]; + private int[] right_scanline; /** * A 16-bit unsigned integer that MUST be the same as the value of the Count * field; it is present to allow upward travel in the structure. @@ -591,7 +591,7 @@ public class HwmfWindowing { /** * An array of Scan objects that define the scanlines in the region. */ - private WmfScanObject scanObjects[]; + private WmfScanObject[] scanObjects; @Override public HwmfRecordType getWmfRecordType() { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java Tue Dec 25 09:59:58 2018 @@ -640,7 +640,7 @@ public final class HWPFDocument extends updateEncryptionInfo(); EncryptionInfo ei = getEncryptionInfo(); if (ei != null) { - byte buf[] = new byte[1000]; + byte[] buf = new byte[1000]; LittleEndianByteArrayOutputStream leos = new LittleEndianByteArrayOutputStream(buf, 0); leos.writeShort(ei.getVersionMajor()); leos.writeShort(ei.getVersionMinor()); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java Tue Dec 25 09:59:58 2018 @@ -299,11 +299,11 @@ public abstract class HWPFDocumentCore e fBase.setFObfuscated(false); } Encryptor enc = _encryptionInfo.getEncryptor(); - byte salt[] = _encryptionInfo.getVerifier().getSalt(); + byte[] salt = _encryptionInfo.getVerifier().getSalt(); if (salt == null) { enc.confirmPassword(password); } else { - byte verifier[] = _encryptionInfo.getDecryptor().getVerifier(); + byte[] verifier = _encryptionInfo.getDecryptor().getVerifier(); enc.confirmPassword(password, null, null, verifier, salt, null); } } @@ -336,7 +336,7 @@ public abstract class HWPFDocumentCore e is = dec.getDataStream(dis, streamSize, 0); if (encryptionOffset > 0) { ChunkedCipherInputStream cis = (ChunkedCipherInputStream)is; - byte plain[] = IOUtils.safelyAllocate(encryptionOffset, MAX_RECORD_LENGTH); + byte[] plain = IOUtils.safelyAllocate(encryptionOffset, MAX_RECORD_LENGTH); cis.readPlain(plain, 0, encryptionOffset); bos.write(plain); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java Tue Dec 25 09:59:58 2018 @@ -70,7 +70,7 @@ public final class NumberFormatter { int num = number; final int radix = 26; - char buf[] = new char[33]; + char[] buf = new char[33]; int charPos = buf.length; while (num > 0) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java Tue Dec 25 09:59:58 2018 @@ -114,7 +114,7 @@ public final class SprmOperation return LittleEndian.getInt( codeBytes, 0 ); case 7: - byte threeByteInt[] = new byte[4]; + byte[] threeByteInt = new byte[4]; threeByteInt[0] = _grpprl[_gOffset]; threeByteInt[1] = _grpprl[_gOffset + 1]; threeByteInt[2] = _grpprl[_gOffset + 2]; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java Tue Dec 25 09:59:58 2018 @@ -57,8 +57,8 @@ public final class TestOleEmbedding { // Placeholder EMFs for clients that don't support the OLE components. List<HSLFPictureData> pictures = slideShow.getPictureData(); assertEquals("Should be two pictures", 2, pictures.size()); - - long checkSums[] = { 0xD37A4204l, 0x26A62F68l, 0x82853169l, 0xE0E45D2Bl }; + + long[] checkSums = {0xD37A4204l, 0x26A62F68l, 0x82853169l, 0xE0E45D2Bl}; int checkId = 0; // check for checksum to be uptodate @@ -154,11 +154,11 @@ public final class TestOleEmbedding { ppt = new HSLFSlideShow(new ByteArrayInputStream(bos.toByteArray())); HSLFObjectShape comp = (HSLFObjectShape)ppt.getSlides().get(0).getShapes().get(0); - byte compData[] = IOUtils.toByteArray(comp.getObjectData().getInputStream()); + byte[] compData = IOUtils.toByteArray(comp.getObjectData().getInputStream()); bos.reset(); poiData1.writeFilesystem(bos); - byte expData[] = bos.toByteArray(); + byte[] expData = bos.toByteArray(); assertArrayEquals(expData, compData); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java Tue Dec 25 09:59:58 2018 @@ -259,7 +259,7 @@ public final class TestSlideMaster { assertEquals(true, rt.isUnderlined()); assertEquals("Arial", rt.getFontFamily()); } else if (tpara.getRunType() == TextHeaderAtom.BODY_TYPE){ - int indents[] = { 32, 28, 24 }; + int[] indents = {32, 28, 24}; for (HSLFTextRun rt : tpara.getTextRuns()) { int indent = tpara.getIndentLevel(); assertEquals(indents[indent], rt.getFontSize(), 0); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java Tue Dec 25 09:59:58 2018 @@ -58,10 +58,10 @@ public class TestDocumentEncryption { @Test public void cryptoAPIDecryptionOther() throws Exception { - String encPpts[] = { - "Password_Protected-56-hello.ppt", - "Password_Protected-hello.ppt", - "Password_Protected-np-hello.ppt", + String[] encPpts = { + "Password_Protected-56-hello.ppt", + "Password_Protected-hello.ppt", + "Password_Protected-np-hello.ppt", }; Biff8EncryptionKey.setCurrentUserPassword("hello"); @@ -156,7 +156,7 @@ public class TestDocumentEncryption { String rawText = HSLFTextParagraph.getRawText(slide.getTextParagraphs().get(0)); assertEquals("Dominic Salemno", rawText); - String picCmp[][] = { + String[][] picCmp = { {"0", "nKsDTKqxTCR8LFkVVWlP9GSTvZ0="}, {"95163", "SuNOR+9V1UVYZIoeD65l3VTaLoc="}, {"100864", "Ql3IGrr4bNq07ZTp5iPg7b+pva8="}, @@ -170,7 +170,7 @@ public class TestDocumentEncryption { List<HSLFPictureData> pd = ss.getSlideShowImpl().getPictureData(); int i = 0; for (HSLFPictureData p : pd) { - byte hash[] = md.digest(p.getData()); + byte[] hash = md.digest(p.getData()); assertEquals(Integer.parseInt(picCmp[i][0]), p.getOffset()); assertEquals(picCmp[i][1], Base64.encodeBase64String(hash)); i++; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java?rev=1849716&r1=1849715&r2=1849716&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java Tue Dec 25 09:59:58 2018 @@ -669,7 +669,7 @@ public final class TestStyleTextPropAtom @Test public void testLoadWriteC() { // BitMaskTextProperties will sanitize the output - byte expected[] = data_c.clone(); + byte[] expected = data_c.clone(); expected[56] = 0; expected[68] = 0; doReadWrite(data_c, expected, data_c_text_len); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
