Author: centic
Date: Sat Sep 16 08:23:30 2017
New Revision: 1808512
URL: http://svn.apache.org/viewvc?rev=1808512&view=rev
Log:
Remove unnecessary casts and toString() calls
Modified:
poi/trunk/src/java/org/apache/poi/hpsf/Property.java
poi/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Property.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Property.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Property.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Property.java Sat Sep 16 08:23:30
2017
@@ -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) {
Modified: poi/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java Sat Sep
16 08:23:30 2017
@@ -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;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Sat
Sep 16 08:23:30 2017
@@ -4450,7 +4450,7 @@ public class XSSFSheet extends POIXMLDoc
for (RelationPart part : getRelationParts()) {
if (part.getDocumentPart() instanceof XSSFTable) {
// call table delete
- removeTable((XSSFTable) part.getDocumentPart());
+ removeTable(part.getDocumentPart());
continue;
}
removeRelation(part.getDocumentPart(), true);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Sat Sep
16 08:23:30 2017
@@ -1049,7 +1049,7 @@ public class XWPFRun implements ISDTCont
public String toString() {
String phonetic = getPhonetic();
if (phonetic.length() > 0) {
- return text() +" ("+phonetic.toString()+")";
+ return text() +" ("+ phonetic +")";
} else {
return text();
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java
Sat Sep 16 08:23:30 2017
@@ -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();
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
Sat Sep 16 08:23:30 2017
@@ -335,7 +335,7 @@ public final class TestXSSFHyperlink ext
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");
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
Sat Sep 16 08:23:30 2017
@@ -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) {
Modified:
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java?rev=1808512&r1=1808511&r2=1808512&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
Sat Sep 16 08:23:30 2017
@@ -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());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
