diff options
| author | Josh Micich <josh@apache.org> | 2008-10-09 08:03:43 +0000 |
|---|---|---|
| committer | Josh Micich <josh@apache.org> | 2008-10-09 08:03:43 +0000 |
| commit | 91d6061c0781c1c71b998aa3710b66e09aca3021 (patch) | |
| tree | fed8fc3d17ba54b22096863dfafd31848470aa9f /src/ooxml | |
| parent | b3959ec23749b0f64af561b9e2e72271d1e28e71 (diff) | |
| download | poi-91d6061c0781c1c71b998aa3710b66e09aca3021.tar.gz poi-91d6061c0781c1c71b998aa3710b66e09aca3021.zip | |
Merged revisions 703092 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk
........
r703092 | josh | 2008-10-09 00:44:37 -0700 (Thu, 09 Oct 2008) | 1 line
converted short HSSFCell.getCellNum to int getColumnIndex
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703096 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/ooxml')
3 files changed, 21 insertions, 4 deletions
diff --git a/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Cell.java b/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Cell.java index 823b6191c8..a42fbc2643 100644 --- a/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Cell.java +++ b/src/ooxml/interfaces-jdk14/org/apache/poi/ss/usermodel/Cell.java @@ -77,7 +77,15 @@ public interface Cell { int getCellType(); + /** + * @deprecated (Oct 2008) use {@link #getColumnIndex()} + */ short getCellNum(); + + /** + * @return the cell's column index (zero based) + */ + int getColumnIndex(); int getRowIndex(); String getCellFormula(); diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Cell.java b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Cell.java index 331dd1e78b..15e7f1b822 100644 --- a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Cell.java +++ b/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Cell.java @@ -98,11 +98,14 @@ public interface Cell { void setCellNum(short num); /** - * get the cell's number within the row - * @return short reperesenting the column number (logical!) + * @deprecated (Oct 2008) use {@link #getColumnIndex()} */ - short getCellNum(); + + /** + * @return the cell's column index (zero based) + */ + int getColumnIndex(); int getRowIndex(); diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java index 73952d99a7..9d52a7fa55 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java @@ -107,8 +107,14 @@ public final class XSSFCell implements Cell { return this.cell.getF().getStringValue(); } + /** + * @deprecated use {@link #getColumnIndex()} + */ public short getCellNum() { - return (short)this.cellNum; + return (short)getColumnIndex(); + } + public int getColumnIndex() { + return this.cellNum; } public int getRowIndex() { return row.getRowNum(); |