moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

update indents

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1835482 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-07-09 19:58:33 +00:00
parent 7dc47ceefe
commit 6f3cc9ed80
2 changed files with 480 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -3018,15 +3018,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
rowShifter.updateConditionalFormatting(formulaShifter); rowShifter.updateConditionalFormatting(formulaShifter);
rowShifter.updateHyperlinks(formulaShifter); rowShifter.updateHyperlinks(formulaShifter);
//rebuild the _rows map rebuildRows();
Map<Integer, XSSFRow> map = new HashMap<>();
for(XSSFRow r : _rows.values()) {
// Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
map.put(rownumI, r);
}
_rows.clear();
_rows.putAll(map);
} }
/** /**
@ -3051,14 +3043,18 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
columnShifter.updateHyperlinks(formulaShifter); columnShifter.updateHyperlinks(formulaShifter);
columnShifter.updateNamedRanges(formulaShifter); columnShifter.updateNamedRanges(formulaShifter);
//rebuild the _rows map rebuildRows();
Map<Integer, XSSFRow> map = new HashMap<>();
for(XSSFRow r : _rows.values()) {
final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
map.put(rownumI, r);
} }
private final void rebuildRows() {
//rebuild the _rows map
List<XSSFRow> rowList = new ArrayList<>(_rows.values());
_rows.clear(); _rows.clear();
_rows.putAll(map); for(XSSFRow r : rowList) {
// Performance optimization: explicit boxing is slightly faster than auto-unboxing, though may use more memory
final Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
_rows.put(rownumI, r);
}
} }
// remove all rows which will be overwritten // remove all rows which will be overwritten

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
View File

@ -368,7 +368,7 @@ public final class TestUnfixedBugs {
private void assertThatRowsInAscendingOrder(final XSSFWorkbook wb) { private void assertThatRowsInAscendingOrder(final XSSFWorkbook wb) {
// Check that CTRows are stored in ascending order of row index // Check that CTRows are stored in ascending order of row index
long maxSeenRowNum = 0; //1-based long maxSeenRowNum = 0; //1-based
for (final CTRow ctRow : wb.getSheetAt(0).getCTWorksheet().getSheetData().getRowArray()) { for (final CTRow ctRow : wb.getSheetAt(0).getCTWorksheet().getSheetData().getRowList()) {
final long rowNum = ctRow.getR(); //1-based final long rowNum = ctRow.getR(); //1-based
assertTrue("Row " + rowNum + " (1-based) is not in ascending order; previously saw " + maxSeenRowNum, assertTrue("Row " + rowNum + " (1-based) is not in ascending order; previously saw " + maxSeenRowNum,
rowNum > maxSeenRowNum); rowNum > maxSeenRowNum);