Author: gallon
Date: Sat Jan 26 23:19:47 2019
New Revision: 1852252
URL: http://svn.apache.org/viewvc?rev=1852252&view=rev
Log:
pulled *Cell.getCellTypeEnum() to common base
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/CellBase.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java?rev=1852252&r1=1852251&r2=1852252&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java Sat Jan 26
23:19:47 2019
@@ -418,18 +418,6 @@ public class HSSFCell extends CellBase {
{
return _cellType;
}
-
- /**
- * get the cells type (numeric, formula or string)
- * @since POI 3.15 beta 3
- */
- @Deprecated
- @Removal(version = "4.2")
- @Override
- public CellType getCellTypeEnum()
- {
- return getCellType();
- }
/**
* set a numeric value for the cell
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java?rev=1852252&r1=1852251&r2=1852252&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Cell.java Sat Jan 26
23:19:47 2019
@@ -111,10 +111,16 @@ public interface Cell {
CellType getCellType();
/**
- * Return the cell type.
+ * Return the cell type. Tables in an array formula return
+ * {@link CellType#FORMULA} for all cells, even though the formula is only
defined
+ * in the OOXML file for the top left cell of the array.
+ * <p>
+ * NOTE: POI does not support data table formulas.
+ * Cells in a data table appear to POI as plain cells typed from their
cached value.
*
* @return the cell type
* @since POI 3.15 beta 3
+ * @deprecated will be removed in 4.2
* Will be renamed to <code>getCellType()</code> when we make the CellType
enum transition in POI 4.0. See bug 59791.
*/
@Deprecated
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/CellBase.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/CellBase.java?rev=1852252&r1=1852251&r2=1852252&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/CellBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/CellBase.java Sat Jan 26
23:19:47 2019
@@ -21,6 +21,7 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.util.Removal;
/**
* Common implementation-independent logic shared by all implementations of
{@link Cell}.
@@ -126,6 +127,16 @@ public abstract class CellBase implement
}
/**
+ * {@inheritDoc}
+ */
+ @Deprecated
+ @Removal(version = "4.2")
+ @Override
+ public final CellType getCellTypeEnum() {
+ return getCellType();
+ }
+
+ /**
* Implementation-specific setting the formula. Formula is not null.
* Shall not change the value.
* @param formula
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java?rev=1852252&r1=1852251&r2=1852252&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java Sat
Jan 26 23:19:47 2019
@@ -129,21 +129,6 @@ public class SXSSFCell extends CellBase
}
/**
- * Return the cell type.
- *
- * @return the cell type
- * @since POI 3.15 beta 3
- * @deprecated use <code>getCellType</code> instead
- */
- @Deprecated
- @Removal(version = "4.2")
- @Override
- public CellType getCellTypeEnum()
- {
- return getCellType();
- }
-
- /**
* Only valid for formula cells
* @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
* {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java?rev=1852252&r1=1852251&r2=1852252&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java Sat
Jan 26 23:19:47 2019
@@ -713,25 +713,6 @@ public final class XSSFCell extends Cell
}
/**
- * Return the cell type. Tables in an array formula return
- * {@link CellType#FORMULA} for all cells, even though the formula is only
defined
- * in the OOXML file for the top left cell of the array.
- * <p>
- * NOTE: POI does not support data table formulas.
- * Cells in a data table appear to POI as plain cells typed from their
cached value.
- *
- * @return the cell type
- * @since POI 3.15 beta 3
- * @deprecated use <code>getCellType</code> instead
- */
- @Deprecated
- @Removal(version = "4.2")
- @Override
- public CellType getCellTypeEnum() {
- return getCellType();
- }
-
- /**
* Only valid for formula cells
* @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
* {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
