Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java Sat Dec 26 00:08:19 2020 @@ -46,11 +46,11 @@ public final class Picture { private static final POILogger log = POILogFactory .getLogger( Picture.class ); - public static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA }; + private static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA }; - public static final byte[] COMPRESSED2 = { (byte) 0xFE, 0x78, (byte) 0x9C }; + private static final byte[] COMPRESSED2 = { (byte) 0xFE, 0x78, (byte) 0x9C }; - public static final byte[] IHDR = new byte[] { 'I', 'H', 'D', 'R' }; + private static final byte[] IHDR = new byte[] { 'I', 'H', 'D', 'R' }; @Deprecated private static final byte[] PNG = new byte[] { (byte) 0x89, 0x50, 0x4E, @@ -119,7 +119,7 @@ public final class Picture { } else { _blipRecords = Collections.emptyList(); } - + if ( fillBytes ) { fillImageContent(); } @@ -177,16 +177,16 @@ public final class Picture { { /* * http://www.codecomments.com/archive281-2004-3-158083.html - * + * * Algorithm proposed by Patrick TJ McPhee: - * + * * read 2 bytes make sure they are 'ffd8'x repeatedly: read 2 bytes make * sure the first one is 'ff'x if the second one is 'd9'x stop else if * the second one is c0 or c2 (or possibly other values ...) skip 2 * bytes read one byte into depth read two bytes into height read two * bytes into width else read two bytes into length skip forward * length-2 bytes - * + * * Also used Ruby code snippet from: * http://www.bigbold.com/snippets/posts/show/805 for reference */ @@ -321,7 +321,7 @@ public final class Picture { /** * Gets the initial width of the picture, in twips, prior to cropping or * scaling. - * + * * @return the initial width of the picture in twips */ public int getDxaGoal() @@ -352,7 +352,7 @@ public final class Picture { /** * Gets the initial height of the picture, in twips, prior to cropping or * scaling. - * + * * @return the initial width of the picture in twips */ public int getDyaGoal() @@ -384,7 +384,7 @@ public final class Picture { /** * Returns the MIME type for the image - * + * * @return MIME-type for known types of image or "image/unknown" if unknown */ public String getMimeType() @@ -395,7 +395,7 @@ public final class Picture { /** * Returns picture's content as stored in the Word file, i.e. possibly in * compressed form. - * + * * @return picture's content as it stored in Word file or an empty byte array * if it cannot be read. */ @@ -416,14 +416,14 @@ public final class Picture { EscherBlipRecord blip = ( (EscherBSERecord) escherRecord ).getBlipRecord(); if (blip != null) { return blip.getPicturedata(); - + } } return new byte[0]; } /** - * + * * @return size in bytes of the picture */ public int getSize() @@ -460,10 +460,10 @@ public final class Picture { } return width; } - + /** * returns the description stored in the alternative text - * + * * @return pictue description */ public String getDescription() @@ -486,7 +486,7 @@ public final class Picture { /** * tries to suggest extension for picture's file by matching signatures of * popular image formats to first bytes of picture's contents - * + * * @return suggested file extension */ public String suggestFileExtension() @@ -498,7 +498,7 @@ public final class Picture { * Tries to suggest a filename: hex representation of picture structure * offset in "Data" stream plus extension that is tried to determine from * first byte of picture's content. - * + * * @return suggested file name */ public String suggestFullFileName() @@ -571,7 +571,7 @@ public final class Picture { * Writes Picture's content bytes to specified OutputStream. Is useful when * there is need to write picture bytes directly to stream, omitting its * representation in memory as distinct byte array. - * + * * @param out * a stream to write to * @throws IOException
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java Sat Dec 26 00:08:19 2020 @@ -214,18 +214,18 @@ public final class TestBasics { @Test public void testEncoding() throws Exception { assertEquals(2, cyrillic.getRecipientDetailsChunks().length); - assertEquals("CP1252", cyrillic.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding()); - assertEquals("CP1252", cyrillic.getRecipientDetailsChunks()[1].recipientDisplayNameChunk.get7BitEncoding()); + assertEquals("CP1252", cyrillic.getRecipientDetailsChunks()[0].getRecipientDisplayNameChunk().get7BitEncoding()); + assertEquals("CP1252", cyrillic.getRecipientDetailsChunks()[1].getRecipientDisplayNameChunk().get7BitEncoding()); cyrillic.guess7BitEncoding(); - assertEquals("Cp1251", cyrillic.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding()); - assertEquals("Cp1251", cyrillic.getRecipientDetailsChunks()[1].recipientDisplayNameChunk.get7BitEncoding()); + assertEquals("Cp1251", cyrillic.getRecipientDetailsChunks()[0].getRecipientDisplayNameChunk().get7BitEncoding()); + assertEquals("Cp1251", cyrillic.getRecipientDetailsChunks()[1].getRecipientDisplayNameChunk().get7BitEncoding()); // Override it, check it's taken cyrillic.set7BitEncoding("UTF-8"); - assertEquals("UTF-8", cyrillic.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding()); - assertEquals("UTF-8", cyrillic.getRecipientDetailsChunks()[1].recipientDisplayNameChunk.get7BitEncoding()); + assertEquals("UTF-8", cyrillic.getRecipientDetailsChunks()[0].getRecipientDisplayNameChunk().get7BitEncoding()); + assertEquals("UTF-8", cyrillic.getRecipientDetailsChunks()[1].getRecipientDisplayNameChunk().get7BitEncoding()); // Check with a file that has no headers @@ -235,10 +235,10 @@ public final class TestBasics { assertTrue(html.contains("text/html; charset=big5"), "Charset not found:\n" + html); // Defaults to CP1251 - assertEquals("CP1252", chinese.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding()); + assertEquals("CP1252", chinese.getRecipientDetailsChunks()[0].getRecipientDisplayNameChunk().get7BitEncoding()); // But after guessing goes to the correct one, cp950 (Windows Traditional Chinese) chinese.guess7BitEncoding(); - assertEquals("cp950", chinese.getRecipientDetailsChunks()[0].recipientDisplayNameChunk.get7BitEncoding()); + assertEquals("cp950", chinese.getRecipientDetailsChunks()[0].getRecipientDisplayNameChunk().get7BitEncoding()); } } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java Sat Dec 26 00:08:19 2020 @@ -59,7 +59,7 @@ public class TestNameIdChunks { */ @Test public void testReadKeywords() { - long keywordsPropTag = keywordsMsg.getNameIdChunks().getPropertyTag(PS_PUBLIC_STRINGS.classID, "Keywords", 0); + long keywordsPropTag = keywordsMsg.getNameIdChunks().getPropertyTag(PS_PUBLIC_STRINGS.getClassID(), "Keywords", 0); assertEquals(0x8003, keywordsPropTag); String[] exp = { "TODO", "Currently Important", "Currently To Do", "Test" }; String[] act = getValues(keywordsPropTag); @@ -72,7 +72,7 @@ public class TestNameIdChunks { */ @Test public void testCurrentVersionName() { - long testPropTag = keywordsMsg.getNameIdChunks().getPropertyTag(PSETID_COMMON.classID, null, 0x8554); + long testPropTag = keywordsMsg.getNameIdChunks().getPropertyTag(PSETID_COMMON.getClassID(), null, 0x8554); assertEquals(0x8006, testPropTag); String[] exp = { "16.0" }; String[] act = getValues(testPropTag); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java Sat Dec 26 00:08:19 2020 @@ -72,8 +72,8 @@ public final class TestSorters { new RecipientChunks("__recip_version1.0_#00000000"), }; Arrays.sort(chunks, new RecipientChunksSorter()); - assertEquals(0, chunks[0].recipientNumber); - assertEquals(1, chunks[1].recipientNumber); + assertEquals(0, chunks[0].getRecipientNumber()); + assertEquals(1, chunks[1].getRecipientNumber()); // Lots, with gaps chunks = new RecipientChunks[] { @@ -87,13 +87,13 @@ public final class TestSorters { new RecipientChunks("__recip_version1.0_#00000000"), }; Arrays.sort(chunks, new RecipientChunksSorter()); - assertEquals(0, chunks[0].recipientNumber); - assertEquals(1, chunks[1].recipientNumber); - assertEquals(5, chunks[2].recipientNumber); - assertEquals(9, chunks[3].recipientNumber); - assertEquals(0xFF, chunks[4].recipientNumber); - assertEquals(0x205, chunks[5].recipientNumber); - assertEquals(0x404, chunks[6].recipientNumber); - assertEquals(0x20001, chunks[7].recipientNumber); + assertEquals(0, chunks[0].getRecipientNumber()); + assertEquals(1, chunks[1].getRecipientNumber()); + assertEquals(5, chunks[2].getRecipientNumber()); + assertEquals(9, chunks[3].getRecipientNumber()); + assertEquals(0xFF, chunks[4].getRecipientNumber()); + assertEquals(0x205, chunks[5].getRecipientNumber()); + assertEquals(0x404, chunks[6].getRecipientNumber()); + assertEquals(0x20001, chunks[7].getRecipientNumber()); } } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java Sat Dec 26 00:08:19 2020 @@ -90,11 +90,11 @@ public final class TestPOIFSChunkParser assertTrue(groups[2] instanceof NameIdChunks); RecipientChunks recips = (RecipientChunks)groups[1]; - assertEquals("kevin.ro...@alfresco.org", recips.recipientSMTPChunk.getValue()); + assertEquals("kevin.ro...@alfresco.org", recips.getRecipientSMTPChunk().getValue()); assertEquals("/O=HOSTEDSERVICE2/OU=FIRST ADMINISTRATIVE GROUP/CN=RECIPIENTS/CN=Kevin.roast@ben", - recips.recipientEmailChunk.getValue()); + recips.getRecipientEmailChunk().getValue()); - String search = new String(recips.recipientSearchChunk.getValue(), StandardCharsets.US_ASCII); + String search = new String(recips.getRecipientSearchChunk().getValue(), StandardCharsets.US_ASCII); assertEquals("CN=KEVIN.ROAST@BEN\0", search.substring(search.length()-19)); // Now via MAPIMessage @@ -102,17 +102,17 @@ public final class TestPOIFSChunkParser assertNotNull(msg.getRecipientDetailsChunks()); assertEquals(1, msg.getRecipientDetailsChunks().length); - assertEquals("kevin.ro...@alfresco.org", msg.getRecipientDetailsChunks()[0].recipientSMTPChunk.getValue()); + assertEquals("kevin.ro...@alfresco.org", msg.getRecipientDetailsChunks()[0].getRecipientSMTPChunk().getValue()); assertEquals("kevin.ro...@alfresco.org", msg.getRecipientDetailsChunks()[0].getRecipientEmailAddress()); assertEquals("Kevin Roast", msg.getRecipientDetailsChunks()[0].getRecipientName()); assertEquals("kevin.ro...@alfresco.org", msg.getRecipientEmailAddress()); // Try both SMTP and EX files for recipient - assertEquals("EX", msg.getRecipientDetailsChunks()[0].deliveryTypeChunk.getValue()); - assertEquals("kevin.ro...@alfresco.org", msg.getRecipientDetailsChunks()[0].recipientSMTPChunk.getValue()); + assertEquals("EX", msg.getRecipientDetailsChunks()[0].getDeliveryTypeChunk().getValue()); + assertEquals("kevin.ro...@alfresco.org", msg.getRecipientDetailsChunks()[0].getRecipientSMTPChunk().getValue()); assertEquals("/O=HOSTEDSERVICE2/OU=FIRST ADMINISTRATIVE GROUP/CN=RECIPIENTS/CN=Kevin.roast@ben", - msg.getRecipientDetailsChunks()[0].recipientEmailChunk.getValue()); + msg.getRecipientDetailsChunks()[0].getRecipientEmailChunk().getValue()); msg.close(); simple.close(); @@ -123,10 +123,10 @@ public final class TestPOIFSChunkParser assertNotNull(msg.getRecipientDetailsChunks()); assertEquals(1, msg.getRecipientDetailsChunks().length); - assertEquals("SMTP", msg.getRecipientDetailsChunks()[0].deliveryTypeChunk.getValue()); - assertNull(msg.getRecipientDetailsChunks()[0].recipientSMTPChunk); - assertNull(msg.getRecipientDetailsChunks()[0].recipientNameChunk); - assertEquals("tra...@overwrittenstack.com", msg.getRecipientDetailsChunks()[0].recipientEmailChunk.getValue()); + assertEquals("SMTP", msg.getRecipientDetailsChunks()[0].getDeliveryTypeChunk().getValue()); + assertNull(msg.getRecipientDetailsChunks()[0].getRecipientSMTPChunk()); + assertNull(msg.getRecipientDetailsChunks()[0].getRecipientNameChunk()); + assertEquals("tra...@overwrittenstack.com", msg.getRecipientDetailsChunks()[0].getRecipientEmailChunk().getValue()); assertEquals("tra...@overwrittenstack.com", msg.getRecipientEmailAddress()); msg.close(); @@ -166,12 +166,12 @@ public final class TestPOIFSChunkParser (RecipientChunks)groups[7], }; assertEquals(6, chunks.length); - assertEquals(0, chunks[0].recipientNumber); - assertEquals(2, chunks[1].recipientNumber); - assertEquals(4, chunks[2].recipientNumber); - assertEquals(5, chunks[3].recipientNumber); - assertEquals(3, chunks[4].recipientNumber); - assertEquals(1, chunks[5].recipientNumber); + assertEquals(0, chunks[0].getRecipientNumber()); + assertEquals(2, chunks[1].getRecipientNumber()); + assertEquals(4, chunks[2].getRecipientNumber()); + assertEquals(5, chunks[3].getRecipientNumber()); + assertEquals(3, chunks[4].getRecipientNumber()); + assertEquals(1, chunks[5].getRecipientNumber()); // Check assertEquals("'Ashutosh Dandavate'", chunks[0].getRecipientName()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Sat Dec 26 00:08:19 2020 @@ -1640,8 +1640,8 @@ public final class TestBugs extends Base } } assertNotNull(tr); - assertEquals(1, tr._tabids.length); - assertEquals(0, tr._tabids[0]); + assertEquals(1, tr.getTabIdSize()); + assertEquals(0, tr.getTabIdAt(0)); // Ensure the print setup assertEquals("new_sheet!$A$1:$C$1", wb2.getPrintArea(0)); Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java?rev=1884807&r1=1884806&r2=1884807&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java Sat Dec 26 00:08:19 2020 @@ -263,7 +263,7 @@ public final class TestSumifs { HSSFSheet example3 = wb.getSheet("Example 3"); HSSFCell ex3cell = example3.getRow(5).getCell(2); fe.evaluate(ex3cell); - assertEquals(8,8, ex3cell.getNumericCellValue()); + assertEquals(8.8, ex3cell.getNumericCellValue(), 0); HSSFSheet example4 = wb.getSheet("Example 4"); HSSFCell ex4cell = example4.getRow(8).getCell(2); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
