From 2cc20707fccc70dfc7d6e5460284f8728d977916 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Sat, 29 Mar 2008 17:37:13 +0000 Subject: [PATCH] Manually merge over changes from trunk, so that tests pass, as svnmerge appears to have missed something git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@642564 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/hssf/usermodel/HSSFRow.java | 156 +++++++++--------- 1 file changed, 79 insertions(+), 77 deletions(-) diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java index fb35afd9ae..fa183b43ce 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java @@ -15,11 +15,6 @@ limitations under the License. ==================================================================== */ -/* - * HSSFRow.java - * - * Created on September 30, 2001, 3:44 PM - */ package org.apache.poi.hssf.usermodel; import java.util.Iterator; @@ -40,10 +35,7 @@ import org.apache.poi.ss.usermodel.Row; * @author Andrew C. Oliver (acoliver at apache dot org) * @author Glen Stampoultzis (glens at apache.org) */ - -public class HSSFRow - implements Comparable, Row -{ +public final class HSSFRow implements Comparable, Row { // used for collections public final static int INITIAL_CAPACITY = 5; @@ -159,26 +151,31 @@ public class HSSFRow * @param cell to remove */ public void removeCell(Cell cell) { - removeCell((HSSFCell) cell, true); + if(cell == null) { + throw new IllegalArgumentException("cell must not be null"); + } + removeCell((HSSFCell)cell, true); } private void removeCell(HSSFCell cell, boolean alsoRemoveRecords) { - if(alsoRemoveRecords) { - CellValueRecordInterface cval = cell.getCellValueRecord(); - sheet.removeValueRecord(getRowNum(), cval); - } - + short column=cell.getCellNum(); - if(cell!=null && column= cells.length || cell != cells[column]) { + throw new RuntimeException("Specified cell is not from this row"); } - if (cell.getCellNum() == row.getFirstCol()) - { + cells[column]=null; + + if(alsoRemoveRecords) { + CellValueRecordInterface cval = cell.getCellValueRecord(); + sheet.removeValueRecord(getRowNum(), cval); + } + + if (cell.getCellNum()+1 == row.getLastCol()) { + row.setLastCol((short) (findLastCell(row.getLastCol())+1)); + } + if (cell.getCellNum() == row.getFirstCol()) { row.setFirstCol(findFirstCell(row.getFirstCol())); } } @@ -236,7 +233,7 @@ public class HSSFRow * TODO - Should this really be public? */ protected int getOutlineLevel() { - return row.getOutlineLevel(); + return row.getOutlineLevel(); } /** @@ -246,55 +243,48 @@ public class HSSFRow * @param newColumn The new column number (0 based) */ public void moveCell(HSSFCell cell, short newColumn) { - // Ensure the destination is free - if(cells.length > newColumn && cells[newColumn] != null) { - throw new IllegalArgumentException("Asked to move cell to column " + newColumn + " but there's already a cell there"); - } - - // Check it's one of ours - if(! cells[cell.getCellNum()].equals(cell)) { - throw new IllegalArgumentException("Asked to move a cell, but it didn't belong to our row"); - } - - // Move the cell to the new position - // (Don't remove the records though) - removeCell(cell, false); - cell.updateCellNum(newColumn); - addCell(cell); + // Ensure the destination is free + if(cells.length > newColumn && cells[newColumn] != null) { + throw new IllegalArgumentException("Asked to move cell to column " + newColumn + " but there's already a cell there"); + } + + // Check it's one of ours + if(! cells[cell.getCellNum()].equals(cell)) { + throw new IllegalArgumentException("Asked to move a cell, but it didn't belong to our row"); + } + + // Move the cell to the new position + // (Don't remove the records though) + removeCell(cell, false); + cell.updateCellNum(newColumn); + addCell(cell); } /** * used internally to add a cell. */ - private void addCell(HSSFCell cell) - { - short column=cell.getCellNum(); - if (row.getFirstCol() == -1) - { - row.setFirstCol(column); - } - if (row.getLastCol() == -1) - { - row.setLastCol(column); - } + private void addCell(HSSFCell cell) { - if(column>=cells.length) - { - HSSFCell[] oldCells=cells; - int newSize=oldCells.length*2; - if(newSize=cells.length) { + HSSFCell[] oldCells=cells; + int newSize=oldCells.length*2; + if(newSize row.getLastCol()) - { - row.setLastCol(column); + + if (row.getLastCol() == -1 || column >= row.getLastCol()) { + row.setLastCol((short) (column+1)); // +1 -> for one past the last index } } @@ -339,16 +329,29 @@ public class HSSFRow } /** - * gets the number of the last cell contained in this row PLUS ONE. - * @return short representing the last logical cell in the row PLUS ONE, or -1 if the row does not contain any cells. + * Gets the index of the last cell contained in this row PLUS ONE. The result also + * happens to be the 1-based column number of the last cell. This value can be used as a + * standard upper bound when iterating over cells: + * 
 
+     * short minColIx = row.getFirstCellNum();
+     * short maxColIx = row.getLastCellNum();
+     * for(short colIx=minColIx; colIx<maxColIx; colIx++) {
+     *   HSSFCell cell = row.getCell(colIx);
+     *   if(cell == null) {
+     *     continue;
+     *   }
+     *   //... do something with cell
+     * }
+     *
+ * + * @return short representing the last logical cell in the row PLUS ONE, or -1 if the + * row does not contain any cells. */ - - public short getLastCellNum() - { - if (getPhysicalNumberOfCells() == 0) + public short getLastCellNum() { + if (getPhysicalNumberOfCells() == 0) { return -1; - else - return row.getLastCol(); + } + return row.getLastCol(); } @@ -481,7 +484,6 @@ public class HSSFRow * @return cell iterator of the physically defined cells. Note element 4 may * actually be row cell depending on how many are defined! */ - public Iterator cellIterator() { return new CellIterator(); @@ -509,8 +511,8 @@ public class HSSFRow } public Object next() { - if (!hasNext()) - throw new NoSuchElementException("At last element"); + if (!hasNext()) + throw new NoSuchElementException("At last element"); HSSFCell cell=cells[nextId]; thisId=nextId; findNext(); @@ -518,8 +520,8 @@ public class HSSFRow } public void remove() { - if (thisId == -1) - throw new IllegalStateException("remove() called before next()"); + if (thisId == -1) + throw new IllegalStateException("remove() called before next()"); cells[thisId]=null; }