From: centic Date: Tue, 25 Dec 2018 09:59:58 +0000 (+0000) Subject: Code-style: Unify how arrays are specified from C-style to normal Java-style X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2bd8838fd83c0ba69680144af0e8ce407b877a4d;p=poi.git Code-style: Unify how arrays are specified from C-style to normal Java-style git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1849716 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java b/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java index 97b9cd3d18..9da099eb42 100644 --- a/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java +++ b/src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java @@ -39,7 +39,7 @@ import org.apache.poi.hwpf.usermodel.Range; */ public final class DataExtraction { - public static void main(String args[]) throws Exception { + public static void main(String[] args) throws Exception { if (args.length == 0) { usage(); diff --git a/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java b/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java index 73675b7f95..cf68cc03ec 100644 --- a/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java +++ b/src/examples/src/org/apache/poi/ss/examples/ExcelComparator.java @@ -92,7 +92,7 @@ public class ExcelComparator { List listOfDifferences = new ArrayList<>(); - public static void main(String args[]) throws Exception { + public static void main(String[] args) throws Exception { if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { System.err.println("java -cp "+ExcelComparator.class.getCanonicalName()+" dic = getDictionary(); LittleEndian.putUInt(dic.size(), out); @@ -873,7 +873,7 @@ public class Section { length += LittleEndianConsts.INT_SIZE; final String value = ls.getValue()+"\0"; - final byte bytes[] = CodePageUtil.getBytesInCodePage(value, codepage); + final byte[] bytes = CodePageUtil.getBytesInCodePage(value, codepage); final int len = (codepage == CodePageUtil.CP_UNICODE) ? value.length() : bytes.length; LittleEndian.putUInt( len, out ); diff --git a/src/java/org/apache/poi/hpsf/Variant.java b/src/java/org/apache/poi/hpsf/Variant.java index 87acdc066a..f7b541b101 100644 --- a/src/java/org/apache/poi/hpsf/Variant.java +++ b/src/java/org/apache/poi/hpsf/Variant.java @@ -342,47 +342,47 @@ public class Variant */ public static final Integer LENGTH_8 = 8; - private static final Object NUMBER_TO_NAME_LIST[][] = { - { 0L, "VT_EMPTY", LENGTH_0 }, - { 1L, "VT_NULL", LENGTH_UNKNOWN }, - { 2L, "VT_I2", LENGTH_2 }, - { 3L, "VT_I4", LENGTH_4 }, - { 4L, "VT_R4", LENGTH_4 }, - { 5L, "VT_R8", LENGTH_8 }, - { 6L, "VT_CY", LENGTH_UNKNOWN }, - { 7L, "VT_DATE", LENGTH_UNKNOWN }, - { 8L, "VT_BSTR", LENGTH_UNKNOWN }, - { 9L, "VT_DISPATCH", LENGTH_UNKNOWN }, - { 10L, "VT_ERROR", LENGTH_UNKNOWN }, - { 11L, "VT_BOOL", LENGTH_UNKNOWN }, - { 12L, "VT_VARIANT", LENGTH_UNKNOWN }, - { 13L, "VT_UNKNOWN", LENGTH_UNKNOWN }, - { 14L, "VT_DECIMAL", LENGTH_UNKNOWN }, - { 16L, "VT_I1", LENGTH_UNKNOWN }, - { 17L, "VT_UI1", LENGTH_UNKNOWN }, - { 18L, "VT_UI2", LENGTH_UNKNOWN }, - { 19L, "VT_UI4", LENGTH_UNKNOWN }, - { 20L, "VT_I8", LENGTH_UNKNOWN }, - { 21L, "VT_UI8", LENGTH_UNKNOWN }, - { 22L, "VT_INT", LENGTH_UNKNOWN }, - { 23L, "VT_UINT", LENGTH_UNKNOWN }, - { 24L, "VT_VOID", LENGTH_UNKNOWN }, - { 25L, "VT_HRESULT", LENGTH_UNKNOWN }, - { 26L, "VT_PTR", LENGTH_UNKNOWN }, - { 27L, "VT_SAFEARRAY", LENGTH_UNKNOWN }, - { 28L, "VT_CARRAY", LENGTH_UNKNOWN }, - { 29L, "VT_USERDEFINED", LENGTH_UNKNOWN }, - { 30L, "VT_LPSTR", LENGTH_VARIABLE }, - { 31L, "VT_LPWSTR", LENGTH_UNKNOWN }, - { 64L, "VT_FILETIME", LENGTH_8 }, - { 65L, "VT_BLOB", LENGTH_UNKNOWN }, - { 66L, "VT_STREAM", LENGTH_UNKNOWN }, - { 67L, "VT_STORAGE", LENGTH_UNKNOWN }, - { 68L, "VT_STREAMED_OBJECT", LENGTH_UNKNOWN }, - { 69L, "VT_STORED_OBJECT", LENGTH_UNKNOWN }, - { 70L, "VT_BLOB_OBJECT", LENGTH_UNKNOWN }, - { 71L, "VT_CF", LENGTH_UNKNOWN }, - { 72L, "VT_CLSID", LENGTH_UNKNOWN } + private static final Object[][] NUMBER_TO_NAME_LIST = { + {0L, "VT_EMPTY", LENGTH_0}, + {1L, "VT_NULL", LENGTH_UNKNOWN}, + {2L, "VT_I2", LENGTH_2}, + {3L, "VT_I4", LENGTH_4}, + {4L, "VT_R4", LENGTH_4}, + {5L, "VT_R8", LENGTH_8}, + {6L, "VT_CY", LENGTH_UNKNOWN}, + {7L, "VT_DATE", LENGTH_UNKNOWN}, + {8L, "VT_BSTR", LENGTH_UNKNOWN}, + {9L, "VT_DISPATCH", LENGTH_UNKNOWN}, + {10L, "VT_ERROR", LENGTH_UNKNOWN}, + {11L, "VT_BOOL", LENGTH_UNKNOWN}, + {12L, "VT_VARIANT", LENGTH_UNKNOWN}, + {13L, "VT_UNKNOWN", LENGTH_UNKNOWN}, + {14L, "VT_DECIMAL", LENGTH_UNKNOWN}, + {16L, "VT_I1", LENGTH_UNKNOWN}, + {17L, "VT_UI1", LENGTH_UNKNOWN}, + {18L, "VT_UI2", LENGTH_UNKNOWN}, + {19L, "VT_UI4", LENGTH_UNKNOWN}, + {20L, "VT_I8", LENGTH_UNKNOWN}, + {21L, "VT_UI8", LENGTH_UNKNOWN}, + {22L, "VT_INT", LENGTH_UNKNOWN}, + {23L, "VT_UINT", LENGTH_UNKNOWN}, + {24L, "VT_VOID", LENGTH_UNKNOWN}, + {25L, "VT_HRESULT", LENGTH_UNKNOWN}, + {26L, "VT_PTR", LENGTH_UNKNOWN}, + {27L, "VT_SAFEARRAY", LENGTH_UNKNOWN}, + {28L, "VT_CARRAY", LENGTH_UNKNOWN}, + {29L, "VT_USERDEFINED", LENGTH_UNKNOWN}, + {30L, "VT_LPSTR", LENGTH_VARIABLE}, + {31L, "VT_LPWSTR", LENGTH_UNKNOWN}, + {64L, "VT_FILETIME", LENGTH_8}, + {65L, "VT_BLOB", LENGTH_UNKNOWN}, + {66L, "VT_STREAM", LENGTH_UNKNOWN}, + {67L, "VT_STORAGE", LENGTH_UNKNOWN}, + {68L, "VT_STREAMED_OBJECT", LENGTH_UNKNOWN}, + {69L, "VT_STORED_OBJECT", LENGTH_UNKNOWN}, + {70L, "VT_BLOB_OBJECT", LENGTH_UNKNOWN}, + {71L, "VT_CF", LENGTH_UNKNOWN}, + {72L, "VT_CLSID", LENGTH_UNKNOWN} }; /* Initialize the number-to-name and number-to-length map: */ diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java index 631be8fd2d..7234cde5f6 100644 --- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java +++ b/src/java/org/apache/poi/hssf/dev/BiffViewer.java @@ -699,7 +699,7 @@ public final class BiffViewer { return ib; } - private static void writeHex(char buf[], int startInBuf, int value, int nDigits) { + private static void writeHex(char[] buf, int startInBuf, int value, int nDigits) { int acc = value; for(int i=nDigits-1; i>=0; i--) { int digit = acc & 0x0F; diff --git a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java index c2d7934195..b5f0d3f5f0 100644 --- a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java +++ b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java @@ -210,7 +210,7 @@ public class FormulaViewer * @param args pass one argument with the filename or --help * @throws IOException if the file can't be read or contained errors */ - public static void main(String args[]) throws IOException + public static void main(String[] args) throws IOException { if ((args == null) || (args.length >2 ) || args[ 0 ].equals("--help")) diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java index 4ff370125c..da9ecab337 100644 --- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java +++ b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java @@ -1338,7 +1338,7 @@ public final class InternalWorkbook { */ private static FormatRecord createFormat(int id) { // we'll need multiple editions for the different formats - final int mappings[] = { 5, 6, 7, 8, 0x2a, 0x29, 0x2c, 0x2b }; + final int[] mappings = {5, 6, 7, 8, 0x2a, 0x29, 0x2c, 0x2b}; if (id < 0 || id >= mappings.length) { throw new IllegalArgumentException("Unexpected id " + id); } @@ -1433,8 +1433,8 @@ public final class InternalWorkbook { */ private static StyleRecord createStyle(int id) { // we'll need multiple editions - final int mappings[][] = { - { 0x010, 3 }, { 0x011, 6 }, { 0x012, 4 }, { 0x013, 7 }, { 0x000, 0 }, { 0x014, 5 } + final int[][] mappings = { + {0x010, 3}, {0x011, 6}, {0x012, 4}, {0x013, 7}, {0x000, 0}, {0x014, 5} }; if (id < 0 || id >= mappings.length) { throw new IllegalArgumentException("Unexpected style id " + id); diff --git a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java index 61b92831c9..af6853eb2e 100644 --- a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java +++ b/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java @@ -62,7 +62,7 @@ public final class BoundSheetRecord extends StandardRecord { * @param in the record stream to read from */ public BoundSheetRecord(RecordInputStream in) { - byte buf[] = new byte[LittleEndianConsts.INT_SIZE]; + byte[] buf = new byte[LittleEndianConsts.INT_SIZE]; in.readPlain(buf, 0, buf.length); field_1_position_of_BOF = LittleEndian.getInt(buf); field_2_option_flags = in.readUShort(); diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/src/java/org/apache/poi/hssf/record/FilePassRecord.java index 5955e6d135..3b54d058d2 100644 --- a/src/java/org/apache/poi/hssf/record/FilePassRecord.java +++ b/src/java/org/apache/poi/hssf/record/FilePassRecord.java @@ -88,7 +88,7 @@ public final class FilePassRecord extends StandardRecord implements Cloneable { public void serialize(LittleEndianOutput out) { out.writeShort(encryptionType); - byte data[] = new byte[1024]; + byte[] data = new byte[1024]; LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(data, 0); // NOSONAR switch (encryptionInfo.getEncryptionMode()) { diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java index b3659db994..07afe95836 100644 --- a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java +++ b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java @@ -55,7 +55,7 @@ public final class WSBoolRecord extends StandardRecord { public WSBoolRecord(RecordInputStream in) { - byte data[] = in.readRemainder(); + byte[] data = in.readRemainder(); field_1_wsbool = data[ 1 ]; // backwards because theoretically this is one short field field_2_wsbool = diff --git a/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java b/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java index 99c5d46dc9..b9a7638789 100644 --- a/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java +++ b/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java @@ -41,12 +41,12 @@ public final class Biff8DecryptingStream implements BiffHeaderInput, LittleEndia private static final int MAX_RECORD_LENGTH = 100_000; private ChunkedCipherInputStream ccis; - private final byte buffer[] = new byte[LittleEndianConsts.LONG_SIZE]; + private final byte[] buffer = new byte[LittleEndianConsts.LONG_SIZE]; private boolean shouldSkipEncryptionOnCurrentRecord; public Biff8DecryptingStream(InputStream in, int initialOffset, EncryptionInfo info) throws RecordFormatException { try { - byte initialBuf[] = IOUtils.safelyAllocate(initialOffset, MAX_RECORD_LENGTH); + byte[] initialBuf = IOUtils.safelyAllocate(initialOffset, MAX_RECORD_LENGTH); InputStream stream; if (initialOffset == 0) { stream = in; @@ -207,7 +207,7 @@ public final class Biff8DecryptingStream implements BiffHeaderInput, LittleEndia } @Override - public void readPlain(byte b[], int off, int len) { + public void readPlain(byte[] b, int off, int len) { ccis.readPlain(b, off, len); } diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java index ede62933ab..aedfcdaa22 100644 --- a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java +++ b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java @@ -244,8 +244,8 @@ public class EscherGraphics extends Graphics } @Override - public void drawPolygon(int xPoints[], int yPoints[], - int nPoints) + public void drawPolygon(int[] xPoints, int[] yPoints, + int nPoints) { int right = findBiggest(xPoints); int bottom = findBiggest(yPoints); @@ -269,8 +269,8 @@ public class EscherGraphics extends Graphics @Override @NotImplemented - public void drawPolyline(int xPoints[], int yPoints[], - int nPoints) + public void drawPolyline(int[] xPoints, int[] yPoints, + int nPoints) { if (logger.check( POILogger.WARN )) logger.log(POILogger.WARN,"drawPolyline not supported"); @@ -401,8 +401,8 @@ public class EscherGraphics extends Graphics * @see java.awt.Graphics#drawPolygon(int[], int[], int) */ @Override - public void fillPolygon(int xPoints[], int yPoints[], - int nPoints) + public void fillPolygon(int[] xPoints, int[] yPoints, + int nPoints) { int right = findBiggest(xPoints); int bottom = findBiggest(yPoints); diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java index 5235a70221..fe6770c4f1 100644 --- a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java +++ b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java @@ -243,13 +243,13 @@ public final class EscherGraphics2d extends Graphics2D { // draw(new java.awt.geom.Ellipse2D.Float(x, y, width, height)); } - public void drawPolygon(int xPoints[], int yPoints[], - int nPoints) + public void drawPolygon(int[] xPoints, int[] yPoints, + int nPoints) { getEscherGraphics().drawPolygon(xPoints, yPoints, nPoints); } - public void drawPolyline(int xPoints[], int yPoints[], int nPoints) + public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) { if(nPoints > 0) { @@ -343,7 +343,7 @@ public final class EscherGraphics2d extends Graphics2D { * @param nPoints the total number of points in the polygon. * @see java.awt.Graphics#drawPolygon(int[], int[], int) */ - public void fillPolygon(int xPoints[], int yPoints[], int nPoints) + public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) { _escherGraphics.fillPolygon(xPoints, yPoints, nPoints); } diff --git a/src/java/org/apache/poi/hssf/usermodel/FontDetails.java b/src/java/org/apache/poi/hssf/usermodel/FontDetails.java index dd049d2933..d40ec07fcd 100644 --- a/src/java/org/apache/poi/hssf/usermodel/FontDetails.java +++ b/src/java/org/apache/poi/hssf/usermodel/FontDetails.java @@ -151,7 +151,7 @@ public class FontDetails int listSize = tok.countTokens(); if(max != -1 && listSize > max) listSize = max; - String list[] = new String[listSize]; + String[] list = new String[listSize]; for(int i = 0; tok.hasMoreTokens(); i++) { if(max != -1 && i == listSize - 1) diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java index c3d9fdafe2..e10a3e973a 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java @@ -256,7 +256,7 @@ public class HSSFPicture extends HSSFSimpleShape implements Picture { public void setFileName(String data){ // TODO: add trailing \u0000? - byte bytes[] = StringUtil.getToUnicodeLE(data); + byte[] bytes = StringUtil.getToUnicodeLE(data); EscherComplexProperty prop = new EscherComplexProperty(EscherProperties.BLIP__BLIPFILENAME, true, bytes); setPropertyValue(prop); } diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index f889d2704d..c7019cfe38 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -1508,7 +1508,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss } @SuppressWarnings("resource") - void encryptBytes(byte buf[]) { + void encryptBytes(byte[] buf) { EncryptionInfo ei = getEncryptionInfo(); if (ei == null) { return; @@ -1518,7 +1518,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss LittleEndianByteArrayInputStream plain = new LittleEndianByteArrayInputStream(buf, 0); // NOSONAR LittleEndianByteArrayOutputStream leos = new LittleEndianByteArrayOutputStream(buf, 0); // NOSONAR enc.setChunkSize(Biff8DecryptingStream.RC4_REKEYING_INTERVAL); - byte tmp[] = new byte[1024]; + byte[] tmp = new byte[1024]; try { ChunkedCipherOutputStream os = enc.getDataStream(leos, initialOffset); int totalBytes = 0; @@ -1532,7 +1532,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss if (sid == BoundSheetRecord.sid) { // special case for the field_1_position_of_BOF (=lbPlyPos) field of // the BoundSheet8 record which must be unencrypted - byte bsrBuf[] = IOUtils.safelyAllocate(len, MAX_RECORD_LENGTH); + byte[] bsrBuf = IOUtils.safelyAllocate(len, MAX_RECORD_LENGTH); plain.readFully(bsrBuf); os.writePlain(bsrBuf, 0, 4); os.write(bsrBuf, 4, len-4); @@ -1877,7 +1877,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss // remove first 22 bytes if file starts with magic bytes D7-CD-C6-9A // see also http://de.wikipedia.org/wiki/Windows_Metafile#Hinweise_zur_WMF-Spezifikation if (LittleEndian.getInt(pictureData) == 0x9AC6CDD7) { - byte picDataNoHeader[] = new byte[pictureData.length-22]; + byte[] picDataNoHeader = new byte[pictureData.length - 22]; System.arraycopy(pictureData, 22, picDataNoHeader, 0, pictureData.length-22); pictureData = picDataNoHeader; } @@ -2260,15 +2260,15 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss // check if the password has been changed EncryptionInfo ei = fpr.getEncryptionInfo(); EncryptionVerifier ver = ei.getVerifier(); - byte encVer[] = ver.getEncryptedVerifier(); + byte[] encVer = ver.getEncryptedVerifier(); Decryptor dec = ei.getDecryptor(); Encryptor enc = ei.getEncryptor(); try { if (encVer == null || !dec.verifyPassword(password)) { enc.confirmPassword(password); } else { - byte verifier[] = dec.getVerifier(); - byte salt[] = ver.getSalt(); + byte[] verifier = dec.getVerifier(); + byte[] salt = ver.getSalt(); enc.confirmPassword(password, null, null, verifier, salt, null); } } catch (GeneralSecurityException e) { diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java b/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java index 0b84362670..40b0e28ddb 100644 --- a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java +++ b/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java @@ -226,7 +226,7 @@ public abstract class ChunkedCipherInputStream extends LittleEndianInputStream { * */ @Override - public void readPlain(byte b[], int off, int len) { + public void readPlain(byte[] b, int off, int len) { if (len <= 0) { return; } diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java index 0aa73fd670..b98e229d8e 100644 --- a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java +++ b/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java @@ -220,7 +220,7 @@ public abstract class ChunkedCipherOutputStream extends FilterOutputStream { * @throws ShortBufferException */ protected int invokeCipher(int posInChunk, boolean doFinal) throws GeneralSecurityException, IOException { - byte plain[] = (plainByteFlags.isEmpty()) ? null : chunk.clone(); + byte[] plain = (plainByteFlags.isEmpty()) ? null : chunk.clone(); int ciLen = (doFinal) ? cipher.doFinal(chunk, 0, posInChunk, chunk) @@ -316,7 +316,7 @@ public abstract class ChunkedCipherOutputStream extends FilterOutputStream { // encrypted within the EncryptedData field, not including the size of the StreamSize field. // Note that the actual size of the \EncryptedPackage stream (1) can be larger than this // value, depending on the block size of the chosen encryption algorithm - byte buf[] = new byte[LittleEndianConsts.LONG_SIZE]; + byte[] buf = new byte[LittleEndianConsts.LONG_SIZE]; LittleEndian.putLong(buf, 0, pos); os.write(buf); diff --git a/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java b/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java index 6da96d8524..5ec778617c 100644 --- a/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java +++ b/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java @@ -41,13 +41,13 @@ public enum CipherAlgorithm { public final String jceId; public final int ecmaId; public final int defaultKeySize; - public final int allowedKeySize[]; + public final int[] allowedKeySize; public final int blockSize; public final int encryptedVerifierHashLength; public final String xmlId; public final boolean needsBouncyCastle; - CipherAlgorithm(CipherProvider provider, String jceId, int ecmaId, int defaultKeySize, int allowedKeySize[], int blockSize, int encryptedVerifierHashLength, String xmlId, boolean needsBouncyCastle) { + CipherAlgorithm(CipherProvider provider, String jceId, int ecmaId, int defaultKeySize, int[] allowedKeySize, int blockSize, int encryptedVerifierHashLength, String xmlId, boolean needsBouncyCastle) { this.provider = provider; this.jceId = jceId; this.ecmaId = ecmaId; diff --git a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java index 4a984929b6..d4908fcae5 100644 --- a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java +++ b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java @@ -84,7 +84,7 @@ public class CryptoFunctions { * @param spinCount * @return the hashed password */ - public static byte[] hashPassword(String password, HashAlgorithm hashAlgorithm, byte salt[], int spinCount) { + public static byte[] hashPassword(String password, HashAlgorithm hashAlgorithm, byte[] salt, int spinCount) { return hashPassword(password, hashAlgorithm, salt, spinCount, true); } @@ -101,7 +101,7 @@ public class CryptoFunctions { * if false the n-1 hash value is applied first * @return the hashed password */ - public static byte[] hashPassword(String password, HashAlgorithm hashAlgorithm, byte salt[], int spinCount, boolean iteratorFirst) { + public static byte[] hashPassword(String password, HashAlgorithm hashAlgorithm, byte[] salt, int spinCount, boolean iteratorFirst) { // If no password was given, use the default if (password == null) { password = Decryptor.DEFAULT_PASSWORD; @@ -149,7 +149,7 @@ public class CryptoFunctions { * **/ public static byte[] generateIv(HashAlgorithm hashAlgorithm, byte[] salt, byte[] blockKey, int blockSize) { - byte iv[] = salt; + byte[] iv = salt; if (blockKey != null) { MessageDigest hashAlgo = getMessageDigest(hashAlgorithm); hashAlgo.update(salt); @@ -333,34 +333,34 @@ public class CryptoFunctions { } } - private static final int INITIAL_CODE_ARRAY[] = { - 0xE1F0, 0x1D0F, 0xCC9C, 0x84C0, 0x110C, 0x0E10, 0xF1CE, - 0x313E, 0x1872, 0xE139, 0xD40F, 0x84F9, 0x280C, 0xA96A, - 0x4EC3 + private static final int[] INITIAL_CODE_ARRAY = { + 0xE1F0, 0x1D0F, 0xCC9C, 0x84C0, 0x110C, 0x0E10, 0xF1CE, + 0x313E, 0x1872, 0xE139, 0xD40F, 0x84F9, 0x280C, 0xA96A, + 0x4EC3 }; - private static final byte PAD_ARRAY[] = { - (byte)0xBB, (byte)0xFF, (byte)0xFF, (byte)0xBA, (byte)0xFF, - (byte)0xFF, (byte)0xB9, (byte)0x80, (byte)0x00, (byte)0xBE, - (byte)0x0F, (byte)0x00, (byte)0xBF, (byte)0x0F, (byte)0x00 + private static final byte[] PAD_ARRAY = { + (byte) 0xBB, (byte) 0xFF, (byte) 0xFF, (byte) 0xBA, (byte) 0xFF, + (byte) 0xFF, (byte) 0xB9, (byte) 0x80, (byte) 0x00, (byte) 0xBE, + (byte) 0x0F, (byte) 0x00, (byte) 0xBF, (byte) 0x0F, (byte) 0x00 }; - - private static final int ENCRYPTION_MATRIX[][] = { - /* char 1 */ {0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09}, - /* char 2 */ {0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF}, - /* char 3 */ {0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0}, - /* char 4 */ {0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40}, - /* char 5 */ {0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5}, - /* char 6 */ {0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A}, - /* char 7 */ {0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9}, - /* char 8 */ {0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0}, - /* char 9 */ {0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC}, - /* char 10 */ {0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10}, - /* char 11 */ {0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168}, - /* char 12 */ {0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C}, - /* char 13 */ {0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD}, - /* char 14 */ {0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC}, - /* char 15 */ {0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4} + + private static final int[][] ENCRYPTION_MATRIX = { + /* char 1 */ {0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09}, + /* char 2 */ {0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF}, + /* char 3 */ {0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0}, + /* char 4 */ {0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40}, + /* char 5 */ {0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5}, + /* char 6 */ {0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A}, + /* char 7 */ {0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9}, + /* char 8 */ {0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0}, + /* char 9 */ {0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC}, + /* char 10 */ {0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10}, + /* char 11 */ {0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168}, + /* char 12 */ {0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C}, + /* char 13 */ {0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD}, + /* char 14 */ {0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC}, + /* char 15 */ {0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4} }; /** @@ -514,11 +514,11 @@ public class CryptoFunctions { if (password.length() > 15) { password = password.substring(0, 15); } - byte passBytes[] = password.getBytes(Charset.forName("ASCII")); + byte[] passBytes = password.getBytes(Charset.forName("ASCII")); // this code is based on the libre office implementation. // The MS-OFFCRYPTO misses some infos about the various rotation sizes - byte obfuscationArray[] = new byte[16]; + byte[] obfuscationArray = new byte[16]; System.arraycopy(passBytes, 0, obfuscationArray, 0, passBytes.length); System.arraycopy(PAD_ARRAY, 0, obfuscationArray, passBytes.length, PAD_ARRAY.length-passBytes.length+1); @@ -526,8 +526,8 @@ public class CryptoFunctions { // rotation of key values is application dependent - Excel = 2 / Word = 7 int nRotateSize = 2; - - byte baseKeyLE[] = { (byte)(xorKey & 0xFF), (byte)((xorKey >>> 8) & 0xFF) }; + + byte[] baseKeyLE = {(byte) (xorKey & 0xFF), (byte) ((xorKey >>> 8) & 0xFF)}; for (int i=0; i count) { @@ -64,7 +64,7 @@ import org.apache.poi.util.Internal; } @Override - public synchronized int read(byte b[], int off, int len) { + public synchronized int read(byte[] b, int off, int len) { int readLen = super.read(b, off, len); if (readLen ==-1) { return -1; @@ -77,7 +77,7 @@ import org.apache.poi.util.Internal; return readLen; } - public CryptoAPIDocumentInputStream(CryptoAPIDecryptor decryptor, byte buf[]) + public CryptoAPIDocumentInputStream(CryptoAPIDecryptor decryptor, byte[] buf) throws GeneralSecurityException { super(buf); this.decryptor = decryptor; diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java index 5fa9564a41..fb6fb93e18 100644 --- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java +++ b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java @@ -31,7 +31,7 @@ import org.apache.poi.util.Internal; /* package */ class CryptoAPIDocumentOutputStream extends ByteArrayOutputStream { private final Cipher cipher; private final CryptoAPIEncryptor encryptor; - private final byte oneByte[] = { 0 }; + private final byte[] oneByte = {0}; public CryptoAPIDocumentOutputStream(CryptoAPIEncryptor encryptor) throws GeneralSecurityException { this.encryptor = encryptor; diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java index f5482c58e7..9c43626f2d 100644 --- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java +++ b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java @@ -37,17 +37,17 @@ public class CryptoAPIEncryptionVerifier extends StandardEncryptionVerifier impl } @Override - protected void setSalt(byte salt[]) { + protected void setSalt(byte[] salt) { super.setSalt(salt); } @Override - protected void setEncryptedVerifier(byte encryptedVerifier[]) { + protected void setEncryptedVerifier(byte[] encryptedVerifier) { super.setEncryptedVerifier(encryptedVerifier); } @Override - protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) { + protected void setEncryptedVerifierHash(byte[] encryptedVerifierHash) { super.setEncryptedVerifierHash(encryptedVerifierHash); } diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java index 9221d4a390..60b1be2841 100644 --- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java @@ -56,17 +56,17 @@ public class CryptoAPIEncryptor extends Encryptor implements Cloneable { @Override public void confirmPassword(String password) { Random r = new SecureRandom(); - byte salt[] = new byte[16]; - byte verifier[] = new byte[16]; + byte[] salt = new byte[16]; + byte[] verifier = new byte[16]; r.nextBytes(salt); r.nextBytes(verifier); confirmPassword(password, null, null, verifier, salt, null); } @Override - public void confirmPassword(String password, byte keySpec[], - byte keySalt[], byte verifier[], byte verifierSalt[], - byte integritySalt[]) { + public void confirmPassword(String password, byte[] keySpec, + byte[] keySalt, byte[] verifier, byte[] verifierSalt, + byte[] integritySalt) { assert(verifier != null && verifierSalt != null); CryptoAPIEncryptionVerifier ver = (CryptoAPIEncryptionVerifier)getEncryptionInfo().getVerifier(); ver.setSalt(verifierSalt); @@ -74,13 +74,13 @@ public class CryptoAPIEncryptor extends Encryptor implements Cloneable { setSecretKey(skey); try { Cipher cipher = initCipherForBlock(null, 0); - byte encryptedVerifier[] = new byte[verifier.length]; + byte[] encryptedVerifier = new byte[verifier.length]; cipher.update(verifier, 0, verifier.length, encryptedVerifier); ver.setEncryptedVerifier(encryptedVerifier); HashAlgorithm hashAlgo = ver.getHashAlgorithm(); MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo); - byte calcVerifierHash[] = hashAlg.digest(verifier); - byte encryptedVerifierHash[] = cipher.doFinal(calcVerifierHash); + byte[] calcVerifierHash = hashAlg.digest(verifier); + byte[] encryptedVerifierHash = cipher.doFinal(calcVerifierHash); ver.setEncryptedVerifierHash(encryptedVerifierHash); } catch (GeneralSecurityException e) { throw new EncryptedDocumentException("Password confirmation failed", e); @@ -121,7 +121,7 @@ public class CryptoAPIEncryptor extends Encryptor implements Cloneable { public void setSummaryEntries(DirectoryNode dir, String encryptedStream, POIFSFileSystem entries) throws IOException, GeneralSecurityException { CryptoAPIDocumentOutputStream bos = new CryptoAPIDocumentOutputStream(this); // NOSONAR - byte buf[] = new byte[8]; + byte[] buf = new byte[8]; bos.write(buf, 0, 8); // skip header List descList = new ArrayList<>(); @@ -168,7 +168,7 @@ public class CryptoAPIEncryptor extends Encryptor implements Cloneable { bos.write(buf, 0, 1); LittleEndian.putUInt(buf, 0, sde.reserved2); bos.write(buf, 0, 4); - byte nameBytes[] = StringUtil.getToUnicodeLE(sde.streamName); + byte[] nameBytes = StringUtil.getToUnicodeLE(sde.streamName); bos.write(nameBytes, 0, nameBytes.length); LittleEndian.putShort(buf, 0, (short)0); // null-termination bos.write(buf, 0, 2); diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java b/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java index 682d77190b..67da57129a 100644 --- a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java @@ -56,13 +56,13 @@ public class StandardDecryptor extends Decryptor implements Cloneable { Cipher cipher = getCipher(skey); try { - byte encryptedVerifier[] = ver.getEncryptedVerifier(); - byte verifier[] = cipher.doFinal(encryptedVerifier); + byte[] encryptedVerifier = ver.getEncryptedVerifier(); + byte[] verifier = cipher.doFinal(encryptedVerifier); setVerifier(verifier); MessageDigest sha1 = CryptoFunctions.getMessageDigest(ver.getHashAlgorithm()); byte[] calcVerifierHash = sha1.digest(verifier); - byte encryptedVerifierHash[] = ver.getEncryptedVerifierHash(); - byte decryptedVerifierHash[] = cipher.doFinal(encryptedVerifierHash); + byte[] encryptedVerifierHash = ver.getEncryptedVerifierHash(); + byte[] decryptedVerifierHash = cipher.doFinal(encryptedVerifierHash); // see 2.3.4.9 Password Verification (Standard Encryption) // ... The number of bytes used by the encrypted Verifier hash MUST be 32 ... @@ -83,14 +83,14 @@ public class StandardDecryptor extends Decryptor implements Cloneable { protected static SecretKey generateSecretKey(String password, EncryptionVerifier ver, int keySize) { HashAlgorithm hashAlgo = ver.getHashAlgorithm(); - byte pwHash[] = hashPassword(password, hashAlgo, ver.getSalt(), ver.getSpinCount()); + byte[] pwHash = hashPassword(password, hashAlgo, ver.getSalt(), ver.getSpinCount()); byte[] blockKey = new byte[4]; LittleEndian.putInt(blockKey, 0, 0); byte[] finalHash = CryptoFunctions.generateKey(pwHash, hashAlgo, blockKey, hashAlgo.hashSize); - byte x1[] = fillAndXor(finalHash, (byte) 0x36); - byte x2[] = fillAndXor(finalHash, (byte) 0x5c); + byte[] x1 = fillAndXor(finalHash, (byte) 0x36); + byte[] x2 = fillAndXor(finalHash, (byte) 0x5c); byte[] x3 = new byte[x1.length + x2.length]; System.arraycopy(x1, 0, x3, 0, x1.length); @@ -101,7 +101,7 @@ public class StandardDecryptor extends Decryptor implements Cloneable { return new SecretKeySpec(key, ver.getCipherAlgorithm().jceId); } - protected static byte[] fillAndXor(byte hash[], byte fillByte) { + protected static byte[] fillAndXor(byte[] hash, byte fillByte) { byte[] buff = new byte[64]; Arrays.fill(buff, fillByte); diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java b/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java index 4fd284a86c..a60feae30a 100644 --- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java +++ b/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java @@ -38,17 +38,17 @@ public class StandardEncryptionVerifier extends EncryptionVerifier implements En throw new RuntimeException("Salt size != 16 !?"); } - byte salt[] = new byte[16]; + byte[] salt = new byte[16]; is.readFully(salt); setSalt(salt); - - byte encryptedVerifier[] = new byte[16]; + + byte[] encryptedVerifier = new byte[16]; is.readFully(encryptedVerifier); setEncryptedVerifier(encryptedVerifier); verifierHashSize = is.readInt(); - byte encryptedVerifierHash[] = new byte[header.getCipherAlgorithm().encryptedVerifierHashLength]; + byte[] encryptedVerifierHash = new byte[header.getCipherAlgorithm().encryptedVerifierHashLength]; is.readFully(encryptedVerifierHash); setEncryptedVerifierHash(encryptedVerifierHash); @@ -69,7 +69,7 @@ public class StandardEncryptionVerifier extends EncryptionVerifier implements En // make method visible for this package @Override - protected void setSalt(byte salt[]) { + protected void setSalt(byte[] salt) { if (salt == null || salt.length != 16) { throw new EncryptedDocumentException("invalid verifier salt"); } @@ -78,26 +78,26 @@ public class StandardEncryptionVerifier extends EncryptionVerifier implements En // make method visible for this package @Override - protected void setEncryptedVerifier(byte encryptedVerifier[]) { + protected void setEncryptedVerifier(byte[] encryptedVerifier) { super.setEncryptedVerifier(encryptedVerifier); } // make method visible for this package @Override - protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) { + protected void setEncryptedVerifierHash(byte[] encryptedVerifierHash) { super.setEncryptedVerifierHash(encryptedVerifierHash); } @Override public void write(LittleEndianByteArrayOutputStream bos) { // see [MS-OFFCRYPTO] - 2.3.4.9 - byte salt[] = getSalt(); + byte[] salt = getSalt(); assert(salt.length == 16); bos.writeInt(salt.length); // salt size bos.write(salt); // The resulting Verifier value MUST be an array of 16 bytes. - byte encryptedVerifier[] = getEncryptedVerifier(); + byte[] encryptedVerifier = getEncryptedVerifier(); assert(encryptedVerifier.length == 16); bos.write(encryptedVerifier); @@ -111,7 +111,7 @@ public class StandardEncryptionVerifier extends EncryptionVerifier implements En // Verifier. If the encryption algorithm is RC4, the length MUST be 20 bytes. If the encryption // algorithm is AES, the length MUST be 32 bytes. After decrypting the EncryptedVerifierHash // field, only the first VerifierHashSize bytes MUST be used. - byte encryptedVerifierHash[] = getEncryptedVerifierHash(); + byte[] encryptedVerifierHash = getEncryptedVerifierHash(); assert(encryptedVerifierHash.length == getCipherAlgorithm().encryptedVerifierHashLength); bos.write(encryptedVerifierHash); } diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java b/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java index 274a778cca..7de19b9a7b 100644 --- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java @@ -78,7 +78,7 @@ public class StandardEncryptor extends Encryptor implements Cloneable { * see [MS-OFFCRYPTO] - 2.3.4.7 ECMA-376 Document Encryption Key Generation */ @Override - public void confirmPassword(String password, byte keySpec[], byte keySalt[], byte verifier[], byte verifierSalt[], byte integritySalt[]) { + public void confirmPassword(String password, byte[] keySpec, byte[] keySalt, byte[] verifier, byte[] verifierSalt, byte[] integritySalt) { StandardEncryptionVerifier ver = (StandardEncryptionVerifier)getEncryptionInfo().getVerifier(); ver.setSalt(verifierSalt); @@ -87,9 +87,9 @@ public class StandardEncryptor extends Encryptor implements Cloneable { Cipher cipher = getCipher(secretKey, null); try { - byte encryptedVerifier[] = cipher.doFinal(verifier); + byte[] encryptedVerifier = cipher.doFinal(verifier); MessageDigest hashAlgo = CryptoFunctions.getMessageDigest(ver.getHashAlgorithm()); - byte calcVerifierHash[] = hashAlgo.digest(verifier); + byte[] calcVerifierHash = hashAlgo.digest(verifier); // 2.3.3 EncryptionVerifier ... // An array of bytes that contains the encrypted form of the @@ -98,8 +98,8 @@ public class StandardEncryptor extends Encryptor implements Cloneable { // Verifier. If the encryption algorithm is RC4, the length MUST be 20 bytes. If the encryption // algorithm is AES, the length MUST be 32 bytes. After decrypting the EncryptedVerifierHash // field, only the first VerifierHashSize bytes MUST be used. - int encVerHashSize = ver.getCipherAlgorithm().encryptedVerifierHashLength; - byte encryptedVerifierHash[] = cipher.doFinal(Arrays.copyOf(calcVerifierHash, encVerHashSize)); + int encVerHashSize = ver.getCipherAlgorithm().encryptedVerifierHashLength; + byte[] encryptedVerifierHash = cipher.doFinal(Arrays.copyOf(calcVerifierHash, encVerHashSize)); ver.setEncryptedVerifier(encryptedVerifier); ver.setEncryptedVerifierHash(encryptedVerifierHash); diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java b/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java index 26fc78d8b7..66664b9d4a 100644 --- a/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java @@ -48,7 +48,7 @@ public class XORDecryptor extends Decryptor implements Cloneable { int keyComp = CryptoFunctions.createXorKey1(password); int verifierComp = CryptoFunctions.createXorVerifier1(password); if (keyVer == keyComp && verifierVer == verifierComp) { - byte xorArray[] = CryptoFunctions.createXorArray1(password); + byte[] xorArray = CryptoFunctions.createXorArray1(password); setSecretKey(new SecretKeySpec(xorArray, "XOR")); return true; } else { @@ -119,9 +119,9 @@ public class XORDecryptor extends Decryptor implements Cloneable { @Override protected int invokeCipher(int totalBytes, boolean doFinal) { final int pos = (int)getPos(); - final byte xorArray[] = getEncryptionInfo().getDecryptor().getSecretKey().getEncoded(); - final byte chunk[] = getChunk(); - final byte plain[] = getPlain(); + final byte[] xorArray = getEncryptionInfo().getDecryptor().getSecretKey().getEncoded(); + final byte[] chunk = getChunk(); + final byte[] plain = getPlain(); final int posInChunk = pos & getChunkMask(); /* @@ -164,7 +164,7 @@ public class XORDecryptor extends Decryptor implements Cloneable { @Override public void setNextRecordSize(int recordSize) { final int pos = (int)getPos(); - final byte chunk[] = getChunk(); + final byte[] chunk = getChunk(); final int chunkMask = getChunkMask(); recordStart = pos; recordEnd = recordStart+recordSize; diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java b/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java index ba0645cb77..d3a18e1398 100644 --- a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java +++ b/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java @@ -35,7 +35,7 @@ public class XOREncryptionVerifier extends EncryptionVerifier implements Encrypt * See [MS-OFFCRYPTO], 2.3.6.2 section, the first step of initializing XOR * array where it describes the generation of 16-bit XorKey value. */ - byte key[] = new byte[2]; + byte[] key = new byte[2]; is.readFully(key); setEncryptedKey(key); @@ -43,7 +43,7 @@ public class XOREncryptionVerifier extends EncryptionVerifier implements Encrypt * verificationBytes (2 bytes): An unsigned integer that specifies * the password verification identifier. */ - byte verifier[] = new byte[2]; + byte[] verifier = new byte[2]; is.readFully(verifier); setEncryptedVerifier(verifier); } diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java b/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java index 754d9df118..04cd5a8543 100644 --- a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java @@ -41,9 +41,9 @@ public class XOREncryptor extends Encryptor implements Cloneable { public void confirmPassword(String password) { int keyComp = CryptoFunctions.createXorKey1(password); int verifierComp = CryptoFunctions.createXorVerifier1(password); - byte xorArray[] = CryptoFunctions.createXorArray1(password); - - byte shortBuf[] = new byte[2]; + byte[] xorArray = CryptoFunctions.createXorArray1(password); + + byte[] shortBuf = new byte[2]; XOREncryptionVerifier ver = (XOREncryptionVerifier)getEncryptionInfo().getVerifier(); LittleEndian.putUShort(shortBuf, 0, keyComp); ver.setEncryptedKey(shortBuf); @@ -53,9 +53,9 @@ public class XOREncryptor extends Encryptor implements Cloneable { } @Override - public void confirmPassword(String password, byte keySpec[], - byte keySalt[], byte verifier[], byte verifierSalt[], - byte integritySalt[]) { + public void confirmPassword(String password, byte[] keySpec, + byte[] keySalt, byte[] verifier, byte[] verifierSalt, + byte[] integritySalt) { confirmPassword(password); } @@ -137,9 +137,9 @@ public class XOREncryptor extends Encryptor implements Cloneable { final int start = Math.max(posInChunk-(recordEnd-recordStart), 0); final BitSet plainBytes = getPlainByteFlags(); - final byte xorArray[] = getEncryptionInfo().getEncryptor().getSecretKey().getEncoded(); - final byte chunk[] = getChunk(); - final byte plain[] = (plainBytes.isEmpty()) ? null : chunk.clone(); + final byte[] xorArray = getEncryptionInfo().getEncryptor().getSecretKey().getEncoded(); + final byte[] chunk = getChunk(); + final byte[] plain = (plainBytes.isEmpty()) ? null : chunk.clone(); /* * From: http://social.msdn.microsoft.com/Forums/en-US/3dadbed3-0e68-4f11-8b43-3a2328d9ebd5 diff --git a/src/java/org/apache/poi/poifs/dev/POIFSLister.java b/src/java/org/apache/poi/poifs/dev/POIFSLister.java index 65c1e2c9ba..345d3c6a2c 100644 --- a/src/java/org/apache/poi/poifs/dev/POIFSLister.java +++ b/src/java/org/apache/poi/poifs/dev/POIFSLister.java @@ -38,7 +38,7 @@ public class POIFSLister { * * @param args the names of the files to be displayed */ - public static void main(final String args[]) throws IOException { + public static void main(final String[] args) throws IOException { if (args.length == 0) { System.err.println("Must specify at least one file to view"); System.exit(1); diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewer.java b/src/java/org/apache/poi/poifs/dev/POIFSViewer.java index ee53fb19eb..18095397f6 100644 --- a/src/java/org/apache/poi/poifs/dev/POIFSViewer.java +++ b/src/java/org/apache/poi/poifs/dev/POIFSViewer.java @@ -41,7 +41,7 @@ public final class POIFSViewer { * @param args the names of the files to be displayed */ - public static void main(final String args[]) { + public static void main(final String[] args) { if (args.length == 0) { System.err.println("Must specify at least one file to view"); System.exit(1); diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java b/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java index 90779546cf..718709f51f 100644 --- a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java +++ b/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java @@ -179,7 +179,7 @@ public class POIFSReader * @exception IOException if the files can't be read or have invalid content */ - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { if (args.length == 0) { System.err.println("at least one argument required: input filename(s)"); System.exit(1); diff --git a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java b/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java index 2e6cfcd55e..57084e6391 100644 --- a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java +++ b/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java @@ -428,7 +428,7 @@ public class Ole10Native { this.unknown1 = unknown1; } - public void setDataBuffer(byte dataBuffer[]) { + public void setDataBuffer(byte[] dataBuffer) { this.dataBuffer = dataBuffer.clone(); } } diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java index 2f7eb77a2b..36c7648377 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java @@ -787,7 +787,7 @@ public class POIFSFileSystem extends BlockStore * @param args names of the files; arg[ 0 ] is the input file, * arg[ 1 ] is the output file */ - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { if (args.length != 2) { System.err.println( "two arguments required: input filename and output filename"); diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java b/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java index 7af205accf..f5bbf5bd4b 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java @@ -177,7 +177,7 @@ public class POIFSStream implements Iterable } protected class StreamBlockByteBuffer extends OutputStream { - byte oneByte[] = new byte[1]; + byte[] oneByte = new byte[1]; ByteBuffer buffer; // Make sure we don't encounter a loop whilst overwriting // the existing blocks diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java b/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java index 665ccf5bdc..e5ffbb3ada 100644 --- a/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java +++ b/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java @@ -34,7 +34,7 @@ import org.apache.poi.util.StringUtil; * @since 3.15-beta2 */ public class VBAMacroExtractor { - public static void main(String args[]) throws IOException { + public static void main(String[] args) throws IOException { if (args.length == 0) { System.err.println("Use:"); System.err.println(" VBAMacroExtractor [output]"); diff --git a/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java b/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java index c37ce006a0..145791f401 100644 --- a/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java +++ b/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java @@ -72,7 +72,7 @@ public class BitmapImageRenderer implements ImageRenderer { } @Override - public void loadImage(byte data[], String contentType) throws IOException { + public void loadImage(byte[] data, String contentType) throws IOException { img = readImage(new ByteArrayInputStream(data), contentType); } diff --git a/src/java/org/apache/poi/sl/draw/DrawFactory.java b/src/java/org/apache/poi/sl/draw/DrawFactory.java index 99c9942b67..6a032d6c6e 100644 --- a/src/java/org/apache/poi/sl/draw/DrawFactory.java +++ b/src/java/org/apache/poi/sl/draw/DrawFactory.java @@ -211,7 +211,7 @@ public class DrawFactory { } } - + /** * Return a FontManager, either registered beforehand or a default implementation * diff --git a/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java b/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java index a428943699..7dcd704c4e 100644 --- a/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java +++ b/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java @@ -76,7 +76,7 @@ public class DrawFontManagerDefault implements DrawFontManager { public static String mapSymbolChars(String text) { // wingdings doesn't contain high-surrogates, so chars are ok boolean changed = false; - char chrs[] = text.toCharArray(); + char[] chrs = text.toCharArray(); for (int i=0; i 0 && col < cols - 1) ? BorderEdge.right : null; @@ -232,7 +232,7 @@ public class DrawTableShape extends DrawShape { * @param edges the border edges * @param args the border attributes */ - private static void setEdges(TableCell cell, BorderEdge edges[], Object... args) { + private static void setEdges(TableCell cell, BorderEdge[] edges, Object... args) { if (cell == null) { return; } diff --git a/src/java/org/apache/poi/sl/draw/ImageRenderer.java b/src/java/org/apache/poi/sl/draw/ImageRenderer.java index b2355b3012..330c02ab01 100644 --- a/src/java/org/apache/poi/sl/draw/ImageRenderer.java +++ b/src/java/org/apache/poi/sl/draw/ImageRenderer.java @@ -96,7 +96,7 @@ public interface ImageRenderer { * @param data the raw image bytes * @param contentType the content type */ - void loadImage(byte data[], String contentType) throws IOException; + void loadImage(byte[] data, String contentType) throws IOException; /** * @return the dimension of the buffered image diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java b/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java index 3ecc6e55c7..c6283b6759 100644 --- a/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java +++ b/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java @@ -35,7 +35,7 @@ public class ImageHeaderBitmap { private final Dimension size; - public ImageHeaderBitmap(byte data[], int offset) { + public ImageHeaderBitmap(byte[] data, int offset) { BufferedImage img = null; try { img = ImageIO.read(new ByteArrayInputStream(data, offset, data.length-offset)); diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java b/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java index fc7be14fed..48bf45564b 100644 --- a/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java +++ b/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java @@ -36,7 +36,7 @@ public class ImageHeaderEMF { // rectangle that can be drawn around the image stored in the metafile. private final Rectangle deviceBounds; - public ImageHeaderEMF(final byte data[], final int off) { + public ImageHeaderEMF(final byte[] data, final int off) { int offset = off; int type = (int)LittleEndian.getUInt(data, offset); offset += 4; if (type != 1) { diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java b/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java index ff121e3e7c..bf9cacefaf 100644 --- a/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java +++ b/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java @@ -32,17 +32,17 @@ public class ImageHeaderPICT { public static final double DEFAULT_RESOLUTION = Units.POINT_DPI; - private static final byte V2_HEADER[] = { - 0x00, 0x11, // v2 version opcode - 0x02, (byte)0xFF, // version number of new picture - 0x0C, 0x00, // header opcode - (byte)0xFF, (byte)0xFE, 0x00, 0x00 // pic size dummy + private static final byte[] V2_HEADER = { + 0x00, 0x11, // v2 version opcode + 0x02, (byte) 0xFF, // version number of new picture + 0x0C, 0x00, // header opcode + (byte) 0xFF, (byte) 0xFE, 0x00, 0x00 // pic size dummy }; private final Rectangle bounds; private final double hRes, vRes; - public ImageHeaderPICT(byte data[], final int off) { + public ImageHeaderPICT(byte[] data, final int off) { // http://mirrors.apple2.org.za/apple.cabi.net/Graphics/PICT.and_QT.INFO/PICT.file.format.TI.txt int offset = off; // low order 16 bits of picture size - can be ignored @@ -86,13 +86,13 @@ public class ImageHeaderPICT { return bounds; } - private static int readUnsignedShort(byte data[], int offset) { + private static int readUnsignedShort(byte[] data, int offset) { int b0 = data[offset] & 0xFF; int b1 = data[offset+1] & 0xFF; return b0 << 8 | b1; } - private static double readFixedPoint(byte data[], int offset) { + private static double readFixedPoint(byte[] data, int offset) { int b0 = data[offset] & 0xFF; int b1 = data[offset+1] & 0xFF; int b2 = data[offset+2] & 0xFF; diff --git a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java index 0abd5d62a5..939add734f 100644 --- a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java +++ b/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java @@ -245,31 +245,31 @@ public enum AutoNumberingScheme { //M (1000), CM (900), D (500), CD (400), C (100), XC (90), L (50), XL (40), X (10), IX (9), V (5), IV (4) and I (1). final int[] VALUES = new int[]{1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1}; final String[] ROMAN = new String[]{"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"}; - final String conciseList[][] = { - {"XLV", "VL"}, //45 - {"XCV", "VC"}, //95 - {"CDL", "LD"}, //450 - {"CML", "LM"}, //950 - {"CMVC", "LMVL"}, //995 - {"CDXC", "LDXL"}, //490 - {"CDVC", "LDVL"}, //495 - {"CMXC", "LMXL"}, //990 - {"XCIX", "VCIV"}, //99 - {"XLIX", "VLIV"}, //49 - {"XLIX", "IL"}, //49 - {"XCIX", "IC"}, //99 - {"CDXC", "XD"}, //490 - {"CDVC", "XDV"}, //495 - {"CDIC", "XDIX"}, //499 - {"LMVL", "XMV"}, //995 - {"CMIC", "XMIX"}, //999 - {"CMXC", "XM"}, // 990 - {"XDV", "VD"}, //495 - {"XDIX", "VDIV"}, //499 - {"XMV", "VM"}, // 995 - {"XMIX", "VMIV"}, //999 - {"VDIV", "ID"}, //499 - {"VMIV", "IM"} //999 + final String[][] conciseList = { + {"XLV", "VL"}, //45 + {"XCV", "VC"}, //95 + {"CDL", "LD"}, //450 + {"CML", "LM"}, //950 + {"CMVC", "LMVL"}, //995 + {"CDXC", "LDXL"}, //490 + {"CDVC", "LDVL"}, //495 + {"CMXC", "LMXL"}, //990 + {"XCIX", "VCIV"}, //99 + {"XLIX", "VLIV"}, //49 + {"XLIX", "IL"}, //49 + {"XCIX", "IC"}, //99 + {"CDXC", "XD"}, //490 + {"CDVC", "XDV"}, //495 + {"CDIC", "XDIX"}, //499 + {"LMVL", "XMV"}, //995 + {"CMIC", "XMIX"}, //999 + {"CMXC", "XM"}, // 990 + {"XDV", "VD"}, //495 + {"XDIX", "VDIV"}, //499 + {"XMV", "VM"}, // 995 + {"XMIX", "VMIV"}, //999 + {"VDIV", "ID"}, //499 + {"VMIV", "IM"} //999 }; StringBuilder sb = new StringBuilder(); @@ -280,7 +280,7 @@ public enum AutoNumberingScheme { } } String result = sb.toString(); - for (String cc[] : conciseList) { + for (String[] cc : conciseList) { result = result.replace(cc[0], cc[1]); } return result; diff --git a/src/java/org/apache/poi/sl/usermodel/PresetColor.java b/src/java/org/apache/poi/sl/usermodel/PresetColor.java index 9c4df2f9f6..2538d1b828 100644 --- a/src/java/org/apache/poi/sl/usermodel/PresetColor.java +++ b/src/java/org/apache/poi/sl/usermodel/PresetColor.java @@ -273,7 +273,7 @@ public enum PresetColor { } public static PresetColor valueOfNativeId(int nativeId) { - PresetColor vals[] = values(); + PresetColor[] vals = values(); return (0 < nativeId && nativeId <= vals.length) ? vals[nativeId-1] : null; } } diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java b/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java index 81f297e2cc..460e93bb23 100644 --- a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java +++ b/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java @@ -294,10 +294,10 @@ public class SlideShowFactory { private static < S extends Shape, P extends TextParagraph - > SlideShow createSlideShow(String factoryClass, Object args[]) throws IOException, EncryptedDocumentException { + > SlideShow createSlideShow(String factoryClass, Object[] args) throws IOException, EncryptedDocumentException { try { Class clazz = SlideShowFactory.class.getClassLoader().loadClass(factoryClass); - Class argsClz[] = new Class[args.length]; + Class[] argsClz = new Class[args.length]; int i=0; for (Object o : args) { Class c = o.getClass(); diff --git a/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java b/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java index b26658fe8b..500dffde4e 100644 --- a/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java +++ b/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java @@ -81,7 +81,7 @@ public interface StrokeStyle { /** PS_DASHDOTDOT system dash style / native 5 */ SYS_DASH_DOT_DOT(5, 11, 2,2,1,1,1,1); - public final int pattern[]; + public final int[] pattern; public final int nativeId; public final int ooxmlId; diff --git a/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java b/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java index 965a4d1a9e..adba13d520 100644 --- a/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java +++ b/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java @@ -234,7 +234,7 @@ public class EmbeddedExtractor implements Iterable { } // TODO: investigate if this is just an EMF-hack or if other formats are also embedded in EMF - byte pictureBytes[] = pd.getData(); + byte[] pictureBytes = pd.getData(); int idxStart = indexOf(pictureBytes, 0, "%PDF-".getBytes(LocaleUtil.CHARSET_1252)); if (idxStart == -1) { return null; @@ -283,7 +283,7 @@ public class EmbeddedExtractor implements Iterable { } DocumentInputStream dis = dn.createDocumentInputStream("package"); - byte data[] = IOUtils.toByteArray(dis); + byte[] data = IOUtils.toByteArray(dis); dis.close(); return new EmbeddedData(dn.getName()+ext, data, contentType); diff --git a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java b/src/java/org/apache/poi/ss/format/CellNumberFormatter.java index 764456a369..2511917e25 100644 --- a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java +++ b/src/java/org/apache/poi/ss/format/CellNumberFormatter.java @@ -185,8 +185,8 @@ public class CellNumberFormatter extends CellFormatter { } else { afterFractional = null; } - - double scaleByRef[] = { ph.getScale() }; + + double[] scaleByRef = {ph.getScale()}; showGroupingSeparator = interpretIntegerCommas(descBuf, specials, decimalPoint, integerEnd(), fractionalEnd(), scaleByRef); if (exponent == null) { scale = scaleByRef[0]; diff --git a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java b/src/java/org/apache/poi/ss/formula/CacheAreaEval.java index 50a5e06b0c..2716e24084 100644 --- a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java +++ b/src/java/org/apache/poi/ss/formula/CacheAreaEval.java @@ -63,8 +63,8 @@ public final class CacheAreaEval extends AreaEvalBase { int height = area.getLastRow() - area.getFirstRow() + 1; int width = area.getLastColumn() - area.getFirstColumn() + 1; - - ValueEval newVals[] = new ValueEval[height * width]; + + ValueEval[] newVals = new ValueEval[height * width]; int startRow = area.getFirstRow() - getFirstRow(); int startCol = area.getFirstColumn() - getFirstColumn(); diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java index 2fd24fe5c9..5be4108d12 100644 --- a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java +++ b/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java @@ -347,8 +347,8 @@ public final class OperationEvaluationContext { public ValueEval getAreaValueEval(int firstRowIndex, int firstColumnIndex, int lastRowIndex, int lastColumnIndex, Object[][] tokens) { - - ValueEval values[] = new ValueEval[tokens.length * tokens[0].length]; + + ValueEval[] values = new ValueEval[tokens.length * tokens[0].length]; int index = 0; for (int jdx = 0; jdx < tokens.length; jdx++) { diff --git a/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java b/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java index e5e1315832..7bec3599b6 100644 --- a/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java +++ b/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java @@ -33,7 +33,7 @@ public abstract class TwoOperandNumericOperation extends Fixed2ArgFunction imple return OperandResolver.coerceValueToDouble(ve); } - public ValueEval evaluateArray(ValueEval args[], int srcRowIndex, int srcColumnIndex) { + public ValueEval evaluateArray(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { if (args.length != 2) { return ErrorEval.VALUE_INVALID; } @@ -73,8 +73,8 @@ public abstract class TwoOperandNumericOperation extends Fixed2ArgFunction imple protected double[][] evaluate(double[][] d1, double[][] d2) throws IllegalArgumentException, EvaluationException { int width = (d1[0].length < d2[0].length) ? d1[0].length : d2[0].length; int height = (d1.length < d2.length) ? d1.length : d2.length; - - double result[][] = new double[height][width]; + + double[][] result = new double[height][width]; for (int j = 0; j < height; j++) { for (int i = 0; i < width; i++) { diff --git a/src/java/org/apache/poi/ss/formula/functions/Days360.java b/src/java/org/apache/poi/ss/formula/functions/Days360.java index 025c28bcdb..6a5dabcf49 100644 --- a/src/java/org/apache/poi/ss/formula/functions/Days360.java +++ b/src/java/org/apache/poi/ss/formula/functions/Days360.java @@ -92,8 +92,8 @@ public class Days360 extends Var2or3ArgFunction { private static double evaluate(double d0, double d1, boolean method) { Calendar realStart = getDate(d0); Calendar realEnd = getDate(d1); - int startingDate[] = getStartingDate(realStart, method); - int endingDate[] = getEndingDate(realEnd, startingDate, method); + int[] startingDate = getStartingDate(realStart, method); + int[] endingDate = getEndingDate(realEnd, startingDate, method); return (endingDate[0]*360+endingDate[1]*30+endingDate[2])- (startingDate[0]*360+startingDate[1]*30+startingDate[2]); @@ -115,7 +115,7 @@ public class Days360 extends Var2or3ArgFunction { return new int[]{yyyy,mm,dd}; } - private static int[] getEndingDate(Calendar realEnd, int startingDate[], boolean method) { + private static int[] getEndingDate(Calendar realEnd, int[] startingDate, boolean method) { int yyyy = realEnd.get(Calendar.YEAR); int mm = realEnd.get(Calendar.MONTH); int dd = Math.min(30, realEnd.get(Calendar.DAY_OF_MONTH)); diff --git a/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java b/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java index b6c8aba976..4159ddcd98 100644 --- a/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java +++ b/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java @@ -96,12 +96,13 @@ public abstract class MatrixFunction implements Function{ @Override public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0) { if (arg0 instanceof AreaEval) { - double result[], resultArray[][]; + double[] result; + double[][] resultArray; int width, height; try { - double values[] = collectValues(arg0); - double array[][] = fillDoubleArray(values,((AreaEval) arg0).getHeight(),((AreaEval) arg0).getWidth()); + double[] values = collectValues(arg0); + double[][] array = fillDoubleArray(values, ((AreaEval) arg0).getHeight(), ((AreaEval) arg0).getWidth()); resultArray = evaluate(array); width = resultArray[0].length; height = resultArray.length; @@ -112,8 +113,8 @@ public abstract class MatrixFunction implements Function{ catch(EvaluationException e){ return e.getErrorEval(); } - - ValueEval vals[] = new ValueEval[result.length]; + + ValueEval[] vals = new ValueEval[result.length]; for (int idx = 0; idx < result.length; idx++) { vals[idx] = new NumberEval(result[idx]); @@ -130,10 +131,10 @@ public abstract class MatrixFunction implements Function{ } } else { - double result[][]; + double[][] result; try { double value = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex); - double temp[][] = {{value}}; + double[][] temp = {{value}}; result = evaluate(temp); NumericFunction.checkValue(result[0][0]); } @@ -156,15 +157,17 @@ public abstract class MatrixFunction implements Function{ @Override public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval arg0, ValueEval arg1) { - double result[]; + double[] result; int width, height; try { - double array0[][], array1[][], resultArray[][]; - + double[][] array0; + double[][] array1; + double[][] resultArray; + if (arg0 instanceof AreaEval) { try { - double values[] = collectValues(arg0); + double[] values = collectValues(arg0); array0 = fillDoubleArray(values, ((AreaEval) arg0).getHeight(), ((AreaEval) arg0).getWidth()); } catch(EvaluationException e) { @@ -183,7 +186,7 @@ public abstract class MatrixFunction implements Function{ if (arg1 instanceof AreaEval) { try { - double values[] = collectValues(arg1); + double[] values = collectValues(arg1); array1 = fillDoubleArray(values, ((AreaEval) arg1).getHeight(),((AreaEval) arg1).getWidth()); } catch (EvaluationException e) { @@ -212,9 +215,9 @@ public abstract class MatrixFunction implements Function{ catch (IllegalArgumentException e) { return ErrorEval.VALUE_INVALID; } - - - ValueEval vals[] = new ValueEval[result.length]; + + + ValueEval[] vals = new ValueEval[result.length]; for (int idx = 0; idx < result.length; idx++) { vals[idx] = new NumberEval(result[idx]); @@ -308,8 +311,8 @@ public abstract class MatrixFunction implements Function{ if (d1.length != d1[0].length) { throw new EvaluationException(ErrorEval.VALUE_INVALID); } - - double result[][] = new double[1][1]; + + double[][] result = new double[1][1]; Array2DRowRealMatrix temp = new Array2DRowRealMatrix(d1); result[0][0] = (new LUDecomposition(temp)).getDeterminant(); return result; @@ -320,7 +323,7 @@ public abstract class MatrixFunction implements Function{ private final MutableValueCollector instance = new MutableValueCollector(false, false); protected double[] collectValues(ValueEval arg) throws EvaluationException { - double values[] = instance.collectValues(arg); + double[] values = instance.collectValues(arg); /* handle case where MMULT is operating on an array that is not completely filled*/ if (arg instanceof AreaEval && values.length == 1) diff --git a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java index 832795a07f..45fa47d3ed 100644 --- a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java +++ b/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java @@ -319,10 +319,10 @@ public class WorkbookFactory { * Uses reflection, so that this class can be in the Core non-OOXML * POI jar without errors / broken references to the OOXML / XSSF code. */ - private static Workbook createWorkbook(String factoryClass, Object args[]) throws IOException, EncryptedDocumentException { + private static Workbook createWorkbook(String factoryClass, Object[] args) throws IOException, EncryptedDocumentException { try { Class clazz = WorkbookFactory.class.getClassLoader().loadClass(factoryClass); - Class argsClz[] = new Class[args.length]; + Class[] argsClz = new Class[args.length]; int i=0; for (Object o : args) { Class c = o.getClass(); diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java index 3bcef4beb4..9dabd2b631 100644 --- a/src/java/org/apache/poi/ss/util/CellUtil.java +++ b/src/java/org/apache/poi/ss/util/CellUtil.java @@ -100,10 +100,9 @@ public final class CellUtil { BORDER_RIGHT, BORDER_TOP ))); - - private static UnicodeMapping unicodeMappings[]; + private static UnicodeMapping[] unicodeMappings; private static final class UnicodeMapping { diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java index 3dd4cb0d57..5372d5bc9c 100644 --- a/src/java/org/apache/poi/util/IOUtils.java +++ b/src/java/org/apache/poi/util/IOUtils.java @@ -86,7 +86,7 @@ public final class IOUtils { if (readBytes < limit) { bos.write(new byte[limit-readBytes]); } - byte peekedBytes[] = bos.toByteArray(); + byte[] peekedBytes = bos.toByteArray(); if(stream instanceof PushbackInputStream) { PushbackInputStream pin = (PushbackInputStream)stream; pin.unread(peekedBytes, 0, readBytes); diff --git a/src/java/org/apache/poi/util/LittleEndianInputStream.java b/src/java/org/apache/poi/util/LittleEndianInputStream.java index 6199c4dd12..9a9652eb32 100644 --- a/src/java/org/apache/poi/util/LittleEndianInputStream.java +++ b/src/java/org/apache/poi/util/LittleEndianInputStream.java @@ -57,7 +57,7 @@ public class LittleEndianInputStream extends FilterInputStream implements Little @Override public int readUByte() { - byte buf[] = new byte[1]; + byte[] buf = new byte[1]; try { checkEOF(read(buf), 1); } catch (IOException e) { @@ -84,7 +84,7 @@ public class LittleEndianInputStream extends FilterInputStream implements Little @Override public int readInt() { - byte buf[] = new byte[LittleEndianConsts.INT_SIZE]; + byte[] buf = new byte[LittleEndianConsts.INT_SIZE]; try { checkEOF(read(buf), buf.length); } catch (IOException e) { @@ -108,7 +108,7 @@ public class LittleEndianInputStream extends FilterInputStream implements Little @Override public long readLong() { - byte buf[] = new byte[LittleEndianConsts.LONG_SIZE]; + byte[] buf = new byte[LittleEndianConsts.LONG_SIZE]; try { checkEOF(read(buf), LittleEndianConsts.LONG_SIZE); } catch (IOException e) { @@ -124,7 +124,7 @@ public class LittleEndianInputStream extends FilterInputStream implements Little @Override public int readUShort() { - byte buf[] = new byte[LittleEndianConsts.SHORT_SIZE]; + byte[] buf = new byte[LittleEndianConsts.SHORT_SIZE]; try { checkEOF(read(buf), LittleEndianConsts.SHORT_SIZE); } catch (IOException e) { diff --git a/src/java/org/apache/poi/util/POILogger.java b/src/java/org/apache/poi/util/POILogger.java index c54c754255..5603b2d074 100644 --- a/src/java/org/apache/poi/util/POILogger.java +++ b/src/java/org/apache/poi/util/POILogger.java @@ -32,10 +32,14 @@ public abstract class POILogger { public static final int ERROR = 7; public static final int FATAL = 9; - /** Short strings for numeric log level. Use level as array index. */ - protected static final String LEVEL_STRINGS_SHORT[] = {"?", "D", "?", "I", "?", "W", "?", "E", "?", "F", "?"}; - /** Long strings for numeric log level. Use level as array index. */ - protected static final String LEVEL_STRINGS[] = {"?0?", "DEBUG", "?2?", "INFO", "?4?", "WARN", "?6?", "ERROR", "?8?", "FATAL", "?10+?"}; + /** + * Short strings for numeric log level. Use level as array index. + */ + protected static final String[] LEVEL_STRINGS_SHORT = {"?", "D", "?", "I", "?", "W", "?", "E", "?", "F", "?"}; + /** + * Long strings for numeric log level. Use level as array index. + */ + protected static final String[] LEVEL_STRINGS = {"?0?", "DEBUG", "?2?", "INFO", "?4?", "WARN", "?6?", "ERROR", "?8?", "FATAL", "?10+?"}; /** diff --git a/src/java/org/apache/poi/util/StringUtil.java b/src/java/org/apache/poi/util/StringUtil.java index 2017abf125..8e23e80eea 100644 --- a/src/java/org/apache/poi/util/StringUtil.java +++ b/src/java/org/apache/poi/util/StringUtil.java @@ -407,7 +407,7 @@ public class StringUtil { } } - private static final int symbolMap_f020[] = { + private static final int[] symbolMap_f020 = { ' ', // 0xf020 space '!', // 0xf021 exclam 8704, // 0xf022 universal @@ -506,7 +506,7 @@ public class StringUtil { ' ', // 0xf07f not defined }; - private static final int symbolMap_f0a0[] = { + private static final int[] symbolMap_f0a0 = { 8364, // 0xf0a0 not defined / euro symbol 978, // 0xf0a1 upsilon1 (upper) 8242, // 0xf0a2 minute diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java index 735408b415..78861db115 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java @@ -64,7 +64,7 @@ public final class StreamHelper { Result outputTarget = new StreamResult(new FilterOutputStream( outStream) { @Override - public void write(byte b[], int off, int len) + public void write(byte[] b, int off, int len) throws IOException { out.write(b, off, len); } diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java index 728bf9849a..af76ffcd9e 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java @@ -75,7 +75,7 @@ public class ZipArchiveThresholdInputStream extends FilterInputStream { } @Override - public int read(byte b[], int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { int cnt = super.read(b, off, len); if (cnt > -1) { checkThreshold(); diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java index 0263790df6..ed6851a1c6 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java @@ -111,7 +111,7 @@ public class AgileDecryptor extends Decryptor implements Cloneable { * blockSize bytes. * 4. Use base64 to encode the result of step 3. */ - byte verfierInputEnc[] = hashInput(ver, pwHash, kVerifierInputBlock, ver.getEncryptedVerifier(), Cipher.DECRYPT_MODE); + byte[] verfierInputEnc = hashInput(ver, pwHash, kVerifierInputBlock, ver.getEncryptedVerifier(), Cipher.DECRYPT_MODE); setVerifier(verfierInputEnc); MessageDigest hashMD = getMessageDigest(ver.getHashAlgorithm()); byte[] verifierHash = hashMD.digest(verfierInputEnc); @@ -128,7 +128,7 @@ public class AgileDecryptor extends Decryptor implements Cloneable { * blockSize bytes, pad the hash value with 0x00 to an integral multiple of blockSize bytes. * 4. Use base64 to encode the result of step 3. */ - byte verifierHashDec[] = hashInput(ver, pwHash, kHashedVerifierBlock, ver.getEncryptedVerifierHash(), Cipher.DECRYPT_MODE); + byte[] verifierHashDec = hashInput(ver, pwHash, kHashedVerifierBlock, ver.getEncryptedVerifierHash(), Cipher.DECRYPT_MODE); verifierHashDec = getBlock0(verifierHashDec, ver.getHashAlgorithm().hashSize); /** @@ -144,7 +144,7 @@ public class AgileDecryptor extends Decryptor implements Cloneable { * blockSize bytes. * 4. Use base64 to encode the result of step 3. */ - byte keyspec[] = hashInput(ver, pwHash, kCryptoKeyBlock, ver.getEncryptedKey(), Cipher.DECRYPT_MODE); + byte[] keyspec = hashInput(ver, pwHash, kCryptoKeyBlock, ver.getEncryptedKey(), Cipher.DECRYPT_MODE); keyspec = getBlock0(keyspec, header.getKeySize()/8); SecretKeySpec secretKey = new SecretKeySpec(keyspec, header.getCipherAlgorithm().jceId); @@ -161,10 +161,10 @@ public class AgileDecryptor extends Decryptor implements Cloneable { * array with 0x00 to the next integral multiple of blockSize bytes. * 4. Assign the encryptedHmacKey attribute to the base64-encoded form of the result of step 3. */ - byte vec[] = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityKeyBlock, blockSize); + byte[] vec = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityKeyBlock, blockSize); CipherAlgorithm cipherAlgo = header.getCipherAlgorithm(); Cipher cipher = getCipher(secretKey, cipherAlgo, header.getChainingMode(), vec, Cipher.DECRYPT_MODE); - byte hmacKey[] = cipher.doFinal(header.getEncryptedHmacKey()); + byte[] hmacKey = cipher.doFinal(header.getEncryptedHmacKey()); hmacKey = getBlock0(hmacKey, header.getHashAlgorithm().hashSize); /** @@ -178,7 +178,7 @@ public class AgileDecryptor extends Decryptor implements Cloneable { */ vec = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityValueBlock, blockSize); cipher = getCipher(secretKey, cipherAlgo, ver.getChainingMode(), vec, Cipher.DECRYPT_MODE); - byte hmacValue[] = cipher.doFinal(header.getEncryptedHmacValue()); + byte[] hmacValue = cipher.doFinal(header.getEncryptedHmacValue()); hmacValue = getBlock0(hmacValue, header.getHashAlgorithm().hashSize); if (Arrays.equals(verifierHashDec, verifierHash)) { @@ -222,21 +222,21 @@ public class AgileDecryptor extends Decryptor implements Cloneable { Cipher cipher = Cipher.getInstance("RSA"); cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate()); - byte keyspec[] = cipher.doFinal(ace.encryptedKey); + byte[] keyspec = cipher.doFinal(ace.encryptedKey); SecretKeySpec secretKey = new SecretKeySpec(keyspec, ver.getCipherAlgorithm().jceId); Mac x509Hmac = CryptoFunctions.getMac(hashAlgo); x509Hmac.init(secretKey); - byte certVerifier[] = x509Hmac.doFinal(ace.x509.getEncoded()); + byte[] certVerifier = x509Hmac.doFinal(ace.x509.getEncoded()); - byte vec[] = CryptoFunctions.generateIv(hashAlgo, header.getKeySalt(), kIntegrityKeyBlock, blockSize); + byte[] vec = CryptoFunctions.generateIv(hashAlgo, header.getKeySalt(), kIntegrityKeyBlock, blockSize); cipher = getCipher(secretKey, cipherAlgo, header.getChainingMode(), vec, Cipher.DECRYPT_MODE); - byte hmacKey[] = cipher.doFinal(header.getEncryptedHmacKey()); + byte[] hmacKey = cipher.doFinal(header.getEncryptedHmacKey()); hmacKey = getBlock0(hmacKey, hashAlgo.hashSize); vec = CryptoFunctions.generateIv(hashAlgo, header.getKeySalt(), kIntegrityValueBlock, blockSize); cipher = getCipher(secretKey, cipherAlgo, header.getChainingMode(), vec, Cipher.DECRYPT_MODE); - byte hmacValue[] = cipher.doFinal(header.getEncryptedHmacValue()); + byte[] hmacValue = cipher.doFinal(header.getEncryptedHmacValue()); hmacValue = getBlock0(hmacValue, hashAlgo.hashSize); @@ -256,14 +256,14 @@ public class AgileDecryptor extends Decryptor implements Cloneable { return fillSize; } - /* package */ static byte[] hashInput(AgileEncryptionVerifier ver, byte pwHash[], byte blockKey[], byte inputKey[], int cipherMode) { + /* package */ static byte[] hashInput(AgileEncryptionVerifier ver, byte[] pwHash, byte[] blockKey, byte[] inputKey, int cipherMode) { CipherAlgorithm cipherAlgo = ver.getCipherAlgorithm(); ChainingMode chainMode = ver.getChainingMode(); int keySize = ver.getKeySize()/8; int blockSize = ver.getBlockSize(); HashAlgorithm hashAlgo = ver.getHashAlgorithm(); - - byte intermedKey[] = generateKey(pwHash, hashAlgo, blockKey, keySize); + + byte[] intermedKey = generateKey(pwHash, hashAlgo, blockKey, keySize); SecretKey skey = new SecretKeySpec(intermedKey, cipherAlgo.jceId); byte[] iv = generateIv(hashAlgo, ver.getSalt(), null, blockSize); Cipher cipher = getCipher(skey, cipherAlgo, chainMode, iv, cipherMode); diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java index 9b8c56ad83..ed058d1df0 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java @@ -28,7 +28,8 @@ import com.microsoft.schemas.office.x2006.encryption.EncryptionDocument; import com.microsoft.schemas.office.x2006.encryption.STCipherChaining; public class AgileEncryptionHeader extends EncryptionHeader implements Cloneable { - private byte encryptedHmacKey[], encryptedHmacValue[]; + private byte[] encryptedHmacKey; + private byte[] encryptedHmacValue; public AgileEncryptionHeader(String descriptor) { this(AgileEncryptionInfoBuilder.parseDescriptor(descriptor)); @@ -100,7 +101,7 @@ public class AgileEncryptionHeader extends EncryptionHeader implements Cloneable // make method visible for this package @Override - protected void setKeySalt(byte salt[]) { + protected void setKeySalt(byte[] salt) { if (salt == null || salt.length != getBlockSize()) { throw new EncryptedDocumentException("invalid verifier salt"); } diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java index 82eb138171..2e8ba70166 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java @@ -43,8 +43,8 @@ public class AgileEncryptionVerifier extends EncryptionVerifier implements Clone public static class AgileCertificateEntry { X509Certificate x509; - byte encryptedKey[]; - byte certVerifier[]; + byte[] encryptedKey; + byte[] certVerifier; } private List certList = new ArrayList<>(); @@ -137,7 +137,7 @@ public class AgileEncryptionVerifier extends EncryptionVerifier implements Clone } @Override - protected void setSalt(byte salt[]) { + protected void setSalt(byte[] salt) { if (salt == null || salt.length != getCipherAlgorithm().blockSize) { throw new EncryptedDocumentException("invalid verifier salt"); } @@ -146,13 +146,13 @@ public class AgileEncryptionVerifier extends EncryptionVerifier implements Clone // make method visible for this package @Override - protected void setEncryptedVerifier(byte encryptedVerifier[]) { + protected void setEncryptedVerifier(byte[] encryptedVerifier) { super.setEncryptedVerifier(encryptedVerifier); } // make method visible for this package @Override - protected void setEncryptedVerifierHash(byte encryptedVerifierHash[]) { + protected void setEncryptedVerifierHash(byte[] encryptedVerifierHash) { super.setEncryptedVerifierHash(encryptedVerifierHash); } diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java index 3ff47e3e8a..dbdd5c0a14 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java @@ -81,8 +81,8 @@ public class AgileEncryptor extends Encryptor implements Cloneable { //arbitrarily selected; may need to increase private static final int MAX_RECORD_LENGTH = 1_000_000; - private byte integritySalt[]; - private byte pwHash[]; + private byte[] integritySalt; + private byte[] pwHash; protected AgileEncryptor() { } @@ -111,7 +111,7 @@ public class AgileEncryptor extends Encryptor implements Cloneable { } @Override - public void confirmPassword(String password, byte keySpec[], byte keySalt[], byte verifier[], byte verifierSalt[], byte integritySalt[]) { + public void confirmPassword(String password, byte[] keySpec, byte[] keySalt, byte[] verifier, byte[] verifierSalt, byte[] integritySalt) { AgileEncryptionVerifier ver = (AgileEncryptionVerifier)getEncryptionInfo().getVerifier(); AgileEncryptionHeader header = (AgileEncryptionHeader)getEncryptionInfo().getHeader(); @@ -135,7 +135,7 @@ public class AgileEncryptor extends Encryptor implements Cloneable { * blockSize bytes. * 4. Use base64 to encode the result of step 3. */ - byte encryptedVerifier[] = hashInput(ver, pwHash, kVerifierInputBlock, verifier, Cipher.ENCRYPT_MODE); + byte[] encryptedVerifier = hashInput(ver, pwHash, kVerifierInputBlock, verifier, Cipher.ENCRYPT_MODE); ver.setEncryptedVerifier(encryptedVerifier); @@ -153,7 +153,7 @@ public class AgileEncryptor extends Encryptor implements Cloneable { */ MessageDigest hashMD = getMessageDigest(ver.getHashAlgorithm()); byte[] hashedVerifier = hashMD.digest(verifier); - byte encryptedVerifierHash[] = hashInput(ver, pwHash, kHashedVerifierBlock, hashedVerifier, Cipher.ENCRYPT_MODE); + byte[] encryptedVerifierHash = hashInput(ver, pwHash, kHashedVerifierBlock, hashedVerifier, Cipher.ENCRYPT_MODE); ver.setEncryptedVerifierHash(encryptedVerifierHash); /** @@ -169,7 +169,7 @@ public class AgileEncryptor extends Encryptor implements Cloneable { * blockSize bytes. * 4. Use base64 to encode the result of step 3. */ - byte encryptedKey[] = hashInput(ver, pwHash, kCryptoKeyBlock, keySpec, Cipher.ENCRYPT_MODE); + byte[] encryptedKey = hashInput(ver, pwHash, kCryptoKeyBlock, keySpec, Cipher.ENCRYPT_MODE); ver.setEncryptedKey(encryptedKey); SecretKey secretKey = new SecretKeySpec(keySpec, header.getCipherAlgorithm().jceId); @@ -202,10 +202,10 @@ public class AgileEncryptor extends Encryptor implements Cloneable { this.integritySalt = integritySalt.clone(); try { - byte vec[] = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityKeyBlock, header.getBlockSize()); + byte[] vec = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityKeyBlock, header.getBlockSize()); Cipher cipher = getCipher(secretKey, header.getCipherAlgorithm(), header.getChainingMode(), vec, Cipher.ENCRYPT_MODE); - byte hmacKey[] = getBlock0(this.integritySalt, getNextBlockSize(this.integritySalt.length, blockSize)); - byte encryptedHmacKey[] = cipher.doFinal(hmacKey); + byte[] hmacKey = getBlock0(this.integritySalt, getNextBlockSize(this.integritySalt.length, blockSize)); + byte[] encryptedHmacKey = cipher.doFinal(hmacKey); header.setEncryptedHmacKey(encryptedHmacKey); cipher = Cipher.getInstance("RSA"); @@ -245,10 +245,10 @@ public class AgileEncryptor extends Encryptor implements Cloneable { int blockSize = header.getBlockSize(); HashAlgorithm hashAlgo = header.getHashAlgorithm(); Mac integrityMD = CryptoFunctions.getMac(hashAlgo); - byte hmacKey[] = getBlock0(this.integritySalt, getNextBlockSize(this.integritySalt.length, blockSize)); + byte[] hmacKey = getBlock0(this.integritySalt, getNextBlockSize(this.integritySalt.length, blockSize)); integrityMD.init(new SecretKeySpec(hmacKey, hashAlgo.jceHmacId)); - byte buf[] = new byte[1024]; + byte[] buf = new byte[1024]; LittleEndian.putLong(buf, 0, oleStreamSize); integrityMD.update(buf, 0, LittleEndianConsts.LONG_SIZE); @@ -261,13 +261,13 @@ public class AgileEncryptor extends Encryptor implements Cloneable { } finally { fis.close(); } - - byte hmacValue[] = integrityMD.doFinal(); - byte hmacValueFilled[] = getBlock0(hmacValue, getNextBlockSize(hmacValue.length, blockSize)); - - byte iv[] = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityValueBlock, blockSize); + + byte[] hmacValue = integrityMD.doFinal(); + byte[] hmacValueFilled = getBlock0(hmacValue, getNextBlockSize(hmacValue.length, blockSize)); + + byte[] iv = CryptoFunctions.generateIv(header.getHashAlgorithm(), header.getKeySalt(), kIntegrityValueBlock, blockSize); Cipher cipher = CryptoFunctions.getCipher(getSecretKey(), header.getCipherAlgorithm(), header.getChainingMode(), iv, Cipher.ENCRYPT_MODE); - byte encryptedHmacValue[] = cipher.doFinal(hmacValueFilled); + byte[] encryptedHmacValue = cipher.doFinal(hmacValueFilled); header.setEncryptedHmacValue(encryptedHmacValue); } diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java index 0977a403a1..0fcacaf376 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java @@ -950,12 +950,12 @@ public class SignatureConfig { public Provider getProvider() { Provider prov = provider.get(); if (prov == null) { - String dsigProviderNames[] = { - System.getProperty("jsr105Provider"), - // Santuario xmlsec - "org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI", - // JDK xmlsec - "org.jcp.xml.dsig.internal.dom.XMLDSigRI" + String[] dsigProviderNames = { + System.getProperty("jsr105Provider"), + // Santuario xmlsec + "org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI", + // JDK xmlsec + "org.jcp.xml.dsig.internal.dom.XMLDSigRI" }; for (String pn : dsigProviderNames) { if (pn == null) { diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java index a6ce4226ae..29852f0044 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java @@ -113,18 +113,18 @@ public abstract class SignatureFacet implements SignatureConfigurable { } } - protected Reference newReference(String uri, List transforms, String type, String id, byte digestValue[]) + protected Reference newReference(String uri, List transforms, String type, String id, byte[] digestValue) throws XMLSignatureException { return newReference(uri, transforms, type, id, digestValue, signatureConfig); } public static Reference newReference( - String uri + String uri , List transforms , String type , String id - , byte digestValue[] - , SignatureConfig signatureConfig) + , byte[] digestValue + , SignatureConfig signatureConfig) throws XMLSignatureException { // the references appear in the package signature or the package object // so we can use the default digest algorithm diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java index af6fa199b2..e00de87b7c 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java @@ -233,7 +233,7 @@ public class XAdESXLSignatureFacet extends SignatureFacet { DERTaggedObject derTaggedObject = (DERTaggedObject)ocspResponderId.toASN1Primitive(); if (2 == derTaggedObject.getTagNo()) { ASN1OctetString keyHashOctetString = (ASN1OctetString)derTaggedObject.getObject(); - byte key[] = keyHashOctetString.getOctets(); + byte[] key = keyHashOctetString.getOctets(); responderId.setByKey(key); } else { X500Name name = X500Name.getInstance(derTaggedObject.getObject()); diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java index 45f9b4b730..fefae87a89 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java @@ -139,7 +139,7 @@ public class RelationshipTransformService extends TransformService { try { TransformDocument transDoc = TransformDocument.Factory.parse(parentNode, DEFAULT_XML_OPTIONS); - XmlObject xoList[] = transDoc.getTransform().selectChildren(RelationshipReferenceDocument.type.getDocumentElementName()); + XmlObject[] xoList = transDoc.getTransform().selectChildren(RelationshipReferenceDocument.type.getDocumentElementName()); if (xoList.length == 0) { LOG.log(POILogger.WARN, "no RelationshipReference/@SourceId parameters present"); } diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java b/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java index 8c8523d427..699fbe1fb8 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java @@ -116,7 +116,7 @@ public final class AesZipFileZipEntrySource implements ZipEntrySource { return fileToSource(tmpFile, keyBytes, ivBytes); } - private static void copyToFile(InputStream is, File tmpFile, byte keyBytes[], byte ivBytes[]) throws IOException { + private static void copyToFile(InputStream is, File tmpFile, byte[] keyBytes, byte[] ivBytes) throws IOException { SecretKeySpec skeySpec = new SecretKeySpec(keyBytes, CipherAlgorithm.aes128.jceId); Cipher ciEnc = CryptoFunctions.getCipher(skeySpec, CipherAlgorithm.aes128, ChainingMode.cbc, ivBytes, Cipher.ENCRYPT_MODE, PADDING); @@ -150,7 +150,7 @@ public final class AesZipFileZipEntrySource implements ZipEntrySource { zis.close(); } - private static AesZipFileZipEntrySource fileToSource(File tmpFile, byte keyBytes[], byte ivBytes[]) throws IOException { + private static AesZipFileZipEntrySource fileToSource(File tmpFile, byte[] keyBytes, byte[] ivBytes) throws IOException { SecretKeySpec skeySpec = new SecretKeySpec(keyBytes, CipherAlgorithm.aes128.jceId); Cipher ciDec = CryptoFunctions.getCipher(skeySpec, CipherAlgorithm.aes128, ChainingMode.cbc, ivBytes, Cipher.DECRYPT_MODE, PADDING); return new AesZipFileZipEntrySource(tmpFile, ciDec); diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java index c5e47415df..d596993fe8 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java @@ -288,7 +288,7 @@ public class XMLSlideShow extends POIXMLDocument XSLFSlideLayout layout = sm.getLayout(SlideLayout.BLANK); if (layout == null) { LOG.log(POILogger.WARN, "Blank layout was not found - defaulting to first slide layout in master"); - XSLFSlideLayout sl[] = sm.getSlideLayouts(); + XSLFSlideLayout[] sl = sm.getSlideLayouts(); if (sl.length == 0) { throw new POIXMLException("SlideMaster must contain a SlideLayout."); } @@ -580,7 +580,7 @@ public class XMLSlideShow extends POIXMLDocument @Override public XSLFPictureData findPictureData(byte[] pictureData) { long checksum = IOUtils.calculateChecksum(pictureData); - byte cs[] = new byte[LittleEndianConsts.LONG_SIZE]; + byte[] cs = new byte[LittleEndianConsts.LONG_SIZE]; LittleEndian.putLong(cs, 0, checksum); for (XSLFPictureData pic : getPictureData()) { diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java index 50b82df3b0..95fc4a1386 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java @@ -233,7 +233,7 @@ public class XSLFColor { // sRGB has a gamma of 2.2 CTSRgbColor rgb = fill.addNewSrgbClr(); - byte rgbBytes[] = { (byte)color.getRed(), (byte)color.getGreen(), (byte)color.getBlue() }; + byte[] rgbBytes = {(byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()}; rgb.setVal(rgbBytes); alphaPct = (addAlpha) ? rgb.addNewAlpha() : null; } else { diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java index 56195584e4..e807ab2f0c 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java @@ -43,7 +43,7 @@ public class XSLFMetroShape { /* * parses the metro bytes to a XSLF shape */ - public static Shape parseShape(byte metroBytes[]) + public static Shape parseShape(byte[] metroBytes) throws InvalidFormatException, IOException, XmlException { PackagePartName shapePN = PackagingURIHelper.createPartName("/drs/shapexml.xml"); OPCPackage pkg = null; diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java index b95b8ed356..11f94477f3 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java @@ -114,7 +114,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture @Override public byte[] getChecksum() { cacheProperties(); - byte cs[] = new byte[LittleEndianConsts.LONG_SIZE]; + byte[] cs = new byte[LittleEndianConsts.LONG_SIZE]; LittleEndian.putLong(cs,0,checksum); return cs; } @@ -139,7 +139,7 @@ public final class XSLFPictureData extends POIXMLDocumentPart implements Picture */ protected void cacheProperties() { if (origSize == null || checksum == null) { - byte data[] = getData(); + byte[] data = getData(); checksum = IOUtils.calculateChecksum(data); PictureType pt = getType(); diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java index aded851db5..a11b62abb3 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java @@ -439,8 +439,8 @@ public abstract class XSLFShape implements Shape { return Integer.compare(pos1, pos2); }); - final ColorStyle cs[] = new ColorStyle[gs.length]; - final float fractions[] = new float[gs.length]; + final ColorStyle[] cs = new ColorStyle[gs.length]; + final float[] fractions = new float[gs.length]; int i=0; for (CTGradientStop cgs : gs) { diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java index 52d8780989..1de2b1bea8 100644 --- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java +++ b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java @@ -179,7 +179,7 @@ public class PPTX2PNG { } } else { for (String subrange : range.split(",")) { - String idx[] = subrange.split("-"); + String[] idx = subrange.split("-"); switch (idx.length) { default: case 0: break; diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java index dccc9c552b..1e305b4b85 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java @@ -66,8 +66,8 @@ public final class XSSFPasswordHelper { cur.insertAttributeWithValue(getAttrName(prefix, "password"), String.format(Locale.ROOT, "%04X", hash).toUpperCase(Locale.ROOT)); } else { - SecureRandom random = new SecureRandom(); - byte salt[] = random.generateSeed(16); + SecureRandom random = new SecureRandom(); + byte[] salt = random.generateSeed(16); // Iterations specifies the number of times the hashing function shall be iteratively run (using each // iteration's result as the input for the next iteration). @@ -76,7 +76,7 @@ public final class XSSFPasswordHelper { // Implementation Notes List: // --> In this third stage, the reversed byte order legacy hash from the second stage shall // be converted to Unicode hex string representation - byte hash[] = CryptoFunctions.hashPassword(password, hashAlgo, salt, spinCount, false); + byte[] hash = CryptoFunctions.hashPassword(password, hashAlgo, salt, spinCount, false); cur.insertAttributeWithValue(getAttrName(prefix, "algorithmName"), hashAlgo.jceId); cur.insertAttributeWithValue(getAttrName(prefix, "hashValue"), DatatypeConverter.printBase64Binary(hash)); @@ -117,12 +117,12 @@ public final class XSSFPasswordHelper { if (hashVal == null || algoName == null || saltVal == null || spinCount == null) { return false; } - - byte hash1[] = DatatypeConverter.parseBase64Binary(hashVal); + + byte[] hash1 = DatatypeConverter.parseBase64Binary(hashVal); HashAlgorithm hashAlgo = HashAlgorithm.fromString(algoName); - byte salt[] = DatatypeConverter.parseBase64Binary(saltVal); + byte[] salt = DatatypeConverter.parseBase64Binary(saltVal); int spinCnt = Integer.parseInt(spinCount); - byte hash2[] = CryptoFunctions.hashPassword(password, hashAlgo, salt, spinCnt, false); + byte[] hash2 = CryptoFunctions.hashPassword(password, hashAlgo, salt, spinCnt, false); return Arrays.equals(hash1, hash2); } } diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java index f40e283968..39a8444b8b 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java @@ -270,7 +270,7 @@ public class XWPFSettings extends POIXMLDocumentPart { SecureRandom random = new SecureRandom(); - byte salt[] = random.generateSeed(16); + byte[] salt = random.generateSeed(16); // Iterations specifies the number of times the hashing function shall be iteratively run (using each // iteration's result as the input for the next iteration). @@ -280,7 +280,7 @@ public class XWPFSettings extends POIXMLDocumentPart { // Implementation Notes List: // --> In this third stage, the reversed byte order legacy hash from the second stage shall // be converted to Unicode hex string representation - byte hash[] = CryptoFunctions.hashPassword(legacyHash, hashAlgo, salt, spinCount, false); + byte[] hash = CryptoFunctions.hashPassword(legacyHash, hashAlgo, salt, spinCount, false); safeGetDocumentProtection().setSalt(salt); safeGetDocumentProtection().setHash(hash); @@ -300,8 +300,8 @@ public class XWPFSettings extends POIXMLDocumentPart { */ public boolean validateProtectionPassword(String password) { BigInteger sid = safeGetDocumentProtection().getCryptAlgorithmSid(); - byte hash[] = safeGetDocumentProtection().getHash(); - byte salt[] = safeGetDocumentProtection().getSalt(); + byte[] hash = safeGetDocumentProtection().getHash(); + byte[] salt = safeGetDocumentProtection().getSalt(); BigInteger spinCount = safeGetDocumentProtection().getCryptSpinCount(); if (sid == null || hash == null || salt == null || spinCount == null) return false; @@ -337,7 +337,7 @@ public class XWPFSettings extends POIXMLDocumentPart { // Implementation Notes List: // --> In this third stage, the reversed byte order legacy hash from the second stage shall // be converted to Unicode hex string representation - byte hash2[] = CryptoFunctions.hashPassword(legacyHash, hashAlgo, salt, spinCount.intValue(), false); + byte[] hash2 = CryptoFunctions.hashPassword(legacyHash, hashAlgo, salt, spinCount.intValue(), false); return Arrays.equals(hash, hash2); } diff --git a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java b/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java index 89f8053252..5a5ac39ffa 100644 --- a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java +++ b/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java @@ -45,13 +45,13 @@ public class TestDetectAsOOXML { @Test public void testDetectAsPOIFS() throws IOException { - Object fileAndMagic[][] = { - { "SampleSS.xlsx", FileMagic.OOXML }, - { "SampleSS.xls", FileMagic.OLE2 }, - { "SampleSS.txt", FileMagic.UNKNOWN } - }; + Object[][] fileAndMagic = { + {"SampleSS.xlsx", FileMagic.OOXML}, + {"SampleSS.xls", FileMagic.OLE2}, + {"SampleSS.txt", FileMagic.UNKNOWN} + }; - for (Object fm[] : fileAndMagic) { + for (Object[] fm : fileAndMagic) { InputStream is = HSSFTestDataSamples.openSampleFileStream((String)fm[0]); is = FileMagic.prepareToCheckMagic(is); FileMagic act = FileMagic.valueOf(is); diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java b/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java index 393e474468..446b33ec0c 100644 --- a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java +++ b/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java @@ -360,7 +360,7 @@ public final class TestPOIXMLDocument { UncaughtHandler uh = new UncaughtHandler(); // check schema type loading and check if we could run in an OOM - Thread ta[] = new Thread[30]; + Thread[] ta = new Thread[30]; for (int j=0; j<10; j++) { for (int i=0; i fileHashes = new HashSet<>(); public LoggingTransformer(String agentArgs) { - String args[] = (agentArgs == null ? "" : agentArgs).split("\\|",2); + String[] args = (agentArgs == null ? "" : agentArgs).split("\\|", 2); path = Paths.get(args.length >= 1 ? args[0] : "ooxml-lite.out"); includes = Pattern.compile(args.length >= 2 ? args[1] : ".*/schemas/.*"); diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java index 66a7630518..3305a7e2dc 100644 --- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java +++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java @@ -804,7 +804,7 @@ public final class TestPackage { IOUtils.copy(is, bos2); long size = bos2.size() - "".length(); append.write(bos2.toByteArray(), 0, (int) size); - byte spam[] = new byte[0x7FFF]; + byte[] spam = new byte[0x7FFF]; Arrays.fill(spam, (byte) ' '); // 0x7FFF0000 is the maximum for 32-bit zips, but less still works while (size < 0x7FFF00) { @@ -979,12 +979,12 @@ public final class TestPackage { public void testTooShortFilterStreams() throws IOException { File xssf = OpenXML4JTestDataSamples.getSampleFile("sample.xlsx"); File hssf = POIDataSamples.getSpreadSheetInstance().getFile("SampleSS.xls"); - - InputStream isList[] = { - new PushbackInputStream(new FileInputStream(xssf), 2), - new BufferedInputStream(new FileInputStream(xssf), 2), - new PushbackInputStream(new FileInputStream(hssf), 2), - new BufferedInputStream(new FileInputStream(hssf), 2), + + InputStream[] isList = { + new PushbackInputStream(new FileInputStream(xssf), 2), + new BufferedInputStream(new FileInputStream(xssf), 2), + new PushbackInputStream(new FileInputStream(hssf), 2), + new BufferedInputStream(new FileInputStream(hssf), 2), }; try { diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java index 691f0b1b98..40b703c93b 100644 --- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java +++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java @@ -56,7 +56,7 @@ public class TestRelationships extends TestCase { PackageRelationshipCollection rels = pkg.getRelationshipsByType(PackageRelationshipTypes.CORE_DOCUMENT); PackageRelationship coreDocRelationship = rels.getRelationship(0); PackagePart corePart = pkg.getPart(coreDocRelationship); - String relIds[] = { "rId1", "rId2", "rId3" }; + String[] relIds = {"rId1", "rId2", "rId3"}; for (String relId : relIds) { PackageRelationship rel = corePart.getRelationship(relId); assertNotNull(rel); diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java index 28abec4a2e..6c8cc16686 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestAgileEncryptionParameters.java @@ -43,7 +43,7 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) public class TestAgileEncryptionParameters { - static byte testData[]; + static byte[] testData; @Parameter(value = 0) public CipherAlgorithm ca; @@ -54,9 +54,9 @@ public class TestAgileEncryptionParameters { @Parameters(name="{0} {1} {2}") public static Collection 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 data = new ArrayList<>(); for (CipherAlgorithm ca : caList) { @@ -101,7 +101,7 @@ public class TestAgileEncryptionParameters { 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); diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java index 5495d7a80a..f556513ed0 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java @@ -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)); diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java index 242c83c98d..3979518e05 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestDecryptor.java @@ -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); diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java index eb50408f1e..f9176187da 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestEncryptor.java @@ -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( diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java index 0b3525ee1b..8a3fa772a9 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java @@ -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 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"); diff --git a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java index 39de26a073..91751e96d0 100644 --- a/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java +++ b/src/ooxml/testcases/org/apache/poi/sl/TestFonts.java @@ -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 = { diff --git a/src/ooxml/testcases/org/apache/poi/sl/TestTable.java b/src/ooxml/testcases/org/apache/poi/sl/TestTable.java index 4b2a1b191e..7c040475fd 100644 --- a/src/ooxml/testcases/org/apache/poi/sl/TestTable.java +++ b/src/ooxml/testcases/org/apache/poi/sl/TestTable.java @@ -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); diff --git a/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java b/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java index 377e770e2e..3f5a1c0a29 100644 --- a/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java +++ b/src/ooxml/testcases/org/apache/poi/ss/extractor/TestEmbeddedExtractor.java @@ -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 diff --git a/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java b/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java index 16d0b0b8c4..ec5166812a 100644 --- a/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java +++ b/src/ooxml/testcases/org/apache/poi/ss/usermodel/TestEmbedOLEPackage.java @@ -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 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); diff --git a/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java b/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java index e154adcdc5..5b6e18ce4d 100644 --- a/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java +++ b/src/ooxml/testcases/org/apache/poi/util/TestTempFileThreaded.java @@ -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) { diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java index 8dbc8ca23e..8867d69403 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java @@ -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); } diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java index 226368d149..949e1951cb 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java @@ -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); diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java index f599a219c9..247f8d8799 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java @@ -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)); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java index 5b48b34584..2f0ece2420 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java @@ -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 diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java index de4348c9d5..aa0045f809 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java @@ -470,13 +470,13 @@ public final class TestSXSSFWorkbook extends BaseTestXWorkbook { 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); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java index bfbd21fe0a..bc058c8f20 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java @@ -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); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index 9a3d700fce..60a8f12ef0 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -1581,10 +1581,10 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { 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 { diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java index b8dbd36a71..b3025e54a5 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java @@ -177,7 +177,7 @@ public class TestXSSFVMLDrawing { Pattern p = Pattern.compile("
"); 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); diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java index a77eedc999..3e293a6268 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java @@ -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"); diff --git a/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java b/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java index 5c34886fb6..f7f7570e4c 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java +++ b/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java @@ -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); diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java b/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java index 327e1be57f..111f9e5e30 100644 --- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java +++ b/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java @@ -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 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 HPBFPart { 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 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'}; } diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java index 6eee90f857..0d9664ba97 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java @@ -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] "); diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java index cf7343a42f..e60d1e7691 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java @@ -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; diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java index ffd3cc1083..17a7c1bdf7 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java +++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java @@ -29,7 +29,7 @@ import org.apache.poi.sl.usermodel.PictureData.PictureType; * 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 "); diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java index dc12c218ec..dc2ecc776a 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java +++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java @@ -55,7 +55,7 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor { /** * 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] "); diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java index dd810b26cc..d53f0db56c 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java +++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java @@ -61,7 +61,7 @@ public final class QuickButCruddyTextExtractor { * 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:"); diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java index 0b28c76f07..741862b5f7 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java @@ -69,7 +69,7 @@ public class HSLFMetroShape> { */ @SuppressWarnings("unchecked") public T getShape() { - byte metroBytes[] = getMetroBytes(); + byte[] metroBytes = getMetroBytes(); if (metroBytes == null) { return null; } diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java index 282b7791e9..dca666903b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java @@ -55,7 +55,7 @@ public class HSLFTabStopPropCollection extends TextProp { * @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))); } diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java index 488893cd71..7637408326 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java @@ -112,7 +112,7 @@ public final class DocumentEncryptionAtom extends PositionDependentRecordAtom { 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()); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java index f6094950c0..546caa7e44 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java @@ -58,7 +58,7 @@ public class HSLFEscherClientDataRecord extends EscherClientDataRecord { @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 extends EscherClientDataRecord { 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); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java index 22c5b2ad1f..f2e7c05ce0 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java @@ -189,7 +189,7 @@ public final class PersistPtrHolder extends PositionDependentRecordAtom @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 me : orderedSlideLocations.entrySet()) { diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java index f13cd756ad..f07542ee06 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java @@ -201,8 +201,8 @@ public class SSSlideInfoAtom extends RecordAtom { 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); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java index 0c1fc32e0e..096e35c89b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java @@ -398,8 +398,8 @@ public final class StyleTextPropAtom extends RecordAtom { } 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) ); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java index c732f39c7b..d506f48282 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java @@ -135,7 +135,7 @@ public final class TextSpecInfoAtom extends RecordAtom { 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 0; out.write(bufB); } else if (valO instanceof Integer) { diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java index f1f2c22406..c10daef5e9 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java @@ -382,8 +382,8 @@ public abstract class HSLFShape implements Shape { 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) { diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java index 2f0a116d68..de90334840 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java @@ -1020,7 +1020,7 @@ public final class HSLFSlideShow implements SlideShow 0) { System.arraycopy(records, 0, newRecords, 0, ptrIdx); } diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java index e9df925d0a..6271002037 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java @@ -157,7 +157,7 @@ implements HSLFShapeContainer, TableShape { super.afterInsert(sh); Set 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, TableShape { 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, TableShape { } 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); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java index 5b9bdfa5bc..e6a271da63 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java @@ -284,7 +284,7 @@ public final class HSLFTextParagraph implements TextParagraph 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 implements TextParagraph { 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 diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java b/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java index 2f9811fc63..05f5d200be 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java @@ -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. diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java index a800bb0e05..1632525d8e 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java @@ -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'; diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java index a1de4dca46..0d00934530 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java @@ -182,7 +182,7 @@ public class HwmfEscape implements HwmfRecord { /** * An array of bytes of size ByteCount. */ - private byte escapeData[]; + private byte[] escapeData; @Override public HwmfRecordType getWmfRecordType() { diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java index 4413983ef3..621fa6a095 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java @@ -502,7 +502,9 @@ public class HwmfFont implements FontInfo { } 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; diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java index 4ae792293f..69afe0b44f 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java @@ -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()) { diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java index 391215d657..061f5cfc66 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java @@ -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 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.

diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java index bbf5b9eb15..8759a5c7e6 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java @@ -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() { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java index e7f45c9671..a9555de6b7 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java @@ -640,7 +640,7 @@ public final class HWPFDocument extends HWPFDocumentCore { 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()); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java index 1375a4bf54..a94730ddb3 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java @@ -299,11 +299,11 @@ public abstract class HWPFDocumentCore extends POIDocument { 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 extends POIDocument { 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); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java index ec7ed1ca9d..4a69de63c5 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java @@ -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) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java index 5a557ef84c..990e1b22b8 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java @@ -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]; diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java index 16f40a72f7..6236f32323 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java @@ -57,8 +57,8 @@ public final class TestOleEmbedding { // Placeholder EMFs for clients that don't support the OLE components. List 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); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java index db56e0e775..e03bded11d 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java @@ -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); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java index fdba39d08c..49ac6d39f4 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java @@ -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 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++; diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java index 533d250a92..0927d37edd 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java @@ -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); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java index 9da61bd13e..3cf0c9a100 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java @@ -601,18 +601,18 @@ public final class TestBugs { HSLFAutoShape as = (HSLFAutoShape)ppt.getSlides().get(0).getShapes().get(0); AbstractEscherOptRecord opt = as.getEscherOptRecord(); EscherArrayProperty ep = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__SHADECOLORS); - double exp[][] = { - // r, g, b, position - { 94, 158, 255, 0 }, - { 133, 194, 255, 0.399994 }, - { 196, 214, 235, 0.699997 }, - { 255, 235, 250, 1 } + double[][] exp = { + // r, g, b, position + {94, 158, 255, 0}, + {133, 194, 255, 0.399994}, + {196, 214, 235, 0.699997}, + {255, 235, 250, 1} }; int i = 0; - for (byte data[] : ep) { + for (byte[] data : ep) { EscherColorRef ecr = new EscherColorRef(data, 0, 4); - int rgb[] = ecr.getRGB(); + int[] rgb = ecr.getRGB(); double pos = Units.fixedPointToDouble(LittleEndian.getInt(data, 4)); assertEquals((int)exp[i][0], rgb[0]); assertEquals((int)exp[i][1], rgb[1]); @@ -796,7 +796,7 @@ public final class TestBugs { @Test public void bug58718() throws IOException { - String files[] = { "bug58718_008524.ppt","bug58718_008558.ppt","bug58718_349008.ppt","bug58718_008495.ppt", }; + String[] files = {"bug58718_008524.ppt", "bug58718_008558.ppt", "bug58718_349008.ppt", "bug58718_008495.ppt",}; for (String f : files) { File sample = HSLFTestDataSamples.getSampleFile(f); try (SlideShowExtractor ex = new SlideShowExtractor(SlideShowFactory.create(sample))) { @@ -877,8 +877,8 @@ public final class TestBugs { @Override public void write(int b) throws IOException {} }; - - final boolean found[] = { false }; + + final boolean[] found = {false}; DummyGraphics2d dgfx = new DummyGraphics2d(new PrintStream(nullOutput)){ @Override public void drawString(AttributedCharacterIterator iterator, float x, float y) { diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java index 99c40c3f79..c6ac218b5f 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java @@ -56,13 +56,13 @@ public class TestFontRendering { public void bug55902mixedFontWithChineseCharacters() throws IOException, FontFormatException { // font files need to be downloaded first via // ant test-scratchpad-download-resources - String fontFiles[][] = { - // Calibri is not available on *nix systems, so we need to use another similar free font - { "build/scratchpad-test-resources/Cabin-Regular.ttf", "mapped", "Calibri" }, + String[][] fontFiles = { + // Calibri is not available on *nix systems, so we need to use another similar free font + {"build/scratchpad-test-resources/Cabin-Regular.ttf", "mapped", "Calibri"}, - // use "MS PGothic" if available (Windows only) ... - // for the junit test not all chars are rendered - { "build/scratchpad-test-resources/mona.ttf", "fallback", "Cabin" } + // use "MS PGothic" if available (Windows only) ... + // for the junit test not all chars are rendered + {"build/scratchpad-test-resources/mona.ttf", "fallback", "Cabin"} }; // setup fonts (especially needed, when run under *nix systems) @@ -70,7 +70,7 @@ public class TestFontRendering { Map fontMap = new HashMap<>(); Map fallbackMap = new HashMap<>(); - for (String fontFile[] : fontFiles) { + for (String[] fontFile : fontFiles) { File f = new File(fontFile[0]); assumeTrue("necessary font file "+f.getName()+" not downloaded.", f.exists()); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java index d071f2dbdc..0d9470647f 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java @@ -173,12 +173,12 @@ public final class TestPicture { @Ignore("Just for visual validation - antialiasing is different on various systems") public void bug54541() throws IOException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException { - String files[] = { + String[] files = { // "sample_pptx_grouping_issues.pptx", // "54542_cropped_bitmap.pptx", // "54541_cropped_bitmap.ppt", // "54541_cropped_bitmap2.ppt", - "alterman_security.ppt", + "alterman_security.ppt", // "alterman_security3.pptx", }; diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java index 9a48cb3b0a..12066f99d4 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java @@ -453,8 +453,8 @@ public final class TestTextRun { assertEquals("sdfsdfsdf", rt.get(0).getRawText()); textParas = textParass.get(1); - String texts[] = {"Sdfsdfsdf\r","Dfgdfg\r","Dfgdfgdfg\r","Sdfsdfs\r","Sdfsdf\r"}; - int indents[] = {0,0,0,1,1}; + String[] texts = {"Sdfsdfsdf\r", "Dfgdfg\r", "Dfgdfgdfg\r", "Sdfsdfs\r", "Sdfsdf\r"}; + int[] indents = {0, 0, 0, 1, 1}; int i=0; for (HSLFTextParagraph p : textParas) { assertEquals(texts[i], p.getTextRuns().get(0).getRawText()); @@ -563,7 +563,7 @@ public final class TestTextRun { HSLFSlideShow ppt = HSLFTestDataSamples.getSlideShow("52244.ppt"); HSLFSlide slide = ppt.getSlides().get(0); - int sizes[] = { 36, 24, 12, 32, 12, 12 }; + int[] sizes = {36, 24, 12, 32, 12, 12}; int i=0; for (List textParas : slide.getTextParagraphs()) { diff --git a/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java b/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java index df084cdad3..4a988250fe 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java +++ b/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java @@ -132,7 +132,7 @@ public class TestHwmfParsing { if (pd.getType() != PictureType.WMF) { continue; } - byte wmfData[] = pd.getData(); + byte[] wmfData = pd.getData(); String filename = String.format(Locale.ROOT, "%s-%04d.wmf", basename, wmfIdx); FileOutputStream fos = new FileOutputStream(new File(outdir, filename)); fos.write(wmfData); @@ -156,8 +156,9 @@ public class TestHwmfParsing { File outdir = new File("build/wmf"); outdir.mkdirs(); final String startFile = ""; - File files[] = indir.listFiles(new FileFilter() { + File[] files = indir.listFiles(new FileFilter() { boolean foundStartFile; + @Override public boolean accept(File pathname) { foundStartFile |= startFile.isEmpty() || pathname.getName().contains(startFile); diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java b/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java index 7f8b4d3ed7..6209151876 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java @@ -35,30 +35,30 @@ import org.junit.Test; */ public class TestFieldsTables extends HWPFTestCase { - private static final String EXPECTED[] = { - "[19, 43) - FLD - 0x13; 0x1f\n" + "[43, 54) - FLD - 0x14; 0xff\n" - + "[54, 59) - FLD - 0x15; 0x81\n", + private static final String[] EXPECTED = { + "[19, 43) - FLD - 0x13; 0x1f\n" + "[43, 54) - FLD - 0x14; 0xff\n" + + "[54, 59) - FLD - 0x15; 0x81\n", - "[31, 59) - FLD - 0x13; 0x45\n" + "[59, 61) - FLD - 0x14; 0xff\n" - + "[61, 66) - FLD - 0x15; 0x80\n", + "[31, 59) - FLD - 0x13; 0x45\n" + "[59, 61) - FLD - 0x14; 0xff\n" + + "[61, 66) - FLD - 0x15; 0x80\n", - "[23, 49) - FLD - 0x13; 0x11\n" + "[49, 64) - FLD - 0x14; 0xff\n" - + "[64, 69) - FLD - 0x15; 0x80\n", + "[23, 49) - FLD - 0x13; 0x11\n" + "[49, 64) - FLD - 0x14; 0xff\n" + + "[64, 69) - FLD - 0x15; 0x80\n", - "[18, 42) - FLD - 0x13; 0x21\n" + "[42, 44) - FLD - 0x14; 0xff\n" - + "[44, 47) - FLD - 0x15; 0x81\n" - + "[47, 75) - FLD - 0x13; 0x1d\n" - + "[75, 85) - FLD - 0x14; 0xff\n" - + "[85, 91) - FLD - 0x15; 0x81\n", + "[18, 42) - FLD - 0x13; 0x21\n" + "[42, 44) - FLD - 0x14; 0xff\n" + + "[44, 47) - FLD - 0x15; 0x81\n" + + "[47, 75) - FLD - 0x13; 0x1d\n" + + "[75, 85) - FLD - 0x14; 0xff\n" + + "[85, 91) - FLD - 0x15; 0x81\n", - "[30, 54) - FLD - 0x13; 0x20\n" + "[54, 62) - FLD - 0x14; 0xff\n" - + "[62, 68) - FLD - 0x15; 0x81\n", + "[30, 54) - FLD - 0x13; 0x20\n" + "[54, 62) - FLD - 0x14; 0xff\n" + + "[62, 68) - FLD - 0x15; 0x81\n", - "[1, 31) - FLD - 0x13; 0x15\n" + "[31, 51) - FLD - 0x14; 0xff\n" - + "[51, 541) - FLD - 0x15; 0x81\n", + "[1, 31) - FLD - 0x13; 0x15\n" + "[31, 51) - FLD - 0x14; 0xff\n" + + "[51, 541) - FLD - 0x15; 0x81\n", - "[19, 47) - FLD - 0x13; 0x19\n" + "[47, 49) - FLD - 0x14; 0xff\n" - + "[49, 55) - FLD - 0x15; 0x81\n" + "[19, 47) - FLD - 0x13; 0x19\n" + "[47, 49) - FLD - 0x14; 0xff\n" + + "[49, 55) - FLD - 0x15; 0x81\n" }; @Override diff --git a/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java b/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java index ce8ba23c6e..26ca734f77 100644 --- a/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java +++ b/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java @@ -75,27 +75,27 @@ public class TestVariantSupport { public void newNumberTypes() throws Exception { ClipboardData cd = new ClipboardData(); cd.setValue(new byte[10]); - - Object exp[][] = { - { Variant.VT_CF, cd.toByteArray() }, - { Variant.VT_BOOL, true }, - { Variant.VT_LPSTR, "codepagestring" }, - { Variant.VT_LPWSTR, "widestring" }, - { Variant.VT_I2, -1 }, // int, not short ... :( - { Variant.VT_UI2, 0xFFFF }, - { Variant.VT_I4, -1 }, - { Variant.VT_UI4, 0xFFFFFFFFL }, - { Variant.VT_I8, -1L }, - { Variant.VT_UI8, BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.TEN) }, - { Variant.VT_R4, -999.99f }, - { Variant.VT_R8, -999.99d }, + + Object[][] exp = { + {Variant.VT_CF, cd.toByteArray()}, + {Variant.VT_BOOL, true}, + {Variant.VT_LPSTR, "codepagestring"}, + {Variant.VT_LPWSTR, "widestring"}, + {Variant.VT_I2, -1}, // int, not short ... :( + {Variant.VT_UI2, 0xFFFF}, + {Variant.VT_I4, -1}, + {Variant.VT_UI4, 0xFFFFFFFFL}, + {Variant.VT_I8, -1L}, + {Variant.VT_UI8, BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.TEN)}, + {Variant.VT_R4, -999.99f}, + {Variant.VT_R8, -999.99d}, }; HSSFWorkbook wb = new HSSFWorkbook(); POIFSFileSystem poifs = new POIFSFileSystem(); DocumentSummaryInformation dsi = PropertySetFactory.newDocumentSummaryInformation(); CustomProperties cpList = new CustomProperties(); - for (Object o[] : exp) { + for (Object[] o : exp) { int type = (Integer)o[0]; Property p = new Property(PropertyIDMap.PID_MAX+type, type, o[1]); cpList.put("testprop"+type, new CustomProperty(p, "testprop"+type)); @@ -110,7 +110,7 @@ public class TestVariantSupport { dsi = (DocumentSummaryInformation)PropertySetFactory.create(poifs.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME); cpList = dsi.getCustomProperties(); int i=0; - for (Object o[] : exp) { + for (Object[] o : exp) { Object obj = cpList.get("testprop"+o[0]); if (o[1] instanceof byte[]) { assertArrayEquals("property "+i, (byte[])o[1], (byte[])obj); diff --git a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java b/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java index c1c585db4e..b50d529844 100644 --- a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java +++ b/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java @@ -319,7 +319,7 @@ public final class TestUnicodeString { @Test public void extRstEqualsAndHashCode() { - byte buf[] = new byte[200]; + byte[] buf = new byte[200]; LittleEndianByteArrayOutputStream bos = new LittleEndianByteArrayOutputStream(buf, 0); String str = "\u1d02\u1d12\u1d22"; bos.writeShort(1); diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java index 76095dc231..bf79bcb0d7 100644 --- a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java +++ b/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java @@ -55,7 +55,7 @@ public final class TestExtendedPivotTableViewFieldsRecord extends TestCase { public void testOlderFormat_bug46918() { // There are 10 SXVDEX records in the file (not uploaded) that originated bugzilla 46918 // They all had the following hex encoding: - byte data[] = HexRead.readFromString("00 01 0A 00 1E 14 00 0A FF FF FF FF 00 00"); + byte[] data = HexRead.readFromString("00 01 0A 00 1E 14 00 0A FF FF FF FF 00 00"); RecordInputStream in = TestcaseRecordInputStream.create(data); ExtendedPivotTableViewFieldsRecord rec; @@ -68,8 +68,8 @@ public final class TestExtendedPivotTableViewFieldsRecord extends TestCase { throw e; } - byte expReserData[] = HexRead.readFromString("1E 14 00 0A FF FF FF FF 00 00" + - "FF FF 00 00 00 00 00 00 00 00"); + byte[] expReserData = HexRead.readFromString("1E 14 00 0A FF FF FF FF 00 00" + + "FF FF 00 00 00 00 00 00 00 00"); TestcaseRecordInputStream.confirmRecordEncoding(ExtendedPivotTableViewFieldsRecord.sid, expReserData, rec.serialize()); } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/DummyGraphics2d.java b/src/testcases/org/apache/poi/hssf/usermodel/DummyGraphics2d.java index 093d2083a8..6275fc0d02 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/DummyGraphics2d.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/DummyGraphics2d.java @@ -429,7 +429,7 @@ public class DummyGraphics2d extends Graphics2D { g2D.drawArc( x, y, width, height, startAngle, arcAngle ); } - public void drawBytes(byte data[], int offset, int length, int x, int y) { + public void drawBytes(byte[] data, int offset, int length, int x, int y) { String l = "drawBytes(byte[],int,int,int,int):" + "\n data = " + Arrays.toString(data) + @@ -441,7 +441,7 @@ public class DummyGraphics2d extends Graphics2D { g2D.drawBytes( data, offset, length, x, y ); } - public void drawChars(char data[], int offset, int length, int x, int y) { + public void drawChars(char[] data, int offset, int length, int x, int y) { String l = "drawChars(data,int,int,int,int):" + "\n data = " + Arrays.toString(data) + @@ -568,7 +568,7 @@ public class DummyGraphics2d extends Graphics2D { g2D.drawPolygon( p ); } - public void drawPolygon(int xPoints[], int yPoints[], int nPoints) { + public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) { String l = "drawPolygon(int[],int[],int):" + "\n xPoints = " + Arrays.toString(xPoints) + @@ -578,7 +578,7 @@ public class DummyGraphics2d extends Graphics2D { g2D.drawPolygon( xPoints, yPoints, nPoints ); } - public void drawPolyline(int xPoints[], int yPoints[], int nPoints) { + public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) { String l = "drawPolyline(int[],int[],int):" + "\n xPoints = " + Arrays.toString(xPoints) + @@ -676,7 +676,7 @@ public class DummyGraphics2d extends Graphics2D { g2D.fillPolygon( p ); } - public void fillPolygon(int xPoints[], int yPoints[], int nPoints) { + public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) { String l = "fillPolygon(int[],int[],int):" + "\n xPoints = " + Arrays.toString(xPoints) + diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java index 09387f5f7c..21e47f8a56 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java @@ -247,11 +247,11 @@ public final class TestHSSFPicture extends BaseTestPicture { // test if inserted EscherMetafileBlip will be read again HSSFWorkbook wb = new HSSFWorkbook(); - byte pictureDataEmf[] = POIDataSamples.getDocumentInstance().readFile("vector_image.emf"); + byte[] pictureDataEmf = POIDataSamples.getDocumentInstance().readFile("vector_image.emf"); int indexEmf = wb.addPicture(pictureDataEmf, HSSFWorkbook.PICTURE_TYPE_EMF); - byte pictureDataPng[] = POIDataSamples.getSpreadSheetInstance().readFile("logoKarmokar4.png"); + byte[] pictureDataPng = POIDataSamples.getSpreadSheetInstance().readFile("logoKarmokar4.png"); int indexPng = wb.addPicture(pictureDataPng, HSSFWorkbook.PICTURE_TYPE_PNG); - byte pictureDataWmf[] = POIDataSamples.getSlideShowInstance().readFile("santa.wmf"); + byte[] pictureDataWmf = POIDataSamples.getSlideShowInstance().readFile("santa.wmf"); int indexWmf = wb.addPicture(pictureDataWmf, HSSFWorkbook.PICTURE_TYPE_WMF); HSSFSheet sheet = wb.createSheet(); @@ -281,10 +281,10 @@ public final class TestHSSFPicture extends BaseTestPicture { wb = HSSFTestDataSamples.writeOutAndReadBack(wb); - byte pictureDataOut[] = wb.getAllPictures().get(0).getData(); + byte[] pictureDataOut = wb.getAllPictures().get(0).getData(); assertArrayEquals(pictureDataEmf, pictureDataOut); - byte wmfNoHeader[] = new byte[pictureDataWmf.length-22]; + byte[] wmfNoHeader = new byte[pictureDataWmf.length - 22]; System.arraycopy(pictureDataWmf, 22, wmfNoHeader, 0, pictureDataWmf.length-22); pictureDataOut = wb.getAllPictures().get(2).getData(); assertArrayEquals(wmfNoHeader, pictureDataOut); diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java b/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java index 943de4ad23..583ef24f50 100644 --- a/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java +++ b/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java @@ -50,9 +50,9 @@ public class TestXorEncryption { int key = CryptoFunctions.createXorKey1("abc"); assertEquals(20810, key); assertEquals(52250, verifier); - - byte xorArrAct[] = CryptoFunctions.createXorArray1("abc"); - byte xorArrExp[] = HexRead.readFromString("AC-CC-A4-AB-D6-BA-C3-BA-D6-A3-2B-45-D3-79-29-BB"); + + byte[] xorArrAct = CryptoFunctions.createXorArray1("abc"); + byte[] xorArrExp = HexRead.readFromString("AC-CC-A4-AB-D6-BA-C3-BA-D6-A3-2B-45-D3-79-29-BB"); assertThat(xorArrExp, equalTo(xorArrAct)); } diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java b/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java index 51a7d34d74..ad686358d0 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java @@ -50,14 +50,14 @@ public class TestOle10Native { @Test public void testFiles() throws IOException, Ole10NativeException { - File files[] = { - // bug 51891 - POIDataSamples.getPOIFSInstance().getFile("multimedia.doc"), - // tika bug 1072 - POIDataSamples.getPOIFSInstance().getFile("20-Force-on-a-current-S00.doc"), - // other files containing ole10native records ... - POIDataSamples.getDocumentInstance().getFile("Bug53380_3.doc"), - POIDataSamples.getDocumentInstance().getFile("Bug47731.doc") + File[] files = { + // bug 51891 + POIDataSamples.getPOIFSInstance().getFile("multimedia.doc"), + // tika bug 1072 + POIDataSamples.getPOIFSInstance().getFile("20-Force-on-a-current-S00.doc"), + // other files containing ole10native records ... + POIDataSamples.getDocumentInstance().getFile("Bug53380_3.doc"), + POIDataSamples.getDocumentInstance().getFile("Bug47731.doc") }; for (File f : files) { diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java b/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java index 2add416529..eb88186a8e 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java @@ -2612,7 +2612,7 @@ public final class TestPOIFSStream { public void NPOIFSReadCopyWritePOIFSRead() throws IOException { File testFile = POIDataSamples.getSpreadSheetInstance().getFile("Simple.xls"); POIFSFileSystem src = new POIFSFileSystem(testFile); - byte wbDataExp[] = IOUtils.toByteArray(src.createDocumentInputStream("Workbook")); + byte[] wbDataExp = IOUtils.toByteArray(src.createDocumentInputStream("Workbook")); POIFSFileSystem nfs = new POIFSFileSystem(); EntryUtils.copyNodes(src.getRoot(), nfs.getRoot()); @@ -2623,7 +2623,7 @@ public final class TestPOIFSStream { nfs.close(); POIFSFileSystem pfs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray())); - byte wbDataAct[] = IOUtils.toByteArray(pfs.createDocumentInputStream("Workbook")); + byte[] wbDataAct = IOUtils.toByteArray(pfs.createDocumentInputStream("Workbook")); assertThat(wbDataExp, equalTo(wbDataAct)); pfs.close(); diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java index 365d1352cc..aba965bbf6 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java @@ -50,25 +50,25 @@ public class TestWorkdayFunction { @Test public void testFailWhenNoArguments() { - ValueEval ve[] = new ValueEval[0]; + ValueEval[] ve = new ValueEval[0]; assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, null)); } @Test public void testFailWhenLessThan2Arguments() { - ValueEval ve[] = new ValueEval[1]; + ValueEval[] ve = new ValueEval[1]; assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, null)); } @Test public void testFailWhenMoreThan3Arguments() { - ValueEval ve[] = new ValueEval[4]; + ValueEval[] ve = new ValueEval[4]; assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, null)); } @Test public void testFailWhenArgumentsAreNotDatesNorNumbers() { - ValueEval ve[] = { new StringEval("Potato"), new StringEval("Cucumber") }; + ValueEval[] ve = {new StringEval("Potato"), new StringEval("Cucumber")}; assertEquals(VALUE_INVALID, WorkdayFunction.instance.evaluate(ve, EC)); } @@ -76,7 +76,7 @@ public class TestWorkdayFunction { public void testReturnWorkdays() { Calendar expCal = LocaleUtil.getLocaleCalendar(2009, 3, 30); Date expDate = expCal.getTime(); - ValueEval ve[] = { new StringEval(STARTING_DATE), new NumberEval(151) }; + ValueEval[] ve = {new StringEval(STARTING_DATE), new NumberEval(151)}; Date actDate = DateUtil.getJavaDate(((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue()); assertEquals(expDate, actDate); } @@ -86,7 +86,7 @@ public class TestWorkdayFunction { Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 8, 27); Date expDate = expCal.getTime(); - ValueEval ve[] = { new StringEval("2013/09/30"), new NumberEval(-1) }; + ValueEval[] ve = {new StringEval("2013/09/30"), new NumberEval(-1)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); assertEquals(41544.0, numberValue, 0); @@ -98,8 +98,8 @@ public class TestWorkdayFunction { public void testReturnWorkdaysSpanningAWeekendAddingDays() { Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 8, 30); Date expDate = expCal.getTime(); - - ValueEval ve[] = { new StringEval("2013/09/27"), new NumberEval(1) }; + + ValueEval[] ve = {new StringEval("2013/09/27"), new NumberEval(1)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); assertEquals(41547.0, numberValue, 0); @@ -111,8 +111,8 @@ public class TestWorkdayFunction { public void testReturnWorkdaysWhenStartIsWeekendAddingDays() { Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 9, 7); Date expDate = expCal.getTime(); - - ValueEval ve[] = { new StringEval("2013/10/06"), new NumberEval(1) }; + + ValueEval[] ve = {new StringEval("2013/10/06"), new NumberEval(1)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); assertEquals(41554.0, numberValue, 0); @@ -124,8 +124,8 @@ public class TestWorkdayFunction { public void testReturnWorkdaysWhenStartIsWeekendSubtractingDays() { Calendar expCal = LocaleUtil.getLocaleCalendar(2013, 9, 4); Date expDate = expCal.getTime(); - - ValueEval ve[] = { new StringEval("2013/10/06"), new NumberEval(-1) }; + + ValueEval[] ve = {new StringEval("2013/10/06"), new NumberEval(-1)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); assertEquals(41551.0, numberValue, 0); @@ -137,8 +137,8 @@ public class TestWorkdayFunction { public void testReturnWorkdaysWithDaysTruncated() { Calendar expCal = LocaleUtil.getLocaleCalendar(2009, 3, 30); Date expDate = expCal.getTime(); - - ValueEval ve[] = { new StringEval(STARTING_DATE), new NumberEval(151.99999) }; + + ValueEval[] ve = {new StringEval(STARTING_DATE), new NumberEval(151.99999)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); Date actDate = DateUtil.getJavaDate(numberValue); @@ -149,8 +149,8 @@ public class TestWorkdayFunction { public void testReturnRetroativeWorkday() { Calendar expCal = LocaleUtil.getLocaleCalendar(2008, 8, 23); Date expDate = expCal.getTime(); - - ValueEval ve[] = { new StringEval(STARTING_DATE), new NumberEval(-5), new StringEval(RETROATIVE_HOLIDAY) }; + + ValueEval[] ve = {new StringEval(STARTING_DATE), new NumberEval(-5), new StringEval(RETROATIVE_HOLIDAY)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); Date actDate = DateUtil.getJavaDate(numberValue); @@ -161,10 +161,10 @@ public class TestWorkdayFunction { public void testReturnNetworkdaysWithManyHolidays() { Calendar expCal = LocaleUtil.getLocaleCalendar(2009, 4, 5); Date expDate = expCal.getTime(); - - ValueEval ve[] = { - new StringEval(STARTING_DATE), new NumberEval(151), - new MockAreaEval(FIRST_HOLIDAY, SECOND_HOLIDAY, THIRD_HOLIDAY) }; + + ValueEval[] ve = { + new StringEval(STARTING_DATE), new NumberEval(151), + new MockAreaEval(FIRST_HOLIDAY, SECOND_HOLIDAY, THIRD_HOLIDAY)}; double numberValue = ((NumberEval) WorkdayFunction.instance.evaluate(ve, EC)).getNumberValue(); Date actDate = DateUtil.getJavaDate(numberValue); diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java b/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java index 71c49cf753..8fbfa69961 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java @@ -68,7 +68,7 @@ public class TestEOMonth { } private void checkValue(double startDate, int monthInc, double expectedResult) { - ValueEval ve[] = {new NumberEval(startDate), new NumberEval(monthInc)}; + ValueEval[] ve = {new NumberEval(startDate), new NumberEval(monthInc)}; NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec); assertEquals(expectedResult, result.getNumberValue(), 0); } @@ -107,10 +107,10 @@ public class TestEOMonth { cal.clear(Calendar.SECOND); cal.clear(Calendar.MILLISECOND); Date expDate = cal.getTime(); - - ValueEval ve[] = { - new NumberEval(DateUtil.getExcelDate(startDate)), - new NumberEval(offset) + + ValueEval[] ve = { + new NumberEval(DateUtil.getExcelDate(startDate)), + new NumberEval(offset) }; NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec); Date actDate = DateUtil.getJavaDate(result.getNumberValue()); @@ -121,14 +121,14 @@ public class TestEOMonth { @Test public void testBug56688() { - ValueEval ve[] = {new NumberEval(DATE_1902_09_26), new RefEvalImplementation(new NumberEval(0))}; + ValueEval[] ve = {new NumberEval(DATE_1902_09_26), new RefEvalImplementation(new NumberEval(0))}; NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec); assertEquals(DATE_1902_09_30, result.getNumberValue(), 0); } @Test public void testRefEvalStartDate() { - ValueEval ve[] = {new RefEvalImplementation(new NumberEval(DATE_1902_09_26)), new NumberEval(0)}; + ValueEval[] ve = {new RefEvalImplementation(new NumberEval(DATE_1902_09_26)), new NumberEval(0)}; NumberEval result = (NumberEval) eOMonth.evaluate(ve, ec); assertEquals(DATE_1902_09_30, result.getNumberValue(), 0); } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java b/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java index 90300bf240..dc47830727 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java @@ -70,8 +70,11 @@ public class TestFinanceLib extends AbstractNumericTestCase { } public void testNpv() { - double r, v[], npv, x; - + double r; + double[] v; + double npv; + double x; + r = 1; v = new double[]{100, 200, 300, 400}; npv = FinanceLib.npv(r, v); x = 162.5; diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java b/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java index 9054c6b0ae..41ca4b8e98 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java @@ -66,7 +66,7 @@ public final class TestSubtotal { } AreaEval arg1 = EvalFactory.createAreaEval("C1:D5", values); - ValueEval args[] = { new NumberEval(function), arg1 }; + ValueEval[] args = {new NumberEval(function), arg1}; ValueEval result = new Subtotal().evaluate(args, 0, 0); diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java b/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java index 40dfd698fc..c721774461 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java +++ b/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java @@ -82,11 +82,11 @@ public class TestDateUtil { Calendar expCal = LocaleUtil.getLocaleCalendar(1900, 0, 0); - Calendar actCal[] = { - DateUtil.getJavaCalendar(dateValue), - DateUtil.getJavaCalendar(dateValue, use1904windowing), - DateUtil.getJavaCalendar(dateValue, use1904windowing, tz), - DateUtil.getJavaCalendar(dateValue, use1904windowing, tz, roundSeconds) + Calendar[] actCal = { + DateUtil.getJavaCalendar(dateValue), + DateUtil.getJavaCalendar(dateValue, use1904windowing), + DateUtil.getJavaCalendar(dateValue, use1904windowing, tz), + DateUtil.getJavaCalendar(dateValue, use1904windowing, tz, roundSeconds) }; assertEquals(expCal, actCal[0]); assertEquals(expCal, actCal[1]); diff --git a/src/testcases/org/apache/poi/util/TestHexDump.java b/src/testcases/org/apache/poi/util/TestHexDump.java index af3d8877b0..198b8bc7a2 100644 --- a/src/testcases/org/apache/poi/util/TestHexDump.java +++ b/src/testcases/org/apache/poi/util/TestHexDump.java @@ -53,8 +53,8 @@ public class TestHexDump { byte[] testArray = testArray(); ByteArrayOutputStream streamAct = new ByteArrayOutputStream(); HexDump.dump(testArray, 0, streamAct, 0); - byte bytesAct[] = streamAct.toByteArray(); - byte bytesExp[] = toHexDump(0,0); + byte[] bytesAct = streamAct.toByteArray(); + byte[] bytesExp = toHexDump(0, 0); assertEquals("array size mismatch", bytesExp.length, bytesAct.length); assertArrayEquals("array mismatch", bytesExp, bytesAct); @@ -123,7 +123,7 @@ public class TestHexDump { private byte[] toHexDump(long offset, int index) { StringBuilder strExp = new StringBuilder(), chrs = new StringBuilder(); - Object obj[] = new Object[33]; + Object[] obj = new Object[33]; StringBuilder format = new StringBuilder(); for (int j = 0; j < 16 && (index + j*16) < 256; j++) { diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/src/testcases/org/apache/poi/util/TestLittleEndian.java index 67741921a7..24072fa656 100644 --- a/src/testcases/org/apache/poi/util/TestLittleEndian.java +++ b/src/testcases/org/apache/poi/util/TestLittleEndian.java @@ -43,7 +43,7 @@ public final class TestLittleEndian { testdata[0] = 0x01; testdata[1] = (byte) 0xFF; testdata[2] = 0x02; - short expected[] = new short[2]; + short[] expected = new short[2]; expected[0] = ( short ) 0xFF01; expected[1] = 0x02FF; @@ -164,7 +164,7 @@ public final class TestLittleEndian { expected[1] = (byte) 0xFF; expected[2] = 0x02; byte[] received = new byte[ LittleEndianConsts.SHORT_SIZE + 1 ]; - short testdata[] = new short[2]; + short[] testdata = new short[2]; testdata[0] = ( short ) 0xFF01; testdata[1] = 0x02FF;