You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/04/17 20:13:54 UTC
svn commit: r1791720 [2/2] - in /poi/trunk/src:
examples/src/org/apache/poi/hpsf/examples/
examples/src/org/apache/poi/poifs/poibrowser/
examples/src/org/apache/poi/ss/examples/formula/
examples/src/org/apache/poi/xssf/usermodel/examples/ excelant/test...
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java Mon Apr 17 20:13:52 2017
@@ -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();
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java Mon Apr 17 20:13:52 2017
@@ -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);
}
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java Mon Apr 17 20:13:52 2017
@@ -75,7 +75,7 @@ public class MAPIAttribute {
hex = hex.substring(0, hex.length()-1) + ", ....]";
}
- return property.toString() + " " + hex;
+ return property + " " + hex;
}
/**
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java Mon Apr 17 20:13:52 2017
@@ -66,7 +66,7 @@ public final class MAPIDateAttribute ext
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 ext
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;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java Mon Apr 17 20:13:52 2017
@@ -73,6 +73,6 @@ public final class MAPIRtfAttribute exte
}
public String toString() {
- return getProperty().toString() + " " + data;
+ return getProperty() + " " + data;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java Mon Apr 17 20:13:52 2017
@@ -60,7 +60,7 @@ public final class MAPIStringAttribute e
}
public String toString() {
- return getProperty().toString() + " " + data;
+ return getProperty() + " " + data;
}
/**
@@ -77,7 +77,7 @@ public final class MAPIStringAttribute e
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;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java Mon Apr 17 20:13:52 2017
@@ -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;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java Mon Apr 17 20:13:52 2017
@@ -80,7 +80,7 @@ public final class TNEFDateAttribute ext
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 ext
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;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java Mon Apr 17 20:13:52 2017
@@ -46,7 +46,7 @@ public final class TNEFMAPIAttribute ext
}
public String toString() {
- return "Attribute " + getProperty().toString() + ", type=" + getType() +
+ return "Attribute " + getProperty() + ", type=" + getType() +
", " + attributes.size() + " MAPI Attributes";
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java Mon Apr 17 20:13:52 2017
@@ -63,7 +63,7 @@ public final class TNEFStringAttribute e
}
public String toString() {
- return "Attribute " + getProperty().toString() + ", type=" + getType() +
+ return "Attribute " + getProperty() + ", type=" + getType() +
", data=" + getString();
}
@@ -78,7 +78,7 @@ public final class TNEFStringAttribute e
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;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java Mon Apr 17 20:13:52 2017
@@ -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
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java Mon Apr 17 20:13:52 2017
@@ -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 {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java Mon Apr 17 20:13:52 2017
@@ -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);
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java Mon Apr 17 20:13:52 2017
@@ -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;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Mon Apr 17 20:13:52 2017
@@ -946,7 +946,7 @@ public final class HSLFTextParagraph imp
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) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java Mon Apr 17 20:13:52 2017
@@ -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);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java Mon Apr 17 20:13:52 2017
@@ -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
);
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java Mon Apr 17 20:13:52 2017
@@ -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();
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java Mon Apr 17 20:13:52 2017
@@ -109,7 +109,7 @@ public abstract class AbstractWordConver
public String toString()
{
return "Structure [" + start + "; " + end + "): "
- + structure.toString();
+ + structure;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java Mon Apr 17 20:13:52 2017
@@ -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);
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java Mon Apr 17 20:13:52 2017
@@ -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();
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java Mon Apr 17 20:13:52 2017
@@ -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 )
{
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java Mon Apr 17 20:13:52 2017
@@ -289,7 +289,7 @@ public class OfficeDrawingsImpl implemen
@Override
public String toString()
{
- return "OfficeDrawingImpl: " + fspa.toString();
+ return "OfficeDrawingImpl: " + fspa;
}
};
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java Mon Apr 17 20:13:52 2017
@@ -83,7 +83,7 @@ public class TestFieldsTables extends HW
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();
}
Modified: poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java Mon Apr 17 20:13:52 2017
@@ -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);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java Mon Apr 17 20:13:52 2017
@@ -126,7 +126,7 @@ public final class TestOperandClassTrans
}
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()));
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestRVA.java Mon Apr 17 20:13:52 2017
@@ -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()) {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java Mon Apr 17 20:13:52 2017
@@ -439,7 +439,7 @@ public final class TestCellStyle extends
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);
}
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java Mon Apr 17 20:13:52 2017
@@ -91,7 +91,7 @@ public final class TestFormulaEvaluatorB
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 TestFormulaEvaluatorB
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();
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java Mon Apr 17 20:13:52 2017
@@ -282,9 +282,9 @@ public final class TestMultiSheetEval ex
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]);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java Mon Apr 17 20:13:52 2017
@@ -43,7 +43,7 @@ public final class TestBin2Dec extends T
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());
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java Mon Apr 17 20:13:52 2017
@@ -51,7 +51,7 @@ public final class TestDec2Bin extends T
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 T
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 T
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 T
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 T
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),
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java Mon Apr 17 20:13:52 2017
@@ -153,7 +153,7 @@ public final class TestDec2Hex extends T
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 T
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 T
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 T
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),
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java Mon Apr 17 20:13:52 2017
@@ -120,7 +120,7 @@ public final class TestIrr extends TestC
}
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 TestC
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%
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java Mon Apr 17 20:13:52 2017
@@ -154,7 +154,7 @@ public final class TestMirr extends Test
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 Test
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);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java Mon Apr 17 20:13:52 2017
@@ -90,7 +90,7 @@ public final class TestNpv extends TestC
}
if(failures.length() > 0) {
- throw new AssertionFailedError(failureCount + " IRR evaluations failed:\n" + failures.toString());
+ throw new AssertionFailedError(failureCount + " IRR evaluations failed:\n" + failures);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java Mon Apr 17 20:13:52 2017
@@ -35,7 +35,7 @@ public final class TestOffset extends Te
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() + "'.");
}
}
/**
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java Mon Apr 17 20:13:52 2017
@@ -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;
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java Mon Apr 17 20:13:52 2017
@@ -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());
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java Mon Apr 17 20:13:52 2017
@@ -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));
Modified: poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java?rev=1791720&r1=1791719&r2=1791720&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/util/TestStringUtil.java Mon Apr 17 20:13:52 2017
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org