Some housekeeping

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352208 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Glen Stampoultzis 2002-03-12 10:53:02 +00:00
parent 3a4e33a099
commit bf1123e236

View File

@ -1,4 +1,3 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
@ -60,16 +59,14 @@
*/
package org.apache.poi.hssf.usermodel;
import java.util.List;
import java.util.ArrayList;
import org.apache.poi.hssf.model.Sheet;
import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.CellValueRecordInterface;
import org.apache.poi.hssf.record.RowRecord;
import java.util.HashMap;
import java.util.Iterator;
import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.model.Sheet;
import org.apache.poi.hssf.record.RowRecord;
import org.apache.poi.hssf.record.CellValueRecordInterface;
/**
* High level representation of a row of a spreadsheet.
*
@ -127,7 +124,7 @@ public class HSSFRow
this.book = book;
this.sheet = sheet;
row = new RowRecord();
row.setHeight(( short ) 0xff);
row.setHeight((short) 0xff);
// row.setRowNumber(rowNum);
setRowNum(rowNum);
@ -173,7 +170,7 @@ public class HSSFRow
{
HSSFCell cell = new HSSFCell(book, sheet, getRowNum(), column);
addCell(cell, true);
addCell(cell);
sheet.addValueRecord(getRowNum(), cell.getCellValueRecord());
return cell;
}
@ -195,7 +192,7 @@ public class HSSFRow
{
HSSFCell cell = new HSSFCell(book, sheet, getRowNum(), column, type);
addCell(cell, true);
addCell(cell);
sheet.addValueRecord(getRowNum(), cell.getCellValueRecord());
return cell;
}
@ -212,22 +209,10 @@ public class HSSFRow
sheet.removeValueRecord(getRowNum(), cval);
cells.remove(new Integer(cell.getCellNum()));
/*
* for (int k = 0; k < cells.size(); k++)
* {
* HSSFCell hcell = ( HSSFCell ) cells.get(k);
*
* if (hcell.getCellNum() == cell.getCellNum())
* {
* cells.remove(k);
* }
* }
*/
if (cell.getCellNum() == lastcell)
{
lastcell = findLastCell(lastcell);
}
else if (cell.getCellNum() == firstcell)
} else if (cell.getCellNum() == firstcell)
{
firstcell = findFirstCell(firstcell);
}
@ -244,7 +229,7 @@ public class HSSFRow
{
HSSFCell hcell = new HSSFCell(book, sheet, getRowNum(), cell);
addCell(hcell, false);
addCell(hcell);
// sheet.addValueRecord(getRowNum(),cell.getCellValueRecord());
return hcell;
@ -278,7 +263,7 @@ public class HSSFRow
* used internally to add a cell. Pass anything in for dummy boolean. (possibly used in later versions)
*/
private void addCell(HSSFCell cell, boolean dummy)
private void addCell(HSSFCell cell)
{
if (firstcell == -1)
{
@ -290,33 +275,6 @@ public class HSSFRow
}
cells.put(new Integer(cell.getCellNum()), cell);
/* if (cells.size() > 0)
{
if ((cell.getCellNum() < firstcell) || (firstcell == -1))
{
firstcell = cell.getCellNum();
}
if ((cell.getCellNum() > lastcell) || (lastcell == -1))
{
lastcell = cell.getCellNum();
}
for (int k = cells.size() - 1; k > -1; k--)
{
if ((cell.getCellNum() > (( HSSFCell ) cells.get(k))
.getCellNum()) || (k == 0))
{
cells.add(k, cell);
break;
}
}
}
else
{
firstcell = cell.getCellNum();
lastcell = cell.getCellNum();
cells.add(cell);
}
*/
if (cell.getCellNum() < row.getFirstCol())
{
row.setFirstCol(cell.getCellNum());
@ -347,7 +305,7 @@ public class HSSFRow
return cell;
}
}*/
return ( HSSFCell ) cells.get(new Integer(cellnum));
return (HSSFCell) cells.get(new Integer(cellnum));
}
/**
@ -399,18 +357,6 @@ public class HSSFRow
return cells.size();
}
/**
* gets the phsyically defined cell at location (num) NOT its column number.
* That is to say if only columns 0,4,5 have values then index 2 would equal cell with a column number of 4.
* (though the order is not assured)
* @return HSSFCell physically defined at the given index.
*/
// public HSSFCell getPhysicalCellAt(int num)
// {
// return ( HSSFCell ) cells.get(num);
// }
/**
* set the row's height or set to ff (-1) for undefined/default-height. Set the height in "twips" or
* 1/20th of a point.
@ -435,7 +381,7 @@ public class HSSFRow
// row.setOptionFlags(
row.setBadFontHeight(true);
row.setHeight(( short ) (height * 20));
row.setHeight((short) (height * 20));
}
/**
@ -476,7 +422,7 @@ public class HSSFRow
private short findLastCell(short lastcell)
{
short cellnum = ( short ) (lastcell - 1);
short cellnum = (short) (lastcell - 1);
HSSFCell r = getCell(cellnum);
while (r == null)
@ -492,7 +438,7 @@ public class HSSFRow
private short findFirstCell(short firstcell)
{
short cellnum = ( short ) (firstcell + 1);
short cellnum = (short) (firstcell + 1);
HSSFCell r = getCell(cellnum);
while (r == null)
@ -514,7 +460,7 @@ public class HSSFRow
public int compareTo(Object obj)
{
HSSFRow loc = ( HSSFRow ) obj;
HSSFRow loc = (HSSFRow) obj;
if (this.getRowNum() == loc.getRowNum())
{
@ -537,7 +483,7 @@ public class HSSFRow
{
return false;
}
HSSFRow loc = ( HSSFRow ) obj;
HSSFRow loc = (HSSFRow) obj;
if (this.getRowNum() == loc.getRowNum())
{