From: Dominik Stadler Date: Sat, 16 Sep 2017 08:23:30 +0000 (+0000) Subject: Remove unnecessary casts and toString() calls X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ca329e08ba2a5d0e2752e88b2a53724cc10fbd8;p=poi.git Remove unnecessary casts and toString() calls git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808512 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/hpsf/Property.java b/src/java/org/apache/poi/hpsf/Property.java index e05a06dacd..df38d7a597 100644 --- a/src/java/org/apache/poi/hpsf/Property.java +++ b/src/java/org/apache/poi/hpsf/Property.java @@ -455,7 +455,7 @@ public class Property { } else if (type == Variant.VT_EMPTY || type == Variant.VT_NULL || value == null) { b.append("null"); } else { - b.append(value.toString()); + b.append(value); String decoded = decodeValueFromID(); if (decoded != null) { diff --git a/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java b/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java index a3aff23d8f..d8e660f31c 100644 --- a/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java +++ b/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java @@ -107,7 +107,7 @@ public class SectionIDMap { if (m == null) { return UNDEFINED; } - final String s = (String) m.get(pid); + final String s = m.get(pid); if (s == null) { return UNDEFINED; } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java index 3f11840f85..d6b7baf340 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java @@ -4450,7 +4450,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { for (RelationPart part : getRelationParts()) { if (part.getDocumentPart() instanceof XSSFTable) { // call table delete - removeTable((XSSFTable) part.getDocumentPart()); + removeTable(part.getDocumentPart()); continue; } removeRelation(part.getDocumentPart(), true); diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java index 80b56c749b..4da3f995b1 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java @@ -1049,7 +1049,7 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun { public String toString() { String phonetic = getPhonetic(); if (phonetic.length() > 0) { - return text() +" ("+phonetic.toString()+")"; + return text() +" ("+ phonetic +")"; } else { return text(); } diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java index c9be3d9ed2..eda48b6eee 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java @@ -168,8 +168,8 @@ public class TestHxxFEncryption { EncryptionInfo ei = doc.getEncryptionInfo(); assertNotNull(ei); assertTrue(ei.getHeader() instanceof CryptoAPIEncryptionHeader); - assertEquals(0x28, ((CryptoAPIEncryptionHeader)ei.getHeader()).getKeySize()); - ((CryptoAPIEncryptionHeader)ei.getHeader()).setKeySize(0x78); + assertEquals(0x28, ei.getHeader().getKeySize()); + ei.getHeader().setKeySize(0x78); bos.reset(); doc.write(bos); doc.close(); @@ -180,7 +180,7 @@ public class TestHxxFEncryption { ei = doc.getEncryptionInfo(); assertNotNull(ei); assertTrue(ei.getHeader() instanceof CryptoAPIEncryptionHeader); - assertEquals(0x78, ((CryptoAPIEncryptionHeader)ei.getHeader()).getKeySize()); + assertEquals(0x78, ei.getHeader().getKeySize()); doc.close(); te4.close(); } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java index ec6402242c..ddb814d15e 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java @@ -335,7 +335,7 @@ public final class TestXSSFHyperlink extends BaseTestHyperlink { XSSFWorkbook wb = new XSSFWorkbook(); CreationHelper createHelper = wb.getCreationHelper(); - XSSFCellStyle hlinkStyle = (XSSFCellStyle) wb.createCellStyle(); + XSSFCellStyle hlinkStyle = wb.createCellStyle(); Font hlinkFont = wb.createFont(); Sheet sheet = wb.createSheet("test"); diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java index 77ba355e1c..17a8568f93 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java @@ -89,7 +89,7 @@ public class HwmfPicture { } consumedSize += wr.init(leis, recordSize, recordFunction); - int remainingSize = (int)(recordSize - consumedSize); + int remainingSize = recordSize - consumedSize; if (remainingSize < 0) { throw new RecordFormatException("read too many bytes. record size: "+recordSize + "; comsumed size: "+consumedSize); } else if(remainingSize > 0) { diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java index cdaa76f660..46cf64b51c 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java +++ b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java @@ -531,7 +531,7 @@ public class TestWriteWellKnown { /* Removing the custom property must return the remove property and * reduce the size to 0. */ - cp = (CustomProperty) cps.remove(KEY); + cp = cps.remove(KEY); assertEquals(KEY, cp.getName()); assertEquals(VALUE_2, cp.getValue()); assertEquals(0, cps.size());