You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2009/05/30 13:31:05 UTC
svn commit: r780245 - in /poi/trunk/src:
documentation/content/xdocs/status.xml
java/org/apache/poi/hssf/usermodel/HSSFSheet.java
testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
Author: yegor
Date: Sat May 30 11:31:05 2009
New Revision: 780245
URL: http://svn.apache.org/viewvc?rev=780245&view=rev
Log:
Fixed HSSFSheet#getFirstRowNum and HSSFSheet#getLastRowNum to return correct values after removal of all rows
Modified:
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=780245&r1=780244&r2=780245&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Sat May 30 11:31:05 2009
@@ -34,6 +34,7 @@
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.5-beta6" date="2009-??-??">
+ <action dev="POI-DEVELOPERS" type="fix">47069 - Fixed HSSFSheet#getFirstRowNum and HSSFSheet#getLastRowNum to return correct values after removal of all rows</action>
<action dev="POI-DEVELOPERS" type="fix">47278 - Fixed XSSFCell to avoid generating xsi:nil entries in shared string table</action>
<action dev="POI-DEVELOPERS" type="fix">47206 - Fixed XSSFCell to properly read inline strings</action>
<action dev="POI-DEVELOPERS" type="add">47250 - Fixed FontRecord to expect unicode flags even when name length is zero</action>
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=780245&r1=780244&r2=780245&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Sat May 30 11:31:05 2009
@@ -253,7 +253,7 @@
*/
private int findLastRow(int lastrow) {
if (lastrow < 1) {
- return -1;
+ return 0;
}
int rownum = lastrow - 1;
HSSFRow r = getRow(rownum);
@@ -262,7 +262,7 @@
r = getRow(--rownum);
}
if (r == null) {
- return -1;
+ return 0;
}
return rownum;
}
@@ -282,7 +282,7 @@
}
if (rownum > getLastRowNum())
- return -1;
+ return 0;
return rownum;
}
@@ -300,11 +300,12 @@
{
_sheet.addRow(row.getRowRecord());
}
- if (row.getRowNum() > getLastRowNum())
+ boolean firstRow = _rows.size() == 1;
+ if (row.getRowNum() > getLastRowNum() || firstRow)
{
_lastrow = row.getRowNum();
}
- if (row.getRowNum() < getFirstRowNum())
+ if (row.getRowNum() < getFirstRowNum() || firstRow)
{
_firstrow = row.getRowNum();
}
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java?rev=780245&r1=780244&r2=780245&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java Sat May 30 11:31:05 2009
@@ -79,21 +79,32 @@
Workbook workbook = getTestDataProvider().createWorkbook();
Sheet sheet1 = workbook.createSheet();
assertEquals(0, sheet1.getPhysicalNumberOfRows());
+ assertEquals(0, sheet1.getFirstRowNum());
+ assertEquals(0, sheet1.getLastRowNum());
Row row0 = sheet1.createRow(0);
assertEquals(1, sheet1.getPhysicalNumberOfRows());
+ assertEquals(0, sheet1.getFirstRowNum());
+ assertEquals(0, sheet1.getLastRowNum());
sheet1.removeRow(row0);
assertEquals(0, sheet1.getPhysicalNumberOfRows());
+ assertEquals(0, sheet1.getFirstRowNum());
+ assertEquals(0, sheet1.getLastRowNum());
Row row1 = sheet1.createRow(1);
Row row2 = sheet1.createRow(2);
assertEquals(2, sheet1.getPhysicalNumberOfRows());
+ assertEquals(1, sheet1.getFirstRowNum());
+ assertEquals(2, sheet1.getLastRowNum());
assertNotNull(sheet1.getRow(1));
assertNotNull(sheet1.getRow(2));
sheet1.removeRow(row2);
assertNotNull(sheet1.getRow(1));
assertNull(sheet1.getRow(2));
+ assertEquals(1, sheet1.getPhysicalNumberOfRows());
+ assertEquals(1, sheet1.getFirstRowNum());
+ assertEquals(1, sheet1.getLastRowNum());
Row row3 = sheet1.createRow(3);
Sheet sheet2 = workbook.createSheet();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org