avoid string concats

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884574 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-12-17 21:54:42 +00:00
parent bd1d31e410
commit 2b14dc36bb
17 changed files with 29 additions and 32 deletions
src
examples/src/org/apache/poi/examples/hssf/usermodel
java/org/apache/poi
ooxml
java/org/apache/poi
testcases/org/apache/poi/xssf/usermodel
scratchpad/src/org/apache/poi

View File

@ -41,7 +41,7 @@ public class Outlines implements Closeable {
String log = (String) Outlines.class.getDeclaredMethod("test" + i).invoke(o);
String filename = "outline" + i + ".xls";
o.writeOut(filename);
LOGGER.log(POILogger.INFO, filename + " written. " + log);
LOGGER.log(POILogger.INFO, filename, " written. ", log);
}
}
}

View File

@ -149,7 +149,7 @@ public final class FormatRecord extends StandardRecord {
}
if (ris.available() > 0) {
logger.log(POILogger.INFO, "FormatRecord has "+ris.available()+" unexplained bytes. Silently skipping");
logger.log(POILogger.INFO, "FormatRecord has ", ris.available(), " unexplained bytes. Silently skipping");
//swallow what's left
while (ris.available() > 0) {
ris.readByte();

View File

@ -78,8 +78,8 @@ public final class LabelRecord extends Record implements CellValueRecordInterfac
if (in.remaining() > 0) {
logger.log(POILogger.INFO,
"LabelRecord data remains: " + in.remaining() +
" : " + HexDump.toHex(in.readRemainder())
"LabelRecord data remains: ", in.remaining(),
" : ", HexDump.toHex(in.readRemainder())
);
}
}

View File

@ -63,8 +63,8 @@ public final class OldLabelRecord extends OldCellRecord {
if (in.remaining() > 0) {
logger.log(POILogger.INFO,
"LabelRecord data remains: " + in.remaining() +
" : " + HexDump.toHex(in.readRemainder())
"LabelRecord data remains: ", in.remaining(),
" : ", HexDump.toHex(in.readRemainder())
);
}
}

View File

@ -406,7 +406,7 @@ public final class WorkbookEvaluator {
// since we don't know how to handle these yet :(
Ptg ptg = ptgs[i];
if (dbgEvaluationOutputIndent > 0) {
EVAL_LOG.log(POILogger.INFO, dbgIndentStr + " * ptg " + i + ": " + ptg + ", stack: " + stack);
EVAL_LOG.log(POILogger.INFO, dbgIndentStr, " * ptg ", i, ": ", ptg, ", stack: ", stack);
}
if (ptg instanceof AttrPtg) {
AttrPtg attrPtg = (AttrPtg) ptg;
@ -551,7 +551,7 @@ public final class WorkbookEvaluator {
// logDebug("push " + opResult);
stack.push(opResult);
if (dbgEvaluationOutputIndent > 0) {
EVAL_LOG.log(POILogger.INFO, dbgIndentStr + " = " + opResult);
EVAL_LOG.log(POILogger.INFO, dbgIndentStr, " = ", opResult);
}
}
@ -570,9 +570,9 @@ public final class WorkbookEvaluator {
}
if (dbgEvaluationOutputIndent > 0) {
EVAL_LOG.log(POILogger.INFO, dbgIndentStr + "finshed eval of "
+ new CellReference(ec.getRowIndex(), ec.getColumnIndex()).formatAsString()
+ ": " + result);
EVAL_LOG.log(POILogger.INFO, dbgIndentStr, "finished eval of ",
new CellReference(ec.getRowIndex(), ec.getColumnIndex()).formatAsString(),
": ", result);
dbgEvaluationOutputIndent--;
if (dbgEvaluationOutputIndent == 1) {
// this evaluation is done, reset indent to stop logging

View File

@ -385,9 +385,7 @@ public final class CellUtil {
} else if (FILL_PATTERN.equals(key)) {
dest.put(key, getFillPattern(src, key));
} else {
if (log.check(POILogger.INFO)) {
log.log(POILogger.INFO, "Ignoring unrecognized CellUtil format properties key: " + key);
}
log.log(POILogger.INFO, "Ignoring unrecognized CellUtil format properties key: ", key);
}
}
}

View File

@ -79,7 +79,7 @@ public interface POILogger {
* An example:
* <code><pre>
* if (logger.check(POILogger.INFO)) {
* logger.log(POILogger.INFO, "Avoid concatenating " + " strings and evaluating " + functions());
* logger.log(POILogger.INFO, "Avoid concatenating ", " strings and evaluating ", functions());
* }
* </pre></code>
*

View File

@ -60,8 +60,8 @@ public class SXSSFWorkbookWithCustomZipEntrySource extends SXSSFWorkbook {
@Override
protected SheetDataWriter createSheetDataWriter() throws IOException {
//log values to ensure these values are accessible to subclasses
LOG.log(POILogger.INFO, "isCompressTempFiles: " + isCompressTempFiles());
LOG.log(POILogger.INFO, "SharedStringSource: " + getSharedStringSource());
LOG.log(POILogger.INFO, "isCompressTempFiles: ", isCompressTempFiles());
LOG.log(POILogger.INFO, "SharedStringSource: ", getSharedStringSource());
return new SheetDataWriterWithDecorator();
}
}

View File

@ -111,7 +111,7 @@ public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator {
int lastFlushedRowNum = ((SXSSFSheet) sheet).getLastFlushedRowNum();
if (lastFlushedRowNum > -1) {
if (! skipOutOfWindow) throw new RowFlushedException(0);
logger.log(POILogger.INFO, "Rows up to " + lastFlushedRowNum + " have already been flushed, skipping");
logger.log(POILogger.INFO, "Rows up to ", lastFlushedRowNum, " have already been flushed, skipping");
}
}

View File

@ -3549,14 +3549,14 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
LOG.log(POILogger.INFO, "Autosizing columns...");
for (int i = 0; i < 3; ++i) {
LOG.log(POILogger.INFO, "Autosize " + i + " - " + Duration.between(start, Instant.now()));
LOG.log(POILogger.INFO, "Autosize ", i, " - ", Duration.between(start, Instant.now()));
sheet.autoSizeColumn(i);
}
for (int i = 0; i < 69 - 35 + 1; ++i)
for (int j = 0; j < 8; ++j) {
int col = 3 + 2 + i * (8 + 2) + j;
LOG.log(POILogger.INFO, "Autosize " + col + " - " + Duration.between(start, Instant.now()));
LOG.log(POILogger.INFO, "Autosize ", col, " - ", Duration.between(start, Instant.now()));
sheet.autoSizeColumn(col);
}
LOG.log(POILogger.INFO, Duration.between(start, Instant.now()));

View File

@ -43,7 +43,7 @@ public class TestXSSFSheetMergeRegions {
if (millis < 2000) {
break;
}
LOG.log(POILogger.INFO, "Retry " + i + " because run-time is too high: " + millis);
LOG.log(POILogger.INFO, "Retry ", i, " because run-time is too high: ", millis);
}
boolean inGump = false;

View File

@ -242,12 +242,11 @@ public final class Chunk {
default:
logger.log(POILogger.INFO,
"Command of type " + type + " not processed!");
"Command of type ", type, " not processed!");
}
}
catch (Exception e) {
logger.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: " +
command, e);
logger.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: ", command, e);
}
// Add to the array

View File

@ -601,8 +601,8 @@ public class HemfComment {
// some emf comments are truncated, so we don't use readFully here
int readBytes = leis.read(wmfData);
if (readBytes < wmfData.length) {
logger.log(POILogger.INFO, "Emf comment with WMF: expected "+wmfData.length+
" bytes - received only "+readBytes+" bytes.");
logger.log(POILogger.INFO, "Emf comment with WMF: expected ", wmfData.length,
" bytes - received only ", readBytes, " bytes.");
}
return leis.getReadIndex()-startIdx;

View File

@ -322,7 +322,7 @@ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<H
@Override
public Guide getAdjustValue(String name) {
if (name == null || !name.matches("adj([1-9]|10)?")) {
LOG.log(POILogger.INFO, "Adjust value '"+name+"' not supported. Using default value.");
LOG.log(POILogger.INFO, "Adjust value '", name, "' not supported. Using default value.");
return null;
}

View File

@ -758,8 +758,8 @@ public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFSh
// Add in to the list of Slides
_slides.add(slide);
logger.log(POILogger.INFO, "Added slide " + _slides.size() + " with ref " + sp.getRefID()
+ " and identifier " + sp.getSlideIdentifier());
logger.log(POILogger.INFO, "Added slide ", _slides.size(), " with ref ", sp.getRefID(),
" and identifier ", sp.getSlideIdentifier());
// Add the core records for this new Slide to the record tree
Slide slideRecord = slide.getSlideRecord();
@ -1144,7 +1144,7 @@ public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFSh
int slideOffset = slideRecord.getLastOnDiskOffset();
slideRecord.setLastOnDiskOffset(slideOffset);
ptr.addSlideLookup(psrId, slideOffset);
logger.log(POILogger.INFO, "New slide/object ended up at " + slideOffset);
logger.log(POILogger.INFO, "New slide/object ended up at ", slideOffset);
return psrId;
}

View File

@ -427,7 +427,7 @@ public class AbstractWordUtils
{
if ( format != 0 )
logger.log( POILogger.INFO, "NYI: toListItemNumberLabel(): " + format );
logger.log( POILogger.INFO, "NYI: toListItemNumberLabel(): ", format );
return String.valueOf( number );
}

View File

@ -241,7 +241,7 @@ public final class SectionSprmUncompressor extends SprmUncompressor
newSEP.setNfcEdnRef(sprm.getOperand());
break;
default:
logger.log(POILogger.INFO, "Unsupported Sprm operation: " + operation + " (" + HexDump.byteToHex(operation) + ")");
logger.log(POILogger.INFO, "Unsupported Sprm operation: ", operation, " (", HexDump.byteToHex(operation), ")");
break;
}