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

sonar fixes 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1748028 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2016-06-12 16:57:15 +00:00
parent 0f89809206
commit 396d787dbe
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
View File

@ -72,7 +72,8 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
_cells = new TreeMap<Integer, XSSFCell>();
for (CTCell c : row.getCArray()) {
XSSFCell cell = new XSSFCell(this, c);
_cells.put(new Integer(cell.getColumnIndex()), cell);
Integer colI = new Integer(cell.getColumnIndex()); // NOSONAR
_cells.put(colI, cell);
sheet.onReadCell(cell);
}
}
@ -197,8 +198,9 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
* @see Cell#CELL_TYPE_STRING
*/
public XSSFCell createCell(int columnIndex, int type) {
final Integer colI = new Integer(columnIndex); // NOSONAR
CTCell ctCell;
XSSFCell prev = _cells.get(new Integer(columnIndex));
XSSFCell prev = _cells.get(colI);
if(prev != null){
ctCell = prev.getCTCell();
ctCell.set(CTCell.Factory.newInstance());
@ -210,7 +212,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
if (type != Cell.CELL_TYPE_BLANK) {
xcell.setCellType(type);
}
_cells.put(new Integer(columnIndex), xcell);
_cells.put(colI, xcell);
return xcell;
}
@ -236,7 +238,8 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
public XSSFCell getCell(int cellnum, MissingCellPolicy policy) {
if(cellnum < 0) throw new IllegalArgumentException("Cell index must be >= 0");
XSSFCell cell = _cells.get(new Integer(cellnum));
Integer colI = new Integer(cellnum); // NOSONAR
XSSFCell cell = _cells.get(colI);
if(policy == RETURN_NULL_AND_BLANK) {
return cell;
}
@ -455,7 +458,8 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
if(cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
_sheet.getWorkbook().onDeleteFormula(xcell);
}
_cells.remove(new Integer(cell.getColumnIndex()));
Integer colI = new Integer(cell.getColumnIndex()); // NOSONAR
_cells.remove(colI);
}
/**

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

@ -222,7 +222,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
arrayFormulas = new ArrayList<CellRangeAddress>();
for (CTRow row : worksheetParam.getSheetData().getRowArray()) {
XSSFRow r = new XSSFRow(row, this);
_rows.put(new Integer(r.getRowNum()), r);
Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
_rows.put(rownumI, r);
}
}
@ -692,8 +693,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
*/
@Override
public XSSFRow createRow(int rownum) {
final Integer rownumI = new Integer(rownum); // NOSONAR
CTRow ctRow;
XSSFRow prev = _rows.get(new Integer(rownum));
XSSFRow prev = _rows.get(rownumI);
if(prev != null){
// the Cells in an existing row are invalidated on-purpose, in order to clean up correctly, we
// need to call the remove, so things like ArrayFormulas and CalculationChain updates are done
@ -713,13 +715,13 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
} else {
// get number of rows where row index < rownum
// --> this tells us where our row should go
int idx = _rows.headMap(new Integer(rownum)).size();
int idx = _rows.headMap(rownumI).size();
ctRow = worksheet.getSheetData().insertNewRow(idx);
}
}
XSSFRow r = new XSSFRow(ctRow, this);
r.setRowNum(rownum);
_rows.put(new Integer(rownum), r);
_rows.put(rownumI, r);
return r;
}
@ -1377,7 +1379,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
*/
@Override
public XSSFRow getRow(int rownum) {
return _rows.get(new Integer(rownum));
Integer rownumI = new Integer(rownum); // NOSONAR
return _rows.get(rownumI);
}
/**
@ -1406,7 +1409,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
}
}
else {
rows.addAll(_rows.subMap(new Integer(startRowNum), new Integer(endRowNum+1)).values());
Integer startI = new Integer(startRowNum); // NOSONAR
Integer endI = new Integer(endRowNum+1); // NOSONAR
rows.addAll(_rows.subMap(startI, endI).values());
}
return rows;
}
@ -1876,8 +1881,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
row.removeCell(cell);
}
int idx = _rows.headMap(new Integer(row.getRowNum())).size();
_rows.remove(new Integer(row.getRowNum()));
Integer rownumI = new Integer(row.getRowNum()); // NOSONAR
int idx = _rows.headMap(rownumI).size();
_rows.remove(rownumI);
worksheet.getSheetData().removeRow(idx);
// also remove any comment located in that row
@ -2893,7 +2899,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
// check if we should remove this row as it will be overwritten by the data later
if (shouldRemoveRow(startRow, endRow, n, rownum)) {
// remove row from worksheet.getSheetData row array
int idx = _rows.headMap(new Integer(row.getRowNum())).size();
Integer rownumI = new Integer(row.getRowNum()); // NOSONAR
int idx = _rows.headMap(rownumI).size();
worksheet.getSheetData().removeRow(idx);
// remove row from _rows
@ -3012,7 +3019,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
//rebuild the _rows map
SortedMap<Integer, XSSFRow> map = new TreeMap<Integer, XSSFRow>();
for(XSSFRow r : _rows.values()) {
map.put(new Integer(r.getRowNum()), r);
Integer rownumI = new Integer(r.getRowNum()); // NOSONAR
map.put(rownumI, r);
}
_rows = map;
}