]> source.dussan.org Git - poi.git/commitdiff
Let IntelliJ cleanup some code-warnings across the whole code-base: unnecessary toStr...
authorDominik Stadler <centic@apache.org>
Mon, 17 Apr 2017 20:13:52 +0000 (20:13 +0000)
committerDominik Stadler <centic@apache.org>
Mon, 17 Apr 2017 20:13:52 +0000 (20:13 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1791720 13f79535-47bb-0310-9956-ffa450edef68

117 files changed:
src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
src/java/org/apache/poi/ddf/EscherArrayProperty.java
src/java/org/apache/poi/ddf/EscherContainerRecord.java
src/java/org/apache/poi/ddf/EscherDggRecord.java
src/java/org/apache/poi/ddf/EscherDump.java
src/java/org/apache/poi/ddf/UnknownEscherRecord.java
src/java/org/apache/poi/hpsf/Property.java
src/java/org/apache/poi/hpsf/Section.java
src/java/org/apache/poi/hpsf/VariantSupport.java
src/java/org/apache/poi/hssf/dev/BiffViewer.java
src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
src/java/org/apache/poi/hssf/dev/FormulaViewer.java
src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
src/java/org/apache/poi/hssf/record/ArrayRecord.java
src/java/org/apache/poi/hssf/record/CFHeaderBase.java
src/java/org/apache/poi/hssf/record/CFRule12Record.java
src/java/org/apache/poi/hssf/record/CFRuleRecord.java
src/java/org/apache/poi/hssf/record/DVRecord.java
src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
src/java/org/apache/poi/hssf/record/EscherAggregate.java
src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
src/java/org/apache/poi/hssf/record/FormulaRecord.java
src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
src/java/org/apache/poi/hssf/record/NameRecord.java
src/java/org/apache/poi/hssf/record/ObjRecord.java
src/java/org/apache/poi/hssf/record/PaletteRecord.java
src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
src/java/org/apache/poi/hssf/record/TableRecord.java
src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
src/java/org/apache/poi/hssf/record/common/UnicodeString.java
src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
src/java/org/apache/poi/ss/formula/FormulaRenderer.java
src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
src/java/org/apache/poi/ss/usermodel/SheetVisibility.java
src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java
src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
src/ooxml/java/org/apache/poi/util/OOXMLLite.java
src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java
src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
src/testcases/org/apache/poi/hssf/model/TestRVA.java
src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
src/testcases/org/apache/poi/util/TestStringUtil.java

index 1a0ade2af0d1b910b18dccc3f732028e25f261b6..f4b5ba10d0342f75bf269c81310bbdb5047ae5bb 100644 (file)
@@ -142,7 +142,7 @@ public class CopyCompare
         if (equal(oRoot, cRoot, messages)) {
             System.out.println("Equal");
         } else {
-            System.out.println("Not equal: " + messages.toString());
+            System.out.println("Not equal: " + messages);
         }
         cpfs.close();
         opfs.close();
index 8ce336f24d72fc754355590326bfa0693eccf9ca..e6e55c0a27e790fb5ac7aaf7c831a58f2be99e3f 100644 (file)
@@ -159,7 +159,7 @@ public class PropertySetDescriptorRenderer extends DocumentDescriptorRenderer
                 b.append(' ');
                 System.arraycopy(value, ((byte[])value).length - 4, buf, 0, 4);
             } else if (value != null) {
-                b.append(value.toString());
+                b.append(value);
             } else {
                 b.append("null");
             }
index cf6c176cc82474ccd4329062375c49335442c5a2..94f7cd1118b8c0944d10d7d375795095c3a4475e 100644 (file)
@@ -89,8 +89,8 @@ public class CheckFunctionsSupported {
                 System.out.println(" All cells evaluated without error");
             } else {
                 for (CellReference cr : probs.unevaluatableCells.keySet()) {
-                    System.out.println(" " + cr.formatAsString() + " - " + 
-                                       probs.unevaluatableCells.get(cr).toString());
+                    System.out.println(" " + cr.formatAsString() + " - " +
+                            probs.unevaluatableCells.get(cr));
                 }
             }
         }
index 2ac609a8aaf233c12d02360abe3f51fc90a04ac2..dfd1f89114ef892347c1f909a5ca0e32604aca2c 100644 (file)
@@ -39,7 +39,7 @@ public class IterateCells {
             for (Row row : sheet) {
                 System.out.println("rownum: " + row.getRowNum());
                 for (Cell cell : row) {
-                    System.out.println(cell.toString());
+                    System.out.println(cell);
                 }
             }
         }
index bf68c2481724b3474257e4a5220bca076b60ee7c..84663feb324dcff3364e2864093fd1e9eacfd48b 100644 (file)
@@ -198,9 +198,9 @@ public class TestExcelAntWorkbookUtil extends TestCase {
                                                                                precision);
 
                //System.out.println(result);
-               assertTrue("Had:" + result.toString(), result.toString().contains("evaluationCompletedWithError=false"));
-               assertTrue("Had:" + result.toString(), result.toString().contains("returnValue=790.79"));
-               assertTrue("Had:" + result.toString(), result.toString().contains("cellName='MortgageCalculator'!B4"));
+               assertTrue("Had:" + result, result.toString().contains("evaluationCompletedWithError=false"));
+               assertTrue("Had:" + result, result.toString().contains("returnValue=790.79"));
+               assertTrue("Had:" + result, result.toString().contains("cellName='MortgageCalculator'!B4"));
         assertFalse(result.toString().contains("#N/A"));
 
                assertFalse(result.evaluationCompleteWithError());
@@ -220,10 +220,10 @@ public class TestExcelAntWorkbookUtil extends TestCase {
                                                                 precision);
 
         //System.out.println(result);
-        assertTrue("Had:" + result.toString(), result.toString().contains("evaluationCompletedWithError=false"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("returnValue=790.79"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("cellName='MortgageCalculator'!B4"));
-        assertFalse("Should not see an error, but had:" + result.toString(), result.toString().contains("#"));
+        assertTrue("Had:" + result, result.toString().contains("evaluationCompletedWithError=false"));
+        assertTrue("Had:" + result, result.toString().contains("returnValue=790.79"));
+        assertTrue("Had:" + result, result.toString().contains("cellName='MortgageCalculator'!B4"));
+        assertFalse("Should not see an error, but had:" + result, result.toString().contains("#"));
 
         assertFalse(result.evaluationCompleteWithError());
         assertFalse(result.didTestPass());
@@ -242,10 +242,10 @@ public class TestExcelAntWorkbookUtil extends TestCase {
                                                                 precision);
 
         System.out.println(result);
-        assertTrue("Had:" + result.toString(), result.toString().contains("evaluationCompletedWithError=true"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("returnValue=0.0"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("cellName='ErrorCell'!A1"));
-        assertTrue("Had:" + result.toString(), result.toString().contains("#N/A"));
+        assertTrue("Had:" + result, result.toString().contains("evaluationCompletedWithError=true"));
+        assertTrue("Had:" + result, result.toString().contains("returnValue=0.0"));
+        assertTrue("Had:" + result, result.toString().contains("cellName='ErrorCell'!A1"));
+        assertTrue("Had:" + result, result.toString().contains("#N/A"));
 
         assertTrue(result.evaluationCompleteWithError());
         assertFalse(result.didTestPass());
index 9f492bf0edda1ab00d0c37b7b62ffcac28d05e02..30e98af59a81d15aff4274fe74e091985e294190 100644 (file)
@@ -40,10 +40,10 @@ public class HMEFFileHandler extends AbstractFileHandler {
                
                // there are two test-files that have no body...
                if(!msg.getSubject().equals("Testing TNEF Message") && !msg.getSubject().equals("TNEF test message with attachments")) {
-               assertNotNull("Had: " + msg.getBody() + ", " + msg.getSubject() + ", " + msg.getAttachments() + ": " + props.toString(), 
+               assertNotNull("Had: " + msg.getBody() + ", " + msg.getSubject() + ", " + msg.getAttachments() + ": " + props,
                                msg.getBody());
                }
-               assertNotNull("Had: " + msg.getBody() + ", " + msg.getSubject() + ", " + msg.getAttachments() + ": " + props.toString(), 
+               assertNotNull("Had: " + msg.getBody() + ", " + msg.getSubject() + ", " + msg.getAttachments() + ": " + props,
                                msg.getSubject());
        }
        
index b765fa8381a02b2803095afef8229b15536239b3..d0563151ed49c35944b68f671fc053b65e7da6ed 100644 (file)
@@ -207,7 +207,7 @@ public abstract class AbstractEscherOptRecord extends EscherRecord
 
         for ( EscherProperty property : properties )
         {
-            stringBuilder.append("    ").append(property.toString()).append(nl);
+            stringBuilder.append("    ").append(property).append(nl);
         }
 
         return stringBuilder.toString();
index 21a6db1601a03e16bad9f3deba5d4b15f3020fd1..a60e2ad0810d0366bcdd0ff0ade491143a1faa35 100644 (file)
@@ -134,7 +134,7 @@ public final class EscherArrayProperty extends EscherComplexProperty implements
                 + ", propName: " + EscherProperties.getPropertyName( getPropertyNumber() )
                 + ", complex: " + isComplex()
                 + ", blipId: " + isBlipId()
-                + ", data: " + '\n' + results.toString();
+                + ", data: " + '\n' + results;
     }
 
     @Override
index e570084b249259af684cbf752c807346e198ea66..dece611bedb62e38c8323585a581842661f9642f 100644 (file)
@@ -294,7 +294,7 @@ public final class EscherContainerRecord extends EscherRecord implements Iterabl
                 + "  instance: 0x" + HexDump.toHex( getInstance() ) + nl
                 + "  recordId: 0x" + HexDump.toHex( getRecordId() ) + nl
                 + "  numchildren: " + _childRecords.size() + nl
-                + children.toString();
+                + children;
     }
 
     @Override
index 5b1b8b744ae24419861af0c319fde866806bcae7..7464e5f4566979ca82384b281a07b6ea844dde5c 100644 (file)
@@ -145,7 +145,7 @@ public final class EscherDggRecord extends EscherRecord {
                 "  NumIdClusters: " + getNumIdClusters() + '\n' +
                 "  NumShapesSaved: " + field_3_numShapesSaved + '\n' +
                 "  DrawingsSaved: " + field_4_drawingsSaved + '\n' +
-                "" + field_5_string.toString();
+                "" + field_5_string;
 
     }
 
index 45905c936aebb5fd9b31c78160e4604edcc146b0..f35b061b3b319362e9800754b8b6562315ce232f 100644 (file)
@@ -53,7 +53,7 @@ public final class EscherDump {
         {
             EscherRecord r = recordFactory.createRecord(data, pos);
             int bytesRead = r.fillFields(data, pos, recordFactory );
-            out.println( r.toString() );
+            out.println(r);
             pos += bytesRead;
         }
     }
@@ -202,7 +202,7 @@ public final class EscherDump {
             stringBuf.append( HexDump.toHex( recordBytesRemaining ) );
             stringBuf.append( "]  instance: " );
             stringBuf.append( HexDump.toHex( ( (short) ( options >> 4 ) ) ) );
-            out.println( stringBuf.toString() );
+            out.println(stringBuf);
             stringBuf.setLength(0);
 
 
@@ -222,7 +222,7 @@ public final class EscherDump {
                 n8 = (byte) in.read();
                 stringBuf.append( HexDump.toHex( n8 ) );
                 stringBuf.append( getBlipType( n8 ) );
-                out.println( stringBuf.toString() );
+                out.println(stringBuf);
 
                 out.println( "    rgbUid:" );
                 HexDump.dump( in, out, 0, 16 );
index 6f871528a61979d52fb5000ca547435b94a0ef84..aca4e19b14009e0f88d6c6009b7ac06aa04e76dd 100644 (file)
@@ -136,7 +136,7 @@ public final class UnknownEscherRecord extends EscherRecord implements Cloneable
         if (getChildRecords().size() > 0) {
             children.append( "  children: " + '\n' );
             for (EscherRecord record : _childRecords) {
-                children.append( record.toString() );
+                children.append(record);
                 children.append( '\n' );
             }
         }
@@ -150,7 +150,7 @@ public final class UnknownEscherRecord extends EscherRecord implements Cloneable
                 "  recordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
                 "  numchildren: " + getChildRecords().size() + '\n' +
                 theDumpHex +
-                children.toString();
+                children;
     }
 
     @Override
index 8c81f0b2f800930998b1d7ce418ae5103cbcf0aa..1ae0e7430d25726bd9cbd15be1bb6f7c88b20bdb 100644 (file)
@@ -415,7 +415,7 @@ public class Property {
         final Object value = getValue();
         b.append(", value: ");
         if (value instanceof String) {
-            b.append(value.toString());
+            b.append(value);
             final String s = (String) value;
             final int l = s.length();
             final byte[] bytes = new byte[l * 2];
@@ -439,7 +439,7 @@ public class Property {
                 b.append(hex);
             }
         } else {
-            b.append(value.toString());
+            b.append(value);
         }
         b.append(']');
         return b.toString();
index 306e14a22f281d1a5acb6008f23a000792369c4e..830d94465b8e9c452638c0c6970dc568248a18ba 100644 (file)
@@ -982,7 +982,7 @@ public class Section {
         b.append(getSize());
         b.append(", properties: [\n");
         for (int i = 0; i < pa.length; i++) {
-            b.append(pa[i].toString());
+            b.append(pa[i]);
             b.append(",\n");
         }
         b.append(']');
index 1181437bcf2437cfb0a77969d2b4f48519a474fe..b098db504c9653996e971a003727da11fd15ff05 100644 (file)
@@ -331,9 +331,9 @@ public class VariantSupport extends Variant {
             case Variant.VT_I4:
                 if (!(value instanceof Integer)) {
                     throw new ClassCastException("Could not cast an object to "
-                            + Integer.class.toString() + ": "
-                            + value.getClass().toString() + ", "
-                            + value.toString());
+                            + Integer.class + ": "
+                            + value.getClass() + ", "
+                            + value);
                 }
                 length += TypeWriter.writeToStream(out, ((Integer) value).intValue());
                 break;
index d6b8777a327f26706a8f327d8de447048c6e7e54..9423b719068f4c8b3c37881c00d20a84594c8e9d 100644 (file)
@@ -256,7 +256,7 @@ public final class BiffViewer {
                 for (String header : recListener.getRecentHeaders()) {
                     ps.println(header);
                 }
-                ps.print(record.toString());
+                ps.print(record);
             } else {
                 recStream.readRemainder();
             }
index b136e4ca8addd1f4454ddba917239925f8ae60e5..3610d0f21baa7092850d3e8568c8d31f28b04191 100644 (file)
@@ -53,7 +53,7 @@ public class EFBiffViewer
                 {
                     public void processRecord(Record rec)
                     {
-                        System.out.println(rec.toString());
+                        System.out.println(rec);
                     }
                 });
                 HSSFEventFactory factory = new HSSFEventFactory();
index 3426d4a09ccbbc3202087d733ac3d462442b43de..4bf221f4def856c88a78165521d5dfe1b669a5f1 100644 (file)
@@ -132,7 +132,7 @@ public class FormulaViewer
             }
             buf.append(sep);
             buf.append(numArg);
-            System.out.println(buf.toString());
+            System.out.println(buf);
     }
 
     /**
index c4eb047312c1d1cee7fa6605f01151867fdce093..0e7e31ac47163d41f7b1dbc3bbdad96e652bb744 100644 (file)
@@ -342,7 +342,7 @@ public class ExcelExtractor extends POIOLE2TextExtractor implements org.apache.p
                                                                                case STRING:
                                                                                        HSSFRichTextString str = cell.getRichStringCellValue();
                                                                                        if(str != null && str.length() > 0) {
-                                                                                               text.append(str.toString());
+                                                                                               text.append(str);
                                                                                        }
                                                                                        break;
                                                                                case NUMERIC:
index 1005b38f6221da39d6aaaaf0beac36abd4ff4572..65ed15d7099e2c68fa30018f1dee0a265b4d0988 100644 (file)
@@ -91,7 +91,7 @@ public abstract class AbstractEscherHolderRecord extends Record implements Clone
         if (escherRecords.size() == 0)
             buffer.append("No Escher Records Decoded" + nl);
         for (EscherRecord r : escherRecords) {
-            buffer.append(r.toString());
+            buffer.append(r);
         }
         buffer.append("[/" + getRecordName() + ']' + nl);
 
index 0ff4eb04c497b3cfb31677f2b0d3d6b19725d832..f1f78a2eff09546b5ec40b1e67b88e8abf74a0bb 100644 (file)
@@ -81,14 +81,14 @@ public final class ArrayRecord extends SharedValueRecordBase implements Cloneabl
        public String toString() {
                StringBuffer sb = new StringBuffer();
                sb.append(getClass().getName()).append(" [ARRAY]\n");
-               sb.append(" range=").append(getRange().toString()).append("\n");
+               sb.append(" range=").append(getRange()).append("\n");
                sb.append(" options=").append(HexDump.shortToHex(_options)).append("\n");
                sb.append(" notUsed=").append(HexDump.intToHex(_field3notUsed)).append("\n");
                sb.append(" formula:").append("\n");
                Ptg[] ptgs = _formula.getTokens();
                for (int i = 0; i < ptgs.length; i++) {
                        Ptg ptg = ptgs[i];
-                       sb.append(ptg.toString()).append(ptg.getRVAType()).append("\n");
+                       sb.append(ptg).append(ptg.getRVAType()).append("\n");
                }
                sb.append("]");
                return sb.toString();
index 3784638657a0ba680e0a200fec43e29a9b6468b6..8ef254c710fc356f66bb277d7772c2460a4e9f5b 100644 (file)
@@ -130,7 +130,7 @@ public abstract class CFHeaderBase extends StandardRecord implements Cloneable {
         buffer.append("\t.enclosingCellRange= ").append(getEnclosingCellRange()).append("\n");
         buffer.append("\t.cfranges=[");
         for( int i=0; i<field_4_cell_ranges.countRanges(); i++) {
-            buffer.append(i==0?"":",").append(field_4_cell_ranges.getCellRangeAddress(i).toString());
+            buffer.append(i==0?"":",").append(field_4_cell_ranges.getCellRangeAddress(i));
         }
         buffer.append("]\n");
         buffer.append("[/").append(getRecordName()).append("]\n");
index e09b806583d515afbf25ad3a4b30b622457a6de5..3ec98c8004fc243d88131cfcc7d1977090530178 100644 (file)
@@ -425,13 +425,13 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord, Cl
         buffer.append("    .dxfn12_length =0x").append(Integer.toHexString(ext_formatting_length)).append("\n");
         buffer.append("    .option_flags  =0x").append(Integer.toHexString(getOptions())).append("\n");
         if (containsFontFormattingBlock()) {
-            buffer.append(_fontFormatting.toString()).append("\n");
+            buffer.append(_fontFormatting).append("\n");
         }
         if (containsBorderFormattingBlock()) {
-            buffer.append(_borderFormatting.toString()).append("\n");
+            buffer.append(_borderFormatting).append("\n");
         }
         if (containsPatternFormattingBlock()) {
-            buffer.append(_patternFormatting.toString()).append("\n");
+            buffer.append(_patternFormatting).append("\n");
         }
         buffer.append("    .dxfn12_ext=").append(HexDump.toHex(ext_formatting_data)).append("\n");
         buffer.append("    .formula_1 =").append(Arrays.toString(getFormula1().getTokens())).append("\n");
index 83915ccc96a4d8b8c05b05aa1eefafefaf54baa1..082b365d141de9253eed33c97dbc488c793b9650 100644 (file)
@@ -141,13 +141,13 @@ public final class CFRuleRecord extends CFRuleBase implements Cloneable {
         buffer.append("    .condition_type   =").append(getConditionType()).append("\n");
         buffer.append("    OPTION FLAGS=0x").append(Integer.toHexString(getOptions())).append("\n");
         if (containsFontFormattingBlock()) {
-            buffer.append(_fontFormatting.toString()).append("\n");
+            buffer.append(_fontFormatting).append("\n");
         }
         if (containsBorderFormattingBlock()) {
-            buffer.append(_borderFormatting.toString()).append("\n");
+            buffer.append(_borderFormatting).append("\n");
         }
         if (containsPatternFormattingBlock()) {
-            buffer.append(_patternFormatting.toString()).append("\n");
+            buffer.append(_patternFormatting).append("\n");
         }
         buffer.append("    Formula 1 =").append(Arrays.toString(getFormula1().getTokens())).append("\n");
         buffer.append("    Formula 2 =").append(Arrays.toString(getFormula2().getTokens())).append("\n");
index 04b3f84411d66f346f3c4710e466526e97d84127..b4351cd13c0174fe86b9165cecb5f8792aaf4b50 100644 (file)
@@ -283,7 +283,7 @@ public final class DVRecord extends StandardRecord implements Cloneable {
                Ptg[] ptgs = f.getTokens();
                sb.append('\n');
                for (Ptg ptg : ptgs) {
-                       sb.append('\t').append(ptg.toString()).append('\n');
+                       sb.append('\t').append(ptg).append('\n');
                }
        }
 
index 877ef8c917675aab5b41f8f026935e49458f0234..0e1f4a0dbdee3daf545210a08da19c0dacbfa593 100644 (file)
@@ -316,7 +316,7 @@ public final class EmbeddedObjectRefSubRecord extends SubRecord implements Clone
                if (field_2_refPtg == null) {
                        sb.append("    .f3unknown     = ").append(HexDump.toHex(field_2_unknownFormulaData)).append("\n");
                } else {
-                       sb.append("    .formula       = ").append(field_2_refPtg.toString()).append("\n");
+                       sb.append("    .formula       = ").append(field_2_refPtg).append("\n");
                }
                if (field_4_ole_classname != null) {
                        sb.append("    .unicodeFlag   = ").append(field_3_unicode_flag).append("\n");
index 01e685c9cfe0e1d2e0e7f224786efe1e45c6d0fa..0a9727388e8369b8421571329ab72105ee5f9a3b 100644 (file)
@@ -329,7 +329,7 @@ public final class EscherAggregate extends AbstractEscherHolderRecord {
         StringBuilder result = new StringBuilder();
         result.append('[').append(getRecordName()).append(']').append(nl);
         for (EscherRecord escherRecord : getEscherRecords()) {
-            result.append(escherRecord.toString());
+            result.append(escherRecord);
         }
         result.append("[/").append(getRecordName()).append(']').append(nl);
 
index 343c1498ec08915dfb9b214becab91d28f516e67..0a75e9c896f2e7ca5423718b3123543585df2afb 100644 (file)
@@ -133,7 +133,7 @@ public class ExternSheetRecord extends StandardRecord {
                sb.append("   numOfRefs     = ").append(nItems).append("\n");
                for (int i=0; i < nItems; i++) {
                        sb.append("refrec         #").append(i).append(": ");
-                       sb.append(getRef(i).toString());
+                       sb.append(getRef(i));
                        sb.append('\n');
                }
                sb.append("[/EXTERNSHEET]\n");
index cdf7a744c05db0fd2e6a2295c4d8bf01a9cb7286..00603810c15bb2fad6f9a56e6390c93d61d2e82e 100644 (file)
@@ -222,7 +222,7 @@ public final class ExternalNameRecord extends StandardRecord {
                if(field_5_name_definition != null) {
             Ptg[] ptgs = field_5_name_definition.getTokens();
             for (Ptg ptg : ptgs) {
-                sb.append("    .namedef = ").append(ptg.toString()).append(ptg.getRVAType()).append("\n");
+                sb.append("    .namedef = ").append(ptg).append(ptg.getRVAType()).append("\n");
             }
                }
                sb.append("[/EXTERNALNAME]\n");
index 0ef07d470f951c1e243359ab4fd899600478389f..662be0c630816c69f22fdd41e8a4effe87862aec 100644 (file)
@@ -380,7 +380,7 @@ public final class FormulaRecord extends CellRecord implements Cloneable {
                        }
                        sb.append("    Ptg[").append(k).append("]=");
                        Ptg ptg = ptgs[k];
-                       sb.append(ptg.toString()).append(ptg.getRVAType());
+                       sb.append(ptg).append(ptg.getRVAType());
                }
        }
 
index c5fa4bae99a20c3f286c36538f973687aca392c0..026d356e60cb6feefb40a29d8c18755a982fc812 100644 (file)
@@ -271,14 +271,14 @@ public class LbsDataSubRecord extends SubRecord {
         sb.append("    .unknownShort1 =").append(HexDump.shortToHex(_cbFContinued)).append("\n");
         sb.append("    .formula        = ").append('\n');
         if(_linkPtg != null) {
-            sb.append(_linkPtg.toString()).append(_linkPtg.getRVAType()).append('\n');
+            sb.append(_linkPtg).append(_linkPtg.getRVAType()).append('\n');
         }
         sb.append("    .nEntryCount   =").append(HexDump.shortToHex(_cLines)).append("\n");
         sb.append("    .selEntryIx    =").append(HexDump.shortToHex(_iSel)).append("\n");
         sb.append("    .style         =").append(HexDump.shortToHex(_flags)).append("\n");
         sb.append("    .unknownShort10=").append(HexDump.shortToHex(_idEdit)).append("\n");
         if(_dropData != null) {
-            sb.append('\n').append(_dropData.toString());
+            sb.append('\n').append(_dropData);
         }
         sb.append("[/ftLbsData]\n");
         return sb.toString();
index 613239bd5389f16a0c3a018aaf55613129d58a6a..050745b25997a3a4626a15d8f617563b5677c3f2 100644 (file)
@@ -553,7 +553,7 @@ public final class NameRecord extends ContinuableRecord {
                Ptg[] ptgs = field_13_name_definition.getTokens();
                sb.append("    .Formula (nTokens=").append(ptgs.length).append("):") .append("\n");
                for (Ptg ptg : ptgs) {
-                       sb.append("       " + ptg.toString()).append(ptg.getRVAType()).append("\n");
+                       sb.append("       " + ptg).append(ptg.getRVAType()).append("\n");
                }
 
                sb.append("    .Menu text       = ").append(field_14_custom_menu_text).append("\n");
index df5f047b5e5f43448b85fc5f2600f9cb60212210..0d285b6792afe393efb3f5ce59e4adc88a25dcf8 100644 (file)
@@ -140,7 +140,7 @@ public final class ObjRecord extends Record implements Cloneable {
                sb.append("[OBJ]\n");
                if(subrecords != null) {        // there are special cases where this can be, see comments in constructor above
                        for (final SubRecord record : subrecords) {
-                               sb.append("SUBRECORD: ").append(record.toString());
+                               sb.append("SUBRECORD: ").append(record);
                        }
                }
                sb.append("[/OBJ]\n");
index 5fa318b8d0d9f652cd62d1d4397856e9528ca367..0741bb27a6c7f7ad3e510b28a762247f9b0787e6 100644 (file)
@@ -62,7 +62,7 @@ public final class PaletteRecord extends StandardRecord {
         for (int i = 0; i < _colors.size(); i++) {
             PColor c = _colors.get(i);
             buffer.append("* colornum      = ").append(i).append('\n');
-            buffer.append(c.toString());
+            buffer.append(c);
             buffer.append("/*colornum      = ").append(i).append('\n');
         }
         buffer.append("[/PALETTE]\n");
index 9acf82c80fb6874b326d94d137fc6bf76e57bb71..770f740a09f4e4080ee0b55ba1b5f86e58c4314f 100644 (file)
@@ -80,14 +80,14 @@ public final class SharedFormulaRecord extends SharedValueRecordBase {
         StringBuffer buffer = new StringBuffer();
 
         buffer.append("[SHARED FORMULA (").append(HexDump.intToHex(sid)).append("]\n");
-        buffer.append("    .range      = ").append(getRange().toString()).append("\n");
+        buffer.append("    .range      = ").append(getRange()).append("\n");
         buffer.append("    .reserved    = ").append(HexDump.shortToHex(field_5_reserved)).append("\n");
 
         Ptg[] ptgs = field_7_parsed_expr.getTokens();
         for (int k = 0; k < ptgs.length; k++ ) {
            buffer.append("Formula[").append(k).append("]");
            Ptg ptg = ptgs[k];
-           buffer.append(ptg.toString()).append(ptg.getRVAType()).append("\n");
+           buffer.append(ptg).append(ptg.getRVAType()).append("\n");
         }
 
         buffer.append("[/SHARED FORMULA]\n");
index 7c42db206ccb7d89eecbdde045dcb45cf3022dc2..4fa685190b386d5181dd730f8524bf2f30ffdb74 100644 (file)
@@ -158,7 +158,7 @@ public final class TableRecord extends SharedValueRecordBase {
        public String toString() {
                StringBuffer buffer = new StringBuffer();
                buffer.append("[TABLE]\n");
-               buffer.append("    .range    = ").append(getRange().toString()).append("\n");
+               buffer.append("    .range    = ").append(getRange()).append("\n");
                buffer.append("    .flags    = ") .append(HexDump.byteToHex(field_5_flags)).append("\n");
                buffer.append("    .alwaysClc= ").append(isAlwaysCalc()).append("\n");
                buffer.append("    .reserved = ").append(HexDump.intToHex(field_6_res)).append("\n");
index 40fd28865234eb88987dbc83c47acdd36b4aa510..1a516f31794626ff30bd245dcf40f44cea812a71 100644 (file)
@@ -199,10 +199,10 @@ public final class CFRecordsAggregate extends RecordAggregate {
 
         buffer.append("[").append(type).append("]\n");
         if( header != null ) {
-            buffer.append(header.toString());
+            buffer.append(header);
         }
         for (CFRuleBase cfRule : rules) {
-            buffer.append(cfRule.toString());
+            buffer.append(cfRule);
         }
         buffer.append("[/").append(type).append("]\n");
         return buffer.toString();
index f2ccc71e4545cac9160dafc6fff72bc7d098d500..5d36fdfb6b921b8413fc5327a373681cf7b849b9 100644 (file)
@@ -59,7 +59,7 @@ public final class SharedValueManager {
                public SharedFormulaGroup(SharedFormulaRecord sfr, CellReference firstCell) {
                        if (!sfr.isInRange(firstCell.getRow(), firstCell.getCol())) {
                                throw new IllegalArgumentException("First formula cell " + firstCell.formatAsString()
-                                               + " is not shared formula range " + sfr.getRange().toString() + ".");
+                                               + " is not shared formula range " + sfr.getRange() + ".");
                        }
                        _sfr = sfr;
                        _firstCell = firstCell;
@@ -94,7 +94,7 @@ public final class SharedValueManager {
                public final String toString() {
                        StringBuffer sb = new StringBuffer(64);
                        sb.append(getClass().getName()).append(" [");
-                       sb.append(_sfr.getRange().toString());
+                       sb.append(_sfr.getRange());
                        sb.append("]");
                        return sb.toString();
                }
index 0bc179a57153e78ee50c1c6fa19e6d7e9d316127..5197d814f9fd2b9481574e259b8020d8d8b0c7bf 100644 (file)
@@ -124,10 +124,10 @@ public final class ColorGradientFormatting implements Cloneable {
         buffer.append("          .clamp     = ").append(isClampToCurve()).append("\n");
         buffer.append("          .background= ").append(isAppliesToBackground()).append("\n");
         for (Threshold t : thresholds) {
-            buffer.append(t.toString());
+            buffer.append(t);
         }
         for (ExtendedColor c : colors) {
-            buffer.append(c.toString());
+            buffer.append(c);
         }
         buffer.append("    [/Color Gradient Formatting]\n");
         return buffer.toString();
index 6c984b278466a749ac80bd2a3b8670d052c4cb97..f2cf009666c49da8193851ac9a6d00cc615c4aa4 100644 (file)
@@ -103,7 +103,7 @@ public final class IconMultiStateFormatting implements Cloneable {
         buffer.append("          .icon_only= ").append(isIconOnly()).append("\n");
         buffer.append("          .reversed = ").append(isReversed()).append("\n");
         for (Threshold t : thresholds) {
-            buffer.append(t.toString());
+            buffer.append(t);
         }
         buffer.append("    [/Icon Formatting]\n");
         return buffer.toString();
index 7723270779a7349b21ad5051775f7700537e0036..efc3c05d67e7ac953f9403c96092f61b4f377a07 100644 (file)
@@ -78,7 +78,7 @@ public final class LinkedDataRecord extends StandardRecord implements Cloneable
         Ptg[] ptgs = field_5_formulaOfLink.getTokens();
         for (int i = 0; i < ptgs.length; i++) {
             Ptg ptg = ptgs[i];
-            buffer.append(ptg.toString()).append(ptg.getRVAType()).append('\n');
+            buffer.append(ptg).append(ptg.getRVAType()).append('\n');
         }
 
         buffer.append("[/AI]\n");
index 9e758782d213add24bdec6a2e7492636e31393c6..28ee7542c4c72183de94067b38d5b8d123e9d13f 100644 (file)
@@ -706,12 +706,12 @@ public class UnicodeString implements Comparable<UnicodeString> {
         if (field_4_format_runs != null) {
           for (int i = 0; i < field_4_format_runs.size();i++) {
             FormatRun r = field_4_format_runs.get(i);
-            buffer.append("      .format_run"+i+"          = ").append(r.toString()).append("\n");
+            buffer.append("      .format_run"+i+"          = ").append(r).append("\n");
           }
         }
         if (field_5_ext_rst != null) {
           buffer.append("    .field_5_ext_rst          = ").append("\n");
-          buffer.append( field_5_ext_rst.toString() ).append("\n");
+          buffer.append(field_5_ext_rst).append("\n");
         }
         buffer.append("[/UNICODESTRING]\n");
         return buffer.toString();
index 4e5f2809515a697a4fb0d75a261db14d93be30ac..29816093a31686e15a05ad560f82fa310bbb661b 100644 (file)
@@ -1980,7 +1980,7 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
         List<EscherRecord> escherRecords = r.getEscherRecords();
         for (EscherRecord escherRecord : escherRecords) {
             if (fat) {
-                pw.println(escherRecord.toString());
+                pw.println(escherRecord);
             } else {
                 escherRecord.display(pw, 0);
             }
index 9acd3e46822246c63112f445035f3d8fc97cca3a..4cfe3b9fe8354d5898af0de3fe3843d757870314 100644 (file)
@@ -1892,7 +1892,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
         PrintWriter w = new PrintWriter(new OutputStreamWriter(System.out, Charset.defaultCharset()));
         for (EscherRecord escherRecord : escherRecords) {
             if (fat) {
-                System.out.println(escherRecord.toString());
+                System.out.println(escherRecord);
             } else {
                 escherRecord.display(w, 0);
             }
index fe852cbb8a122aac42b948cd5dc3cef9ec6ac26c..ba60cb2fe4484ea1c18a015bd785186520ca1d5a 100644 (file)
@@ -181,7 +181,7 @@ public abstract class ChunkedCipherInputStream extends LittleEndianInputStream {
                 long skipN = (index - lastIndex) << chunkBits;
                 if (super.skip(skipN) < skipN) {
                     throw new EOFException("buffer underrun");
-                };
+                }
             }
 
             lastIndex = index + 1;
index 771a6895becadbcd0d470f340d8da94f2e0959d8..b46055b967fc7cf18ac9d946044880699b924637 100644 (file)
@@ -82,7 +82,7 @@ public class StandardEncryptionInfoBuilder implements EncryptionInfoBuilder {
             found |= (ks == keyBits);
         }
         if (!found) {
-            throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for Cipher "+cipherAlgorithm.toString());
+            throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for Cipher "+ cipherAlgorithm);
         }
         info.setHeader(new StandardEncryptionHeader(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
         info.setVerifier(new StandardEncryptionVerifier(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
index b890e02176148f1b216ad1d67fd433b8ffb1598f..52df33b72cda1dcf8c7dd86db2c7053b7be0c22d 100644 (file)
@@ -82,7 +82,7 @@ public class CellGeneralFormatter extends CellFormatter {
         } else if (value instanceof Boolean) {
             toAppendTo.append(value.toString().toUpperCase(Locale.ROOT));
         } else {
-            toAppendTo.append(value.toString());
+            toAppendTo.append(value);
         }
     }
 
index 78eb16ddbbac842952f07ad5a84f11d043b9b005..1d1c7313ca539241c479d14cf5e4fda8cf87edcb 100644 (file)
@@ -83,7 +83,7 @@ public class FormulaRenderer {
                     stack.push(attrPtg.toFormulaString(operands));
                     continue;
                 }
-                throw new RuntimeException("Unexpected tAttr: " + attrPtg.toString());
+                throw new RuntimeException("Unexpected tAttr: " + attrPtg);
             }
 
             if (ptg instanceof WorkbookDependentFormula) {
index 367dee53968a460dd2c1f7905f47e908a2faf8b2..cda98828e047775be46a8d55273180f0641d572b 100644 (file)
@@ -336,7 +336,7 @@ public final class WorkbookEvaluator {
         if (isDebugLogEnabled()) {
             String sheetName = getSheetName(sheetIndex);
             CellReference cr = new CellReference(rowIndex, columnIndex);
-            logDebug("Evaluated " + sheetName + "!" + cr.formatAsString() + " to " + result.toString());
+            logDebug("Evaluated " + sheetName + "!" + cr.formatAsString() + " to " + result);
         }
         // Usually (result === cce.getValue())
         // But sometimes: (result==ErrorEval.CIRCULAR_REF_ERROR, cce.getValue()==null)
index 68123dd9f7001272eb6e7a1a2d4f8888e8664c2a..8f8ab9138a2516e65d4b7fc2d24043c4b1d4a8dd 100644 (file)
@@ -42,5 +42,5 @@ public enum SheetVisibility {
      * <code>ThisWorkbook.Sheets("MySheetName").Visible = xlSheetVeryHidden </code>
      * </p>
      */
-    VERY_HIDDEN;
+    VERY_HIDDEN
 }
index b82d92136e65007584dd3d593a5af4be5fefa660..cbbca45cf91c7d0a56d25f809dc25d48c09211f4 100644 (file)
@@ -132,7 +132,7 @@ public class OOXMLLister implements Closeable {
                File f = new File(args[0]);
                if(! f.exists()) {
                        System.err.println("Error, file not found!");
-                       System.err.println("\t" + f.toString());
+                       System.err.println("\t" + f);
                        System.exit(2);
                }
                
@@ -141,7 +141,7 @@ public class OOXMLLister implements Closeable {
                );
 
                try {
-                       lister.disp.println(f.toString() + "\n");
+                       lister.disp.println(f + "\n");
                        lister.displayParts();
                        lister.disp.println();
                        lister.displayRelations();
index 7d80b7ac28ea31cf6ee69d98b96cef6eabb6fd71..36a7667785ad69b1c06dad9cc497ab2b499c2f00 100644 (file)
@@ -74,7 +74,7 @@ public class OOXMLPrettyPrint {
                File f = new File(args[i]);
                if(! f.exists()) {
                        System.err.println("Error, file not found!");
-                       System.err.println("\t" + f.toString());
+                       System.err.println("\t" + f);
                        System.exit(2);
                }
 
index 90ee15e2983b53639a83c46045db51585345c177..174f2f901b7775f5b29750066d5b629a6f3f45d3 100644 (file)
@@ -213,7 +213,7 @@ public final class PackageRelationship {
                StringBuilder sb = new StringBuilder();
                sb.append(id == null ? "id=null" : "id=" + id);
                sb.append(container == null ? " - container=null" : " - container="
-                               + container.toString());
+                               + container);
                sb.append(relationshipType == null ? " - relationshipType=null"
                                : " - relationshipType=" + relationshipType);
                sb.append(source == null ? " - source=null" : " - source="
@@ -221,7 +221,7 @@ public final class PackageRelationship {
                sb.append(targetUri == null ? " - target=null" : " - target="
                                + getTargetURI().toASCIIString());
                sb.append(targetMode == null ? ",targetMode=null" : ",targetMode="
-                               + targetMode.toString());
+                               + targetMode);
                return sb.toString();
        }
 }
index 6fb7f65be8dd639bcd1c421a86ace1295893a009..c315be51bfe0d3c702ada214147ee355a9aa6629 100644 (file)
@@ -617,7 +617,7 @@ public final class PackagePropertiesPart extends PackagePart implements
                        sb.append(", ").append(fStr);
                }
                throw new InvalidFormatException("Date " + dateStr + " not well formatted, "
-                       + "expected format in: "+sb.toString());
+                       + "expected format in: "+ sb);
        }
 
        /**
index 9e8d7c05c36921bdb34f8282ab1ee466e9c43be8..9b8c56ad83f1655dfdbd6c81c32199b027968421 100644 (file)
@@ -65,7 +65,7 @@ public class AgileEncryptionHeader extends EncryptionHeader implements Cloneable
             setChainingMode(ChainingMode.cfb);
             break;
         default:
-            throw new EncryptedDocumentException("Unsupported chaining mode - "+keyData.getCipherChaining().toString());
+            throw new EncryptedDocumentException("Unsupported chaining mode - "+ keyData.getCipherChaining());
         }
     
         int hashSize = keyData.getHashSize();
index 15ec609b4a05af53d18bcb8555996382a75f264b..042aad366a1afb6028d976ec78632238cd0e76c0 100644 (file)
@@ -79,7 +79,7 @@ public class AgileEncryptionInfoBuilder implements EncryptionInfoBuilder {
             found |= (ks == keyBits);
         }
         if (!found) {
-            throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for Cipher "+cipherAlgorithm.toString());
+            throw new EncryptedDocumentException("KeySize "+keyBits+" not allowed for Cipher "+ cipherAlgorithm);
         }
         info.setHeader(new AgileEncryptionHeader(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
         info.setVerifier(new AgileEncryptionVerifier(cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode));
index 186b27da50158e4a1e1252d6d97257250ebf9b20..c10dd510e2e2e37ed410b5ffc2a8d794402cf2f3 100644 (file)
@@ -105,7 +105,7 @@ public class AgileEncryptionVerifier extends EncryptionVerifier implements Clone
                 setChainingMode(ChainingMode.cfb);
                 break;
             default:
-                throw new EncryptedDocumentException("Unsupported chaining mode - "+keyData.getCipherChaining().toString());
+                throw new EncryptedDocumentException("Unsupported chaining mode - "+ keyData.getCipherChaining());
         }
         
         if (!encList.hasNext()) {
index e7d17b0b1aa4264ba7f982b58dfc045ddb30ad54..11a11eeae2ce775a2aad42218b118d91a716b81b 100644 (file)
@@ -349,14 +349,14 @@ public class XAdESXLSignatureFacet extends SignatureFacet {
 
         // create a XAdES time-stamp container
         XAdESTimeStampType xadesTimeStamp = XAdESTimeStampType.Factory.newInstance();
-        xadesTimeStamp.setId("time-stamp-" + UUID.randomUUID().toString());
+        xadesTimeStamp.setId("time-stamp-" + UUID.randomUUID());
         CanonicalizationMethodType c14nMethod = xadesTimeStamp.addNewCanonicalizationMethod();
         c14nMethod.setAlgorithm(signatureConfig.getXadesCanonicalizationMethod());
 
         // embed the time-stamp
         EncapsulatedPKIDataType encapsulatedTimeStamp = xadesTimeStamp.addNewEncapsulatedTimeStamp();
         encapsulatedTimeStamp.setByteArrayValue(timeStampToken);
-        encapsulatedTimeStamp.setId("time-stamp-token-" + UUID.randomUUID().toString());
+        encapsulatedTimeStamp.setId("time-stamp-token-" + UUID.randomUUID());
 
         return xadesTimeStamp;
     }
index e9c47b418f9c3cbc753b67b644626ffa702960ab..3c748a8f63f6fe3ff36446ff7e1890269be3bcd8 100644 (file)
@@ -89,7 +89,7 @@ public class AesZipFileZipEntrySource implements ZipEntrySource {
             zipFile.close();
             if (!tmpFile.delete()) {
                 LOG.log(POILogger.WARN, tmpFile.getAbsolutePath()+" can't be removed (or was already removed.");
-            };
+            }
         }
         closed = true;
     }
index d537a9d3a67eebd131a51bc2c47f075e62911135..398966a9694353a5b03674c783577359f577a487 100644 (file)
@@ -291,7 +291,6 @@ public final class OOXMLLite {
         if (!(destDirectory.exists() || destDirectory.mkdirs())) {
             throw new RuntimeException("Can't create destination directory: "+destDirectory);
         }
-        ;
         OutputStream destStream = new FileOutputStream(destFile);
         try {
             IOUtils.copy(srcStream, destStream);
index 379877e0d4027048ad2be2ebc7a6887185b715e2..696af1dbed9bbcc0f800d46367f8f7b85495a658 100644 (file)
@@ -26,11 +26,11 @@ public class XDGFException {
      * Creates an error message to be thrown
      */
     public static POIXMLException error(String message, Object o) {
-        return new POIXMLException(o.toString() + ": " + message);
+        return new POIXMLException(o + ": " + message);
     }
 
     public static POIXMLException error(String message, Object o, Throwable t) {
-        return new POIXMLException(o.toString() + ": " + message, t);
+        return new POIXMLException(o + ": " + message, t);
     }
 
     //
@@ -41,7 +41,6 @@ public class XDGFException {
     public static POIXMLException wrap(POIXMLDocumentPart part,
             POIXMLException e) {
         return new POIXMLException(part.getPackagePart().getPartName()
-                .toString()
                 + ": " + e.getMessage(), e.getCause() == null ? e
                         : e.getCause());
     }
index 2d65621f19b1684bdbf626bd1fa734de801473da..3192230754ebd0b1b579c749d4583f7e19fc2f09 100644 (file)
@@ -84,10 +84,10 @@ public class XDGFBaseContents extends XDGFXMLDocumentPart {
                 XDGFShape to = _shapes.get(connect.getToSheet());
 
                 if (from == null)
-                    throw new POIXMLException(this.toString() + "; Connect; Invalid from id: " + connect.getFromSheet());
+                    throw new POIXMLException(this + "; Connect; Invalid from id: " + connect.getFromSheet());
 
                 if (to == null)
-                    throw new POIXMLException(this.toString() + "; Connect; Invalid to id: " + connect.getToSheet());
+                    throw new POIXMLException(this + "; Connect; Invalid to id: " + connect.getToSheet());
 
                 _connections.add(new XDGFConnection(connect, from, to));
             }
index eb9aa9796d2258803fc81097757959327572e8c7..92fbcb0d2c49424fdf2a98cad2bf5fce009142fe 100644 (file)
@@ -62,7 +62,7 @@ public class HierarchyPrinter {
                     os.append("  ");
                 }
                 // TODO: write text?
-                os.println(shape.toString() + " [" + shape.getShapeType()
+                os.println(shape + " [" + shape.getShapeType()
                         + ", " + shape.getSymbolName() + "] "
                         + shape.getMasterShape() + " "
                         + shape.getTextAsString().trim());
index a15d90cc4d38ed0163f39002a36d7e1d8a26a4a8..09d0f20dd141aa2289f96db8a557feb7f107924d 100644 (file)
@@ -1848,7 +1848,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperti
         } else if (props instanceof CTTextCharacterProperties) {
             obj = new TextCharDelegate((CTTextCharacterProperties)props);
         } else {
-            LOG.log(POILogger.ERROR, props.getClass().toString()+" is an unknown properties type");
+            LOG.log(POILogger.ERROR, props.getClass() +" is an unknown properties type");
             return null;
         }
 
@@ -1856,7 +1856,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperti
             return (T)obj;
         }
         
-        LOG.log(POILogger.WARN, obj.getClass().toString()+" doesn't implement "+clazz.toString());
+        LOG.log(POILogger.WARN, obj.getClass() +" doesn't implement "+ clazz);
         return null;
     }
 }
index 19eba48edd15baa63a3824376962cff0a87209f8..751bd9b92fba8574f522b4ce5bde5f70852165f5 100644 (file)
@@ -142,7 +142,7 @@ public abstract class XSLFSimpleShape extends XSLFShape
                 return ((CTShapeProperties)xo).addNewXfrm();
             } else {
                 // ... group shapes have their own getXfrm()
-                LOG.log(POILogger.WARN, getClass().toString()+" doesn't have xfrm element.");
+                LOG.log(POILogger.WARN, getClass() +" doesn't have xfrm element.");
                 return null;
             }
         }
@@ -1132,7 +1132,7 @@ public abstract class XSLFSimpleShape extends XSLFShape
     private static CTLineProperties getLn(XSLFShape shape, boolean create) {
         XmlObject pr = shape.getShapeProperties();
         if (!(pr instanceof CTShapeProperties)) {
-            LOG.log(POILogger.WARN, shape.getClass().toString()+" doesn't have line properties");
+            LOG.log(POILogger.WARN, shape.getClass() +" doesn't have line properties");
             return null;
         }
         
index dcd96426170c7779f1ca5e35a70f5431364431c0..625b26aa80f5225bea7ce1291f74ff1103077215 100644 (file)
@@ -139,7 +139,7 @@ implements Slide<XSLFShape,XSLFTextParagraph> {
             }
         }
         if(_layout == null) {
-            throw new IllegalArgumentException("SlideLayout was not found for " + this.toString());
+            throw new IllegalArgumentException("SlideLayout was not found for " + this);
         }
         return _layout;
     }
index b4e53f4feb46e29874408489585cfc4a42856fff..b06dcf42bfdd34fd61fdeaefb3c88596113d3b67 100644 (file)
@@ -86,7 +86,7 @@ implements MasterSheet<XSLFShape,XSLFTextParagraph> {
             }
         }
         if (_master == null) {
-            throw new IllegalStateException("SlideMaster was not found for " + this.toString());
+            throw new IllegalStateException("SlideMaster was not found for " + this);
         }
         return _master;
     }
index b821910eaf053e59536a402741300ed127f72c68..6d4372c21af0f8e4187abe8368c51ec1b44ecc2a 100644 (file)
@@ -29,7 +29,7 @@ public class XSLFTableStyle {
     private CTTableStyle _tblStyle;
 
     public enum TablePartStyle {
-        wholeTbl, band1H, band2H, band1V, band2V, firstCol, lastCol, firstRow, lastRow, seCell, swCell, neCell, nwCell;
+        wholeTbl, band1H, band2H, band1V, band2V, firstCol, lastCol, firstRow, lastRow, seCell, swCell, neCell, nwCell
     }
     
     /*package*/ XSLFTableStyle(CTTableStyle style){
index 49278d639c24749c651873cef286011c43365099..b37c71ab7df983f3eb8f238ef26717cff21cb395 100644 (file)
@@ -316,7 +316,7 @@ public class XSSFSheetXMLHandler extends DefaultHandler {
                    break;
 
                case ERROR:
-                   thisStr = "ERROR:" + value.toString();
+                   thisStr = "ERROR:" + value;
                    break;
 
                case FORMULA:
index 3e734d481bec39aa630bae1fc33b130acfc2e91d..cec86e9669d5e774b3fd8c68234d092225d72432 100644 (file)
@@ -274,7 +274,7 @@ public class SheetDataWriter {
                     XSSFRichTextString rt = new XSSFRichTextString(cell.getStringCellValue());
                     int sRef = _sharedStringSource.addEntry(rt.getCTRst());
 
-                    _out.write(" t=\"" + STCellType.S.toString() + "\">");
+                    _out.write(" t=\"" + STCellType.S + "\">");
                     _out.write("<v>");
                     _out.write(String.valueOf(sRef));
                     _out.write("</v>");
index df47fc227b5d91464f5a6e571158bfc52c1c4487..0f2c1a186d2d75f20a80e0db5e233a2f7a574aa2 100644 (file)
@@ -184,7 +184,7 @@ public final class XSSFClientAnchor extends XSSFAnchor implements ClientAnchor {
 
     @Override
     public String toString(){
-        return "from : " + cell1.toString()  + "; to: " + cell2.toString();
+        return "from : " + cell1 + "; to: " + cell2;
     }
 
     /**
index 712e04b736432d21a96cf4367fdf661cb6f9ebb9..070f0c18a0eab8d55a93d5ddfcf744cea36916da 100644 (file)
@@ -130,7 +130,7 @@ public class XWPFWordExtractor extends POIXMLTextExtractor {
 
 
         for (IRunElement run : paragraph.getRuns()) {
-            text.append(run.toString());
+            text.append(run);
             if (run instanceof XWPFHyperlinkRun && fetchHyperlinks) {
                 XWPFHyperlink link = ((XWPFHyperlinkRun) run).getHyperlink(document);
                 if (link != null)
index 0fbc65ec00c151ac168f9e02d70172bd81f4ea8d..532a1496712c1abeae61a0197f8c4fc78895d2bd 100644 (file)
@@ -190,12 +190,12 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para
                 XWPFRun xRun = (XWPFRun) run;
                 // don't include the text if reviewing is enabled and this is a deleted run
                 if (!xRun.getCTR().isSetRsidDel()) {
-                    out.append(xRun.toString());
+                    out.append(xRun);
                 }
             } else if (run instanceof XWPFSDT) {
                 out.append(((XWPFSDT) run).getContent().getText());
             } else {
-                out.append(run.toString());
+                out.append(run);
             }
         }
         out.append(footnoteText);
@@ -400,7 +400,7 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para
     public String getParagraphText() {
         StringBuffer out = new StringBuffer();
         for (XWPFRun run : runs) {
-            out.append(run.toString());
+            out.append(run);
         }
         return out.toString();
     }
index 545ef434ff55a1ab38954bf76870561a6f786573..4aab79499562d24c7fdc91cb20185c5d16ea1b62 100644 (file)
@@ -95,7 +95,7 @@ public class XWPFSDTContent implements ISDTContent {
                 text.append(((XWPFSDT) o).getContent().getText());
                 addNewLine = true;
             } else if (o instanceof XWPFRun) {
-                text.append(((XWPFRun) o).toString());
+                text.append(((XWPFRun) o));
                 addNewLine = false;
             }
             if (addNewLine == true && i < bodyElements.size() - 1) {
@@ -126,7 +126,7 @@ public class XWPFSDTContent implements ISDTContent {
 
     private void appendParagraph(XWPFParagraph paragraph, StringBuilder text) {
         for (IRunElement run : paragraph.getRuns()) {
-            text.append(run.toString());
+            text.append(run);
         }
     }
 
index 921dc445eb05e21954b4b900930128d7157481d3..65f7585c4098d9f99497503cb24992487b1dcb02 100644 (file)
@@ -88,7 +88,7 @@ public final class TestProper {
             builder.append((char)(65 + (i % 26)));
             expected.append((char)(97 + (i % 26)));
         }
-        confirm("PROPER(\"" + builder.toString() + "\")", expected.toString());
+        confirm("PROPER(\"" + builder + "\")", expected.toString());
     }
 
     private void confirm(String formulaText, String expectedResult) {
index 0892d10176e64aba053f117d6f7338fc119b0d03..03e6d30d2da033c4b460376b6c598c2783c43c99 100644 (file)
@@ -387,7 +387,7 @@ public final class TestUnfixedBugs {
        Iterator<XSSFShape> it = shapes.iterator();
        while(it.hasNext()) {           
            XSSFShape shape = it.next();
-           str.append(", " + shape.toString());
+           str.append(", " + shape);
            str.append(", Col1:"+((XSSFClientAnchor)shape.getAnchor()).getCol1());
            str.append(", Col2:"+((XSSFClientAnchor)shape.getAnchor()).getCol2());
            str.append(", Row1:"+((XSSFClientAnchor)shape.getAnchor()).getRow1());
index 1d3f97ff8fa6c7545fc226deaa18b9a562baaf0a..9811c403bd2767f07923330658d01efc68c9388d 100644 (file)
@@ -66,7 +66,7 @@ public class TestXSSFColGrouping {
         CTCols cols = sheet.getCTWorksheet().getColsArray(0);
         logger.log(POILogger.DEBUG, "test52186/cols:" + cols);
         for (CTCol col : cols.getColArray()) {
-                       assertTrue("Col width attribute is unset: " + col.toString(), col.isSetWidth());
+                       assertTrue("Col width attribute is unset: " + col, col.isSetWidth());
                }
         
         wb2.close();
@@ -100,7 +100,7 @@ public class TestXSSFColGrouping {
         }
         cols = sheet.getCTWorksheet().getColsArray(0);
         for (CTCol col : cols.getColArray()) {
-                       assertTrue("Col width attribute is unset: " + col.toString(), col.isSetWidth());
+                       assertTrue("Col width attribute is unset: " + col, col.isSetWidth());
                }
         wb2.close();
         wb1.close();
index 88677c3476446646fbf519b3b4709cc39c44b993..b9aa8c28c149c8b9d192f648e24234b7a5b9b4a5 100644 (file)
@@ -491,7 +491,7 @@ public final class TestXSSFFormulaParser {
                             evaluator.evaluateFormulaCellEnum(cell);
                         } catch (Exception e) {
                             CellReference cellRef = new CellReference(cell.getRowIndex(), cell.getColumnIndex());
-                            throw new RuntimeException("error at: " + cellRef.toString(), e);
+                            throw new RuntimeException("error at: " + cellRef, e);
                         }
                     }
                 }
index 84161f8482afe6b16ce70d423f743b4d23d337e5..90e4ffed5a95ed0102de31d4709fa247d01c0565 100644 (file)
@@ -75,7 +75,7 @@ public class MAPIAttribute {
          hex = hex.substring(0, hex.length()-1) + ", ....]";
       }
       
-      return property.toString() + " " + hex;
+      return property + " " + hex;
    }
    
    /**
index 0669723de504c65902f4256a02db967bfe694eda..3f1827b11638cc07879cba80d6e55af4e0a41eee 100644 (file)
@@ -66,7 +66,7 @@ public final class MAPIDateAttribute extends MAPIAttribute {
        DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
        DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
        df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-       return getProperty().toString() + " " + df.format(data);
+       return getProperty() + " " + df.format(data);
    }
    
    /**
@@ -80,7 +80,7 @@ public final class MAPIDateAttribute extends MAPIAttribute {
          return ((MAPIDateAttribute)attr).getDate();
       }
       
-      logger.log(POILogger.WARN, "Warning, non date property found: " + attr.toString());
+      logger.log(POILogger.WARN, "Warning, non date property found: " + attr);
       return null;
   }
 }
index cd773838cabdb0966b169e58d6e193ea557f2e08..dfe4c2adc3bb9005048bba0f3f35cdf07b8e7715 100644 (file)
@@ -73,6 +73,6 @@ public final class MAPIRtfAttribute extends MAPIAttribute {
    }
    
    public String toString() {
-      return getProperty().toString() + " " + data;
+      return getProperty() + " " + data;
    }
 }
index ef4e16b6e751f57e59387c7c0de1737c26026997..229eb8868a30f2d4ab2d0794ab376bfa92a1bb7d 100644 (file)
@@ -60,7 +60,7 @@ public final class MAPIStringAttribute extends MAPIAttribute {
    }
    
    public String toString() {
-      return getProperty().toString() + " " + data;
+      return getProperty() + " " + data;
    }
    
    /**
@@ -77,7 +77,7 @@ public final class MAPIStringAttribute extends MAPIAttribute {
          return ((MAPIRtfAttribute)attr).getDataString();
       }
       
-      logger.log(POILogger.WARN, "Warning, non string property found: " + attr.toString());
+      logger.log(POILogger.WARN, "Warning, non string property found: " + attr);
       return null;
   }
 }
index af0ac3dcbafa9470b769fa112ecafe979c2abf91..8e386ca994d11ae70693e39700dd9f41bedd4825 100644 (file)
@@ -89,7 +89,7 @@ public class TNEFAttribute {
    }
    
    public String toString() {
-      return "Attribute " + property.toString() + ", type=" + type + 
+      return "Attribute " + property + ", type=" + type +
              ", data length=" + data.length; 
    }
 }
index faedc4c7cc595a0057d2be55e8807323cb933214..40c16cd46e94919b50a773b04d29c08dc0a19589 100644 (file)
@@ -80,7 +80,7 @@ public final class TNEFDateAttribute extends TNEFAttribute {
        DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
        DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
        df.setTimeZone(LocaleUtil.TIMEZONE_UTC);       
-      return "Attribute " + getProperty().toString() + ", type=" + getType() + 
+      return "Attribute " + getProperty() + ", type=" + getType() +
              ", date=" + df.format(data); 
    }
    
@@ -95,7 +95,7 @@ public final class TNEFDateAttribute extends TNEFAttribute {
          return ((TNEFDateAttribute)attr).getDate();
       }
       
-      logger.log(POILogger.WARN, "Warning, non date property found: " + attr.toString());
+      logger.log(POILogger.WARN, "Warning, non date property found: " + attr);
       return null;
   }
 }
index 3144981feed6f783b750a3cac73d6d8f91fbd597..9bf6d4073f15ff35e9984304b2036433a3fbfd80 100644 (file)
@@ -46,7 +46,7 @@ public final class TNEFMAPIAttribute extends TNEFAttribute {
    }
    
    public String toString() {
-      return "Attribute " + getProperty().toString() + ", type=" + getType() + 
+      return "Attribute " + getProperty() + ", type=" + getType() +
              ", " + attributes.size() + " MAPI Attributes"; 
    }
 }
index a63b0d12b6799988bd4dfc82a005f7f78f7b3e4e..23b2a0a6e1eca6255acb5d483cc310a73b0edb2d 100644 (file)
@@ -63,7 +63,7 @@ public final class TNEFStringAttribute extends TNEFAttribute {
    }
    
    public String toString() {
-      return "Attribute " + getProperty().toString() + ", type=" + getType() + 
+      return "Attribute " + getProperty() + ", type=" + getType() +
              ", data=" + getString(); 
    }
    
@@ -78,7 +78,7 @@ public final class TNEFStringAttribute extends TNEFAttribute {
          return ((TNEFStringAttribute)attr).getString();
       }
       
-      logger.log(POILogger.WARN, "Warning, non string property found: " + attr.toString());
+      logger.log(POILogger.WARN, "Warning, non string property found: " + attr);
       return null;
   }
 }
index 2e64a9ab25ef4e6cdc9d24800d9b9ad192b13db4..fd79b290cda4437fe249e20d970a23a02f3f8f5b 100644 (file)
@@ -108,7 +108,7 @@ public final class HMEFDumper {
          // Print the attribute into
          System.out.println(
                "Level " + level + " : Type " + attr.getType() +
-               " : ID " + attr.getProperty().toString()
+               " : ID " + attr.getProperty()
          );
          
          // Print the contents
index 48ad50973f19af063a2dab40cfc7bbc202c9397b..bb792394dff10258e30ee63c5adc006be6cf7492 100644 (file)
@@ -119,7 +119,7 @@ public final class HPBFDumper {
                        er.fillFields(data, 0, erf);
                        left -= er.getRecordSize();
 
-                       System.out.println(er.toString());
+                       System.out.println(er);
                }
        }
        protected void dumpEscherStm(DirectoryNode escherDir) throws IOException {
index a9fec1bdb107fc720c22820acd1a43d02bda7fdb..866d7c95ca1eca16b6af9abb2640958d0597c57f 100644 (file)
@@ -214,7 +214,7 @@ public final class PPTXMLDump {
                 } else {
                     StringWriter out = new StringWriter();
                     dump.dump(out);
-                    System.out.println(out.toString());
+                    System.out.println(out);
                 }
             }
 
index cb3fe817fa8c397347a8856ea4dc723050d8d8f9..cf7343a42f8db3e6a2c41501daeca9cf40b21017 100644 (file)
@@ -173,7 +173,7 @@ public final class SlideShowRecordDumper {
                    printEscherTextBox( (EscherTextboxRecord)er, indent );
                } else {
                    ps.print( tabs.substring(0, indent) );
-                   ps.println( er.toString() );
+                   ps.println(er);
                }
     }
 
@@ -199,7 +199,7 @@ public final class SlideShowRecordDumper {
                 StyleTextPropAtom tsp = (StyleTextPropAtom)child;
                 tsp.setParentTextSize(text.length());
             }
-            ps.println(ind+child.toString());
+            ps.println(ind+ child);
             prevChild = child;
         }
  
index 9d39d3e9db7fa04ebc3c233d00d31549f389dadc..9fa73ac5dca5d1b2000e570f8bc792435a56101f 100644 (file)
@@ -946,7 +946,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         for (int i = 0; i < cr.length; i++) {
             Record r = cr[i];
             if (r == headerAtom) {
-                // headerIdx = i;
+                // headerIdx = i;
             } else if (r == oldRecord || r == newRecord) {
                 textIdx = i;
             } else if (r == styleAtom) {
index 21b07da325e16e222cf297be3ae82b20ed618740..376898b34ee0dd777e6b793cb49ca029e271cf39 100644 (file)
@@ -1057,7 +1057,7 @@ public class MAPIProperty {
                 throw new IllegalArgumentException(
                     "Duplicate MAPI Property with ID " + id + " : "
                     + toString() + " vs "
-                    + attributes.get(id).toString());
+                    + attributes.get(id));
             }
             attributes.put(id, this);
         }
index 0566801762db96444d6f02b0ebd11c15bfafa881..e8fc07da1b884c9ef21c66b22d8521a868e43811 100644 (file)
@@ -60,7 +60,7 @@ public class HSMFDump {
                   );
                   for (PropertyValue v : props.getValues(prop)) {
                      out.println(
-                           "        = " + v.toString()
+                           "        = " + v
                      );
                   }
                }
@@ -74,7 +74,7 @@ public class HSMFDump {
                      "   " + idName + " - " + chunk.getType().getName()
                );
                out.println(
-                     "       " + chunk.toString()
+                     "       " + chunk
                );
             }
          }
index ffe44ad936a95d5de125461db31c08f468ead711..1d6165d62aeae65bbeeb58064c274ca2b0f7bd32 100644 (file)
@@ -211,7 +211,7 @@ public final class POIFSChunkParser {
                 chunk.readValue(inp);
                 grouping.record(chunk);
              } catch(IOException e) {
-                logger.log(POILogger.ERROR, "Error reading from part " + entry.getName() + " - " + e.toString());
+                logger.log(POILogger.ERROR, "Error reading from part " + entry.getName() + " - " + e);
              } finally {
                  if (inp != null) inp.close();
              }
index e370e5750699344a9758c743627f24f77a5207fb..07344c83a0c8eb523cc12fe86d5d540f737f249c 100644 (file)
@@ -109,7 +109,7 @@ public abstract class AbstractWordConverter
         public String toString()
         {
             return "Structure [" + start + "; " + end + "): "
-                    + structure.toString();
+                    + structure;
         }
     }
 
index 65ec6b9178044009b4412a5b731714df1cefa093..7fe2686165007a4db495506b213df03f0ec7fff7 100644 (file)
@@ -376,7 +376,7 @@ public final class HWPFLister
                 while ( sprmIt.hasNext() )
                 {
                     SprmOperation sprm = sprmIt.next();
-                    System.out.println( "\t" + sprm.toString() );
+                    System.out.println( "\t" + sprm);
                 }
             }
 
@@ -624,7 +624,7 @@ public final class HWPFLister
         while ( sprmIt.hasNext() )
         {
             SprmOperation sprm = sprmIt.next();
-            System.out.println( linePrefix + sprm.toString() );
+            System.out.println( linePrefix + sprm);
         }
     }
 
@@ -634,7 +634,7 @@ public final class HWPFLister
         for ( int p = 0; p < range.numParagraphs(); p++ )
         {
             Paragraph paragraph = range.getParagraph( p );
-            System.out.println( p + ":\t" + paragraph.toString() );
+            System.out.println( p + ":\t" + paragraph);
 
             if ( withText )
                 System.out.println( paragraph.text() );
@@ -653,7 +653,7 @@ public final class HWPFLister
                 .getAllPictures();
         for ( Picture picture : allPictures )
         {
-            System.out.println( picture.toString() );
+            System.out.println(picture);
         }
     }
 
index e993efcef7a482b3194feb11b13654602548385b..f5b0dbcf4a7f04cbe32d012310fc582921109e0a 100644 (file)
@@ -71,7 +71,7 @@ public final class EscherRecordHolder {
                Iterator<EscherRecord> iterator = escherRecords.iterator();
                while (iterator.hasNext()) {
                        EscherRecord r = iterator.next();
-                       buffer.append(r.toString());
+                       buffer.append(r);
                }
                return buffer.toString();
        }
index c192b3ef5c44c64f7d13f46523f3db0ab0a6c3e4..37c12c465e0d5f9b6411177698dc36ae4ae6e5f9 100644 (file)
@@ -97,12 +97,12 @@ public final class FSPATable
                 .entrySet() )
         {
             Integer i = entry.getKey();
-            buf.append( "  " ).append( i.toString() ).append( " => \t" );
+            buf.append( "  " ).append(i).append( " => \t" );
 
             try
             {
                 FSPA fspa = getFspaFromCp( i.intValue() );
-                buf.append( fspa.toString() );
+                buf.append(fspa);
             }
             catch ( Exception exc )
             {
index 732879add051c2c1ecb4285bef02fd942bba88ec..9e464f7bb14993cf37a9fe4dab16cd2bff067ed1 100644 (file)
@@ -289,7 +289,7 @@ public class OfficeDrawingsImpl implements OfficeDrawings
             @Override
             public String toString()
             {
-                return "OfficeDrawingImpl: " + fspa.toString();
+                return "OfficeDrawingImpl: " + fspa;
             }
         };
     }
index ddf77801669c9d7fea8834296ea27df560361c7f..7f8b4d3ed736048a483090cc16952d5a24ec6826 100644 (file)
@@ -83,7 +83,7 @@ public class TestFieldsTables extends HWPFTestCase {
     private String dumpPlexes(ArrayList<PlexOfField> fieldsPlexes) {
         StringBuilder dump = new StringBuilder();
         for (PlexOfField flds : fieldsPlexes) {
-            dump.append(flds.toString() + "\n");
+            dump.append(flds + "\n");
         }
         return dump.toString();
     }
index a0db23085aa16b9399b6290cd5c43b9d99046d80..51556b6bc50ffe1a89997b30bff5ca24c7e6d71d 100644 (file)
@@ -64,7 +64,7 @@ public class AllDataFilesTester {
             }});
         for (final File doc : docs) {
             final Logger logger = Logger.getLogger(getClass().getName());
-            logger.info("Processing file \" " + doc.toString() + "\".");
+            logger.info("Processing file \" " + doc + "\".");
 
             /* Execute the test task. */
             task.runTest(doc);
index 467186c2948b2ff6d05a507fa547cd3b41591aaa..a0b0b8a9aef5250a7c6c16a7166e03a344b14c9a 100644 (file)
@@ -126,7 +126,7 @@ public final class TestOperandClassTransformer extends TestCase {
                }
                if (operandClass != ptg.getPtgClass()) {
                        throw new AssertionFailedError("Wrong operand class for ptg ("
-                                       + ptg.toString() + "). Expected " + getOperandClassName(operandClass)
+                                       + ptg + "). Expected " + getOperandClassName(operandClass)
                                        + " but got " + getOperandClassName(ptg.getPtgClass()));
                }
        }
index 4869d87d6177ecec990cf369eb4ff4af0396ead4..ec090bd537354a352fb113045c38d51ec9db02de 100644 (file)
@@ -125,7 +125,7 @@ public final class TestRVA {
                        if (poiPtg.isBaseToken()) {
                                continue;
                        }
-                       sb.append("  token[" + i + "] " + excelPtg.toString() + " "
+                       sb.append("  token[" + i + "] " + excelPtg + " "
                                        + excelPtg.getRVAType());
 
                        if (excelPtg.getPtgClass() != poiPtg.getPtgClass()) {
index f02b950f84ad26305585e6309a6cc0621bed9764..62d20273dfc3ba1a9ab0e9a9dcb1232bdc6d68aa 100644 (file)
@@ -439,7 +439,7 @@ public final class TestCellStyle extends TestCase {
                             if (cell.getCellTypeEnum() == CellType.NUMERIC) {
                                 boolean isDate = HSSFDateUtil.isCellDateFormatted(cell);
                                 if (idxCell > 0 && isDate) {
-                                    fail("cell " + idxCell + " is not a date: " + idxCell.toString());
+                                    fail("cell " + idxCell + " is not a date: " + idxCell);
                                 }
                             }
                         }
index 9e8c4a3ef0c3a6235879011256980cd714bf1629..ebdbe9ca41e827057a5db93fd966f0a3bdeb08e6 100644 (file)
@@ -91,7 +91,7 @@ public final class TestFormulaEvaluatorBugs {
             FileOutputStream out = new FileOutputStream(existing);
             wb.write(out);
             out.close();
-            System.err.println("Existing file for bug #44636 written to " + existing.toString());
+            System.err.println("Existing file for bug #44636 written to " + existing);
         }
         wb.close();
         
@@ -115,7 +115,7 @@ public final class TestFormulaEvaluatorBugs {
             FileOutputStream out = new FileOutputStream(scratch);
             wb.write(out);
             out.close();
-            System.err.println("New file for bug #44636 written to " + scratch.toString());
+            System.err.println("New file for bug #44636 written to " + scratch);
         }
         wb.close();
     }
index 9db99b1e56eeae51cd9033908bbaefacb7905061..f3128579c356595f3004a7b170a0d80458c90147 100644 (file)
@@ -282,9 +282,9 @@ public final class TestMultiSheetEval extends TestCase {
                        e.printStackTrace(ps);
                }
                endIx -= 4; // skip 4 frames of reflection invocation
-               ps.println(e.toString());
+               ps.println(e);
                for(int i=startIx; i<endIx; i++) {
-                       ps.println("\tat " + stes[i].toString());
+                       ps.println("\tat " + stes[i]);
                }
        }
 
index 134975e209e2fb01d28ac689e60be48a3abb9ae4..0ea6943c0bc0c0b6aecf9261963a2c1e21eb9f9c 100644 (file)
@@ -43,7 +43,7 @@ public final class TestBin2Dec extends TestCase {
 
     private static void confirmValue(String msg, String number1, String expected) {
                ValueEval result = invokeValue(number1);
-               assertEquals("Had: " + result.toString(), NumberEval.class, result.getClass());
+               assertEquals("Had: " + result, NumberEval.class, result.getClass());
                assertEquals(msg, expected, ((NumberEval) result).getStringValue());
        }
 
index c12dbe9e02f4269fa6accef891d9ec386ad055c2..724029d99da64c6d71cab839e529ba0aa61d4fa4 100644 (file)
@@ -51,7 +51,7 @@ public final class TestDec2Bin extends TestCase {
 
     private static void confirmValue(String msg, String number1, String expected) {
                ValueEval result = invokeValue(number1);
-               assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+               assertEquals("Had: " + result, StringEval.class, result.getClass());
                assertEquals(msg, expected, ((StringEval) result).getStringValue());
        }
 
@@ -128,7 +128,7 @@ public final class TestDec2Bin extends TestCase {
         ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
         ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
 
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+        assertEquals("Had: " + result, StringEval.class, result.getClass());
         assertEquals("1101", ((StringEval) result).getStringValue());
     }
 
@@ -138,7 +138,7 @@ public final class TestDec2Bin extends TestCase {
         ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
         ValueEval result = new Dec2Bin().evaluate(args, -1, -1);
 
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+        assertEquals("Had: " + result, StringEval.class, result.getClass());
         // TODO: documentation and behavior do not match here!
         assertEquals("1101", ((StringEval) result).getStringValue());
     }
@@ -149,7 +149,7 @@ public final class TestDec2Bin extends TestCase {
         ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
         ValueEval result = new Dec2Bin().evaluate(args, ctx);
 
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+        assertEquals("Had: " + result, StringEval.class, result.getClass());
         // TODO: documentation and behavior do not match here!
         assertEquals("1101", ((StringEval) result).getStringValue());
     }
@@ -227,11 +227,11 @@ public final class TestDec2Bin extends TestCase {
     public void testBackAndForth() {
         for (int i = -512; i < 512; i++) {
             ValueEval result = invokeValue(Integer.toString(i));
-            assertEquals("Had: " + result.toString(), StringEval.class,
+            assertEquals("Had: " + result, StringEval.class,
                     result.getClass());
 
             ValueEval back = invokeBack(((StringEval) result).getStringValue());
-            assertEquals("Had: " + back.toString(), NumberEval.class,
+            assertEquals("Had: " + back, NumberEval.class,
                     back.getClass());
 
             assertEquals(Integer.toString(i),
index 6084d652d8b6dae0bce9ecc7d53190d85c2f2c9d..ece511035b1bc88066c70e49f243f65bf80fc74a 100644 (file)
@@ -153,7 +153,7 @@ public final class TestDec2Hex extends TestCase {
         ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0) };
         ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
 
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+        assertEquals("Had: " + result, StringEval.class, result.getClass());
         assertEquals("7B", ((StringEval) result).getStringValue());
     }
 
@@ -163,7 +163,7 @@ public final class TestDec2Hex extends TestCase {
         ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
         ValueEval result = new Dec2Hex().evaluate(args, -1, -1);
 
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+        assertEquals("Had: " + result, StringEval.class, result.getClass());
         assertEquals("0000007B", ((StringEval) result).getStringValue());
     }
 
@@ -173,7 +173,7 @@ public final class TestDec2Hex extends TestCase {
         ValueEval[] args = new ValueEval[] { ctx.getRefEval(0, 0), ctx.getRefEval(0, 1) };
         ValueEval result = new Dec2Hex().evaluate(args, ctx);
 
-        assertEquals("Had: " + result.toString(), StringEval.class, result.getClass());
+        assertEquals("Had: " + result, StringEval.class, result.getClass());
         assertEquals("0000007B", ((StringEval) result).getStringValue());
     }
 
@@ -230,11 +230,11 @@ public final class TestDec2Hex extends TestCase {
     public void testBackAndForth() {
         for (int i = -512; i < 512; i++) {
             ValueEval result = invokeValue(Integer.toString(i));
-            assertEquals("Had: " + result.toString(), StringEval.class,
+            assertEquals("Had: " + result, StringEval.class,
                     result.getClass());
 
             ValueEval back = invokeBack(((StringEval) result).getStringValue());
-            assertEquals("Had: " + back.toString(), NumberEval.class,
+            assertEquals("Had: " + back, NumberEval.class,
                     back.getClass());
 
             assertEquals(Integer.toString(i),
index 40fac0dea6d73ef38b0b91a0120cb7b7ce3ff5e8..a540857b014237449773878392fb3a2abac80f70 100644 (file)
@@ -120,7 +120,7 @@ public final class TestIrr extends TestCase {
         }
 
         if(failures.length() > 0) {
-            throw new AssertionFailedError(failureCount + " IRR assertions failed:\n" + failures.toString());
+            throw new AssertionFailedError(failureCount + " IRR assertions failed:\n" + failures);
         }
 
     }
@@ -128,7 +128,7 @@ public final class TestIrr extends TestCase {
     private static void assertFormulaResult(CellValue cv, HSSFCell cell){
         double actualValue = cv.getNumberValue();
         double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel
-        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());
+        assertEquals("Invalid formula result: " + cv, CellType.NUMERIC, cv.getCellTypeEnum());
         assertEquals(expectedValue, actualValue, 1E-4); // should agree within 0.01%
     }
 }
index f38bff7fc14472790c7e51d076529a123cb66e45..32f078fe325905f0e9ef9d65b71db4ecc99e464e 100644 (file)
@@ -154,7 +154,7 @@ public final class TestMirr extends TestCase {
         assertEquals(ErrorEval.DIV_ZERO.getErrorCode(), cv.getErrorValue());
 
         if (failures.length() > 0) {
-            throw new AssertionFailedError(failureCount + " IRR assertions failed:\n" + failures.toString());
+            throw new AssertionFailedError(failureCount + " IRR assertions failed:\n" + failures);
         }
 
     }
@@ -162,7 +162,7 @@ public final class TestMirr extends TestCase {
     private static void assertFormulaResult(CellValue cv, HSSFCell cell) {
         double actualValue = cv.getNumberValue();
         double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel
-        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());
+        assertEquals("Invalid formula result: " + cv, CellType.NUMERIC, cv.getCellTypeEnum());
         assertEquals(expectedValue, actualValue, 1E-8);
     }
 }
index f26b70f16264a8114bad95f06f1dfbfa24f7306e..34aa877723973f01835108f96188ba0538cc73ef 100644 (file)
@@ -90,7 +90,7 @@ public final class TestNpv extends TestCase {
         }
 
         if(failures.length() > 0) {
-            throw new AssertionFailedError(failureCount + " IRR evaluations failed:\n" + failures.toString());
+            throw new AssertionFailedError(failureCount + " IRR evaluations failed:\n" + failures);
         }
     }
 
index 24d347270a09e66c0deb88c6083bd94ddb5d65b9..81968663a9c85a62fac72cf7db1755032a1a09e9 100644 (file)
@@ -35,7 +35,7 @@ public final class TestOffset extends TestCase {
                try {
                        assertEquals(expected, Offset.evaluateIntArg(new NumberEval(doubleVal), -1, -1));
                } catch (EvaluationException e) {
-                       throw new AssertionFailedError("Unexpected error '" + e.getErrorEval().toString() + "'.");
+                       throw new AssertionFailedError("Unexpected error '" + e.getErrorEval() + "'.");
                }
        }
        /**
index f408a42ed883baa1c1731c249be2c5af52732cc0..0e4bd8224be252807e6624049e1c0ab1c69ad7a4 100644 (file)
@@ -41,7 +41,7 @@ public final class TestPmt {
        private static NumberEval invokeNormal(ValueEval[] args) {
                ValueEval ev = invoke(args);
                if(ev instanceof ErrorEval) {
-                       fail("Normal evaluation failed with error code: " + ev.toString());
+                       fail("Normal evaluation failed with error code: " + ev);
                }
                return (NumberEval) ev;
        }
index 9222f6043006c17efadcd6f6648c265041ee7313..aaf927246743967f3df7c4fd4a79aca48e4bfce6 100644 (file)
@@ -778,10 +778,10 @@ public abstract class BaseTestWorkbook {
                for(int i = 0;i < wb.getNumberOfSheets();i++) {
                        sheetNames.append(wb.getSheetAt(i).getSheetName()).append(",");
                }
-               assertEquals("Had: " + sheetNames.toString(), 
+               assertEquals("Had: " + sheetNames,
                                sheets.length, wb.getNumberOfSheets());
                for(int i = 0;i < wb.getNumberOfSheets();i++) {
-                       assertEquals("Had: " + sheetNames.toString(), 
+                       assertEquals("Had: " + sheetNames,
                                        sheets[i], wb.getSheetAt(i).getSheetName());
                }
        }
index d4d63192d0a41feed164b338da754e5713df31d7..c310f4a78da108f8c4bd1955bfd66a996e1bc2d6 100644 (file)
@@ -134,7 +134,7 @@ public final class TestExpandedDouble {
 
                // but bigger errors are a concern
                System.out.println("example[" + i + "] ("
-                               + formatDoubleAsHex(a) + ") frac mismatch: " + diff.toString());
+                               + formatDoubleAsHex(a) + ") frac mismatch: " + diff);
 
                for (int j=-2; j<3; j++) {
                        System.out.println((j<0?"":"+") + j + ": " + getNearby(ed1, j));
index ec9792a259fe6058dc669a5c1c2f3d6331e1bb1f..76f934f1488c7eeaf25efac5f74245607b0283d8 100644 (file)
@@ -173,7 +173,7 @@ public class TestStringUtil {
         assertTrue("longer string", StringUtil.startsWithIgnoreCase("Apache POI project", "Apache POI"));
         assertTrue("different case", StringUtil.startsWithIgnoreCase("APACHE POI", "Apache POI"));
         assertFalse("leading whitespace should not be ignored", StringUtil.startsWithIgnoreCase(" Apache POI project", "Apache POI"));
-        assertFalse("shorter string", StringUtil.startsWithIgnoreCase("Apache", "Apache POI"));;
+        assertFalse("shorter string", StringUtil.startsWithIgnoreCase("Apache", "Apache POI"));
     }
     
     @Test