Author: centic
Date: Mon Apr 17 20:13:52 2017
New Revision: 1791720
URL: http://svn.apache.org/viewvc?rev=1791720&view=rev
Log:
Let IntelliJ cleanup some code-warnings across the whole code-base: unnecessary
toString or semicolon
Modified:
poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java
poi/trunk/src/java/org/apache/poi/ddf/EscherDump.java
poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
poi/trunk/src/java/org/apache/poi/hpsf/Property.java
poi/trunk/src/java/org/apache/poi/hpsf/Section.java
poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
poi/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
poi/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java
poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java
poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
poi/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
Modified:
poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
(original)
+++ poi/trunk/src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java
Mon Apr 17 20:13:52 2017
@@ -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();
Modified:
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
(original)
+++
poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
Mon Apr 17 20:13:52 2017
@@ -159,7 +159,7 @@ public class PropertySetDescriptorRender
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");
}
Modified:
poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
(original)
+++
poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CheckFunctionsSupported.java
Mon Apr 17 20:13:52 2017
@@ -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));
}
}
}
Modified:
poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
(original)
+++
poi/trunk/src/examples/src/org/apache/poi/xssf/usermodel/examples/IterateCells.java
Mon Apr 17 20:13:52 2017
@@ -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);
}
}
}
Modified:
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
(original)
+++
poi/trunk/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
Mon Apr 17 20:13:52 2017
@@ -198,9 +198,9 @@ public class TestExcelAntWorkbookUtil ex
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 ex
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 ex
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());
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
(original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
Mon Apr 17 20:13:52 2017
@@ -40,10 +40,10 @@ public class HMEFFileHandler extends Abs
// 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());
}
Modified: poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java Mon Apr
17 20:13:52 2017
@@ -207,7 +207,7 @@ public abstract class AbstractEscherOptR
for ( EscherProperty property : properties )
{
- stringBuilder.append("
").append(property.toString()).append(nl);
+ stringBuilder.append(" ").append(property).append(nl);
}
return stringBuilder.toString();
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java Mon Apr 17
20:13:52 2017
@@ -134,7 +134,7 @@ public final class EscherArrayProperty e
+ ", propName: " + EscherProperties.getPropertyName(
getPropertyNumber() )
+ ", complex: " + isComplex()
+ ", blipId: " + isBlipId()
- + ", data: " + '\n' + results.toString();
+ + ", data: " + '\n' + results;
}
@Override
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java Mon Apr 17
20:13:52 2017
@@ -294,7 +294,7 @@ public final class EscherContainerRecord
+ " instance: 0x" + HexDump.toHex( getInstance() ) + nl
+ " recordId: 0x" + HexDump.toHex( getRecordId() ) + nl
+ " numchildren: " + _childRecords.size() + nl
- + children.toString();
+ + children;
}
@Override
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherDggRecord.java Mon Apr 17
20:13:52 2017
@@ -145,7 +145,7 @@ public final class EscherDggRecord exten
" NumIdClusters: " + getNumIdClusters() + '\n' +
" NumShapesSaved: " + field_3_numShapesSaved + '\n' +
" DrawingsSaved: " + field_4_drawingsSaved + '\n' +
- "" + field_5_string.toString();
+ "" + field_5_string;
}
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherDump.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherDump.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherDump.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherDump.java Mon Apr 17 20:13:52
2017
@@ -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 );
Modified: poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/UnknownEscherRecord.java Mon Apr 17
20:13:52 2017
@@ -136,7 +136,7 @@ public final class UnknownEscherRecord e
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 e
" recordId: 0x" + HexDump.toHex( getRecordId() ) + '\n' +
" numchildren: " + getChildRecords().size() + '\n' +
theDumpHex +
- children.toString();
+ children;
}
@Override
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Property.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Property.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Property.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Property.java Mon Apr 17 20:13:52
2017
@@ -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();
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Section.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Section.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Section.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Section.java Mon Apr 17 20:13:52 2017
@@ -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(']');
Modified: poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java Mon Apr 17
20:13:52 2017
@@ -331,9 +331,9 @@ public class VariantSupport extends Vari
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;
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java Mon Apr 17
20:13:52 2017
@@ -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();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java Mon Apr 17
20:13:52 2017
@@ -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();
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java Mon Apr 17
20:13:52 2017
@@ -132,7 +132,7 @@ public class FormulaViewer
}
buf.append(sep);
buf.append(numArg);
- System.out.println(buf.toString());
+ System.out.println(buf);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java Mon
Apr 17 20:13:52 2017
@@ -342,7 +342,7 @@ public class ExcelExtractor extends POIO
case STRING:
HSSFRichTextString str = cell.getRichStringCellValue();
if(str != null && str.length() > 0) {
-
text.append(str.toString());
+
text.append(str);
}
break;
case NUMERIC:
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
Mon Apr 17 20:13:52 2017
@@ -91,7 +91,7 @@ public abstract class AbstractEscherHold
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);
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java Mon Apr 17
20:13:52 2017
@@ -81,14 +81,14 @@ public final class ArrayRecord extends S
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();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java Mon Apr 17
20:13:52 2017
@@ -130,7 +130,7 @@ public abstract class CFHeaderBase exten
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java Mon Apr
17 20:13:52 2017
@@ -425,13 +425,13 @@ public final class CFRule12Record extend
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java Mon Apr 17
20:13:52 2017
@@ -141,13 +141,13 @@ public final class CFRuleRecord extends
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DVRecord.java Mon Apr 17
20:13:52 2017
@@ -283,7 +283,7 @@ public final class DVRecord extends Stan
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');
}
}
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
Mon Apr 17 20:13:52 2017
@@ -316,7 +316,7 @@ public final class EmbeddedObjectRefSubR
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java Mon Apr
17 20:13:52 2017
@@ -329,7 +329,7 @@ public final class EscherAggregate exten
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);
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java Mon
Apr 17 20:13:52 2017
@@ -133,7 +133,7 @@ public class ExternSheetRecord extends S
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java Mon
Apr 17 20:13:52 2017
@@ -222,7 +222,7 @@ public final class ExternalNameRecord ex
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormulaRecord.java Mon Apr 17
20:13:52 2017
@@ -380,7 +380,7 @@ public final class FormulaRecord extends
}
sb.append(" Ptg[").append(k).append("]=");
Ptg ptg = ptgs[k];
- sb.append(ptg.toString()).append(ptg.getRVAType());
+ sb.append(ptg).append(ptg.getRVAType());
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java Mon Apr
17 20:13:52 2017
@@ -271,14 +271,14 @@ public class LbsDataSubRecord extends Su
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();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java Mon Apr 17
20:13:52 2017
@@ -553,7 +553,7 @@ public final class NameRecord extends Co
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ObjRecord.java Mon Apr 17
20:13:52 2017
@@ -140,7 +140,7 @@ public final class ObjRecord extends Rec
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/PaletteRecord.java Mon Apr 17
20:13:52 2017
@@ -62,7 +62,7 @@ public final class PaletteRecord extends
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java Mon
Apr 17 20:13:52 2017
@@ -80,14 +80,14 @@ public final class SharedFormulaRecord e
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");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/TableRecord.java Mon Apr 17
20:13:52 2017
@@ -158,7 +158,7 @@ public final class TableRecord extends S
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");
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
Mon Apr 17 20:13:52 2017
@@ -199,10 +199,10 @@ public final class CFRecordsAggregate ex
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();
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
Mon Apr 17 20:13:52 2017
@@ -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();
}
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
Mon Apr 17 20:13:52 2017
@@ -124,10 +124,10 @@ public final class ColorGradientFormatti
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();
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
Mon Apr 17 20:13:52 2017
@@ -103,7 +103,7 @@ public final class IconMultiStateFormatt
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();
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
Mon Apr 17 20:13:52 2017
@@ -78,7 +78,7 @@ public final class LinkedDataRecord exte
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");
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java Mon
Apr 17 20:13:52 2017
@@ -706,12 +706,12 @@ public class UnicodeString implements Co
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();
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Mon Apr 17
20:13:52 2017
@@ -1980,7 +1980,7 @@ public final class HSSFSheet implements
List<EscherRecord> escherRecords = r.getEscherRecords();
for (EscherRecord escherRecord : escherRecords) {
if (fat) {
- pw.println(escherRecord.toString());
+ pw.println(escherRecord);
} else {
escherRecord.display(pw, 0);
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Mon Apr
17 20:13:52 2017
@@ -1892,7 +1892,7 @@ public final class HSSFWorkbook extends
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);
}
Modified:
poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
Mon Apr 17 20:13:52 2017
@@ -181,7 +181,7 @@ public abstract class ChunkedCipherInput
long skipN = (index - lastIndex) << chunkBits;
if (super.skip(skipN) < skipN) {
throw new EOFException("buffer underrun");
- };
+ }
}
lastIndex = index + 1;
Modified:
poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
(original)
+++
poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
Mon Apr 17 20:13:52 2017
@@ -82,7 +82,7 @@ public class StandardEncryptionInfoBuild
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));
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java Mon
Apr 17 20:13:52 2017
@@ -82,7 +82,7 @@ public class CellGeneralFormatter extend
} else if (value instanceof Boolean) {
toAppendTo.append(value.toString().toUpperCase(Locale.ROOT));
} else {
- toAppendTo.append(value.toString());
+ toAppendTo.append(value);
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/FormulaRenderer.java Mon Apr
17 20:13:52 2017
@@ -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) {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java Mon Apr
17 20:13:52 2017
@@ -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)
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java Mon Apr
17 20:13:52 2017
@@ -42,5 +42,5 @@ public enum SheetVisibility {
* <code>ThisWorkbook.Sheets("MySheetName").Visible = xlSheetVeryHidden
</code>
* </p>
*/
- VERY_HIDDEN;
+ VERY_HIDDEN
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java Mon Apr 17
20:13:52 2017
@@ -132,7 +132,7 @@ public class OOXMLLister implements Clos
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 Clos
);
try {
- lister.disp.println(f.toString() + "\n");
+ lister.disp.println(f + "\n");
lister.displayParts();
lister.disp.println();
lister.displayRelations();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/dev/OOXMLPrettyPrint.java Mon Apr
17 20:13:52 2017
@@ -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);
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
Mon Apr 17 20:13:52 2017
@@ -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();
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
Mon Apr 17 20:13:52 2017
@@ -617,7 +617,7 @@ public final class PackagePropertiesPart
sb.append(", ").append(fStr);
}
throw new InvalidFormatException("Date " + dateStr + " not well
formatted, "
- + "expected format in: "+sb.toString());
+ + "expected format in: "+ sb);
}
/**
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
Mon Apr 17 20:13:52 2017
@@ -65,7 +65,7 @@ public class AgileEncryptionHeader exten
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();
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
Mon Apr 17 20:13:52 2017
@@ -79,7 +79,7 @@ public class AgileEncryptionInfoBuilder
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));
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
Mon Apr 17 20:13:52 2017
@@ -105,7 +105,7 @@ public class AgileEncryptionVerifier ext
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()) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
Mon Apr 17 20:13:52 2017
@@ -349,14 +349,14 @@ public class XAdESXLSignatureFacet exten
// 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;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
Mon Apr 17 20:13:52 2017
@@ -89,7 +89,7 @@ public class AesZipFileZipEntrySource im
zipFile.close();
if (!tmpFile.delete()) {
LOG.log(POILogger.WARN, tmpFile.getAbsolutePath()+" can't be
removed (or was already removed.");
- };
+ }
}
closed = true;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/util/OOXMLLite.java Mon Apr 17
20:13:52 2017
@@ -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);
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
Mon Apr 17 20:13:52 2017
@@ -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());
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
Mon Apr 17 20:13:52 2017
@@ -84,10 +84,10 @@ public class XDGFBaseContents extends XD
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));
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java Mon
Apr 17 20:13:52 2017
@@ -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());
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
Mon Apr 17 20:13:52 2017
@@ -1848,7 +1848,7 @@ import org.openxmlformats.schemas.presen
} 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.presen
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;
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
Mon Apr 17 20:13:52 2017
@@ -142,7 +142,7 @@ public abstract class XSLFSimpleShape ex
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 ex
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;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java Mon
Apr 17 20:13:52 2017
@@ -139,7 +139,7 @@ implements Slide<XSLFShape,XSLFTextParag
}
}
if(_layout == null) {
- throw new IllegalArgumentException("SlideLayout was not found for
" + this.toString());
+ throw new IllegalArgumentException("SlideLayout was not found for
" + this);
}
return _layout;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
Mon Apr 17 20:13:52 2017
@@ -86,7 +86,7 @@ implements MasterSheet<XSLFShape,XSLFTex
}
}
if (_master == null) {
- throw new IllegalStateException("SlideMaster was not found for " +
this.toString());
+ throw new IllegalStateException("SlideMaster was not found for " +
this);
}
return _master;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
Mon Apr 17 20:13:52 2017
@@ -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){
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
Mon Apr 17 20:13:52 2017
@@ -316,7 +316,7 @@ public class XSSFSheetXMLHandler extends
break;
case ERROR:
- thisStr = "ERROR:" + value.toString();
+ thisStr = "ERROR:" + value;
break;
case FORMULA:
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
Mon Apr 17 20:13:52 2017
@@ -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>");
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
Mon Apr 17 20:13:52 2017
@@ -184,7 +184,7 @@ public final class XSSFClientAnchor exte
@Override
public String toString(){
- return "from : " + cell1.toString() + "; to: " + cell2.toString();
+ return "from : " + cell1 + "; to: " + cell2;
}
/**
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
Mon Apr 17 20:13:52 2017
@@ -130,7 +130,7 @@ public class XWPFWordExtractor extends P
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)
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
Mon Apr 17 20:13:52 2017
@@ -190,12 +190,12 @@ public class XWPFParagraph implements IB
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 IB
public String getParagraphText() {
StringBuffer out = new StringBuffer();
for (XWPFRun run : runs) {
- out.append(run.toString());
+ out.append(run);
}
return out.toString();
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
Mon Apr 17 20:13:52 2017
@@ -95,7 +95,7 @@ public class XWPFSDTContent implements I
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 I
private void appendParagraph(XWPFParagraph paragraph, StringBuilder text) {
for (IRunElement run : paragraph.getRuns()) {
- text.append(run.toString());
+ text.append(run);
}
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
Mon Apr 17 20:13:52 2017
@@ -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) {
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
Mon Apr 17 20:13:52 2017
@@ -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());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
