Author: fanningpj
Date: Thu Dec 17 21:54:42 2020
New Revision: 1884574
URL: http://svn.apache.org/viewvc?rev=1884574&view=rev
Log:
avoid string concats
Modified:
poi/trunk/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java
poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
poi/trunk/src/java/org/apache/poi/util/POILogger.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
Modified:
poi/trunk/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java
(original)
+++
poi/trunk/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java
Thu Dec 17 21:54:42 2020
@@ -41,7 +41,7 @@ public class Outlines implements Closeab
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);
}
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java Thu Dec 17
21:54:42 2020
@@ -149,7 +149,7 @@ public final class FormatRecord extends
}
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();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java Thu Dec 17
21:54:42 2020
@@ -78,8 +78,8 @@ public final class LabelRecord extends R
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())
);
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java Thu Dec
17 21:54:42 2020
@@ -63,8 +63,8 @@ public final class OldLabelRecord extend
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())
);
}
}
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=1884574&r1=1884573&r2=1884574&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 Thu Dec
17 21:54:42 2020
@@ -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
Modified: poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/CellUtil.java Thu Dec 17 21:54:42
2020
@@ -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);
}
}
}
Modified: poi/trunk/src/java/org/apache/poi/util/POILogger.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/POILogger.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/POILogger.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/POILogger.java Thu Dec 17 21:54:42
2020
@@ -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>
*
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
Thu Dec 17 21:54:42 2020
@@ -60,8 +60,8 @@ public class SXSSFWorkbookWithCustomZipE
@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();
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
Thu Dec 17 21:54:42 2020
@@ -111,7 +111,7 @@ public final class SXSSFFormulaEvaluator
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");
}
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Thu Dec 17 21:54:42 2020
@@ -3549,14 +3549,14 @@ public final class TestXSSFBugs extends
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()));
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
Thu Dec 17 21:54:42 2020
@@ -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;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java Thu Dec
17 21:54:42 2020
@@ -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
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
Thu Dec 17 21:54:42 2020
@@ -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;
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
Thu Dec 17 21:54:42 2020
@@ -322,7 +322,7 @@ public abstract class HSLFSimpleShape ex
@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;
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
Thu Dec 17 21:54:42 2020
@@ -758,8 +758,8 @@ public final class HSLFSlideShow extends
// 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
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;
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
Thu Dec 17 21:54:42 2020
@@ -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 );
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java?rev=1884574&r1=1884573&r2=1884574&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
Thu Dec 17 21:54:42 2020
@@ -241,7 +241,7 @@ public final class SectionSprmUncompress
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
