Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slightly re-arrange code to only perform computations if we do not exit the loop anyway 

Also simplify code somewhat

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884949 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2020-12-30 17:03:27 +00:00
parent ac2e1d761e
commit d406b402dc
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
View File

@ -241,17 +241,16 @@ public class TextPieceTable implements CharIndexTranslator {
for (TextPiece textPiece : _textPiecesFCOrder) {
final int tpStart = textPiece.getPieceDescriptor()
.getFilePosition();
if (endBytePosExclusive <= tpStart)
break;
final int tpEnd = textPiece.getPieceDescriptor().getFilePosition()
+ textPiece.bytesLength();
if (startBytePosInclusive > tpEnd)
continue;
if (endBytePosExclusive <= tpStart)
break;
final int rangeStartBytes = Math.max(tpStart,
startBytePosInclusive);
final int rangeStartBytes = Math.max(tpStart, startBytePosInclusive);
final int rangeEndBytes = Math.min(tpEnd, endBytePosExclusive);
final int rangeLengthBytes = rangeEndBytes - rangeStartBytes;
if (rangeStartBytes > rangeEndBytes)
continue;
@ -260,6 +259,7 @@ public class TextPieceTable implements CharIndexTranslator {
final int rangeStartCp = textPiece.getStart()
+ (rangeStartBytes - tpStart) / encodingMultiplier;
final int rangeLengthBytes = rangeEndBytes - rangeStartBytes;
final int rangeEndCp = rangeStartCp + rangeLengthBytes
/ encodingMultiplier;
@ -290,12 +290,11 @@ public class TextPieceTable implements CharIndexTranslator {
logger.log(
POILogger.WARN,
"Text piece has boundaries [",
Integer.valueOf(textPiece.getStart()),
textPiece.getStart(),
"; ",
Integer.valueOf(textPiece.getEnd()),
textPiece.getEnd(),
") but length ",
Integer.valueOf(textPiece.getEnd()
- textPiece.getStart()));
textPiece.getEnd() - textPiece.getStart());
}
docText.replace(textPiece.getStart(), textPiece.getStart()
@ -303,8 +302,8 @@ public class TextPieceTable implements CharIndexTranslator {
}
logger.log(POILogger.DEBUG, "Document text were rebuilded in ",
Long.valueOf(System.currentTimeMillis() - start), " ms (",
Integer.valueOf(docText.length()), " chars)");
System.currentTimeMillis() - start, " ms (",
docText.length(), " chars)");
return docText;
}
@ -326,11 +325,7 @@ public class TextPieceTable implements CharIndexTranslator {
continue;
}
if (pieceStart > bytePos) {
return false;
}
return true;
return pieceStart <= bytePos;
}
return false;
@ -347,10 +342,7 @@ public class TextPieceTable implements CharIndexTranslator {
int left = Math.max(startBytePos, pieceStart);
int right = Math.min(endBytePos, pieceStart + tp.bytesLength());
if (left >= right)
return false;
return true;
return left < right;
}
return false;