remove @deprecated annotation from Enum-returning getters. These will be deprecated...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1765545 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
index 6cd19f5bf1bc9c6bb4538b72cc728eafb0553eef..74872de75fa775eaeae8f0b15dde26bdd1237e1b 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
+++ b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
@@ -183,7 +183,6 @@ public abstract class BaseFormulaEvaluator implements FormulaEvaluator, Workbook
      * @return The type of the formula result (the cell's type remains as CellType.FORMULA however)
      *         If cell is not a formula cell, returns {@link CellType#_NONE} rather than throwing an exception.
      * @since POI 3.15 beta 3
-     * @deprecated POI 3.15 beta 3. Will be deleted when we make the CellType enum transition. See bug 59791.
      */
     @Override
     public CellType evaluateFormulaCellEnum(Cell cell) {

diff --git a/src/java/org/apache/poi/ss/usermodel/CellValue.java b/src/java/org/apache/poi/ss/usermodel/CellValue.java
index b10210882a5f7b4b6af950b9f660e912cef3c3a4..78636d989fc1eca456719fa244bf775a42bb4920 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/CellValue.java
+++ b/src/java/org/apache/poi/ss/usermodel/CellValue.java
@@ -89,10 +89,8 @@ public final class CellValue {
      *
      * @return the cell type
      * @since POI 3.15
-     * @deprecated POI 3.15
      * Will be renamed to <code>getCellTypeEnum()</code> when we make the CellType enum transition in POI 4.0. See bug 59791.
      */
-    @Internal(since="POI 3.15 beta 3")
     @Removal(version="4.2")
     public CellType getCellTypeEnum() {
         return _cellType;

diff --git a/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java b/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
index 357bd073a6619fd673f3f49429f42f9f2ab71e9c..44908e9c1987c090be3fde4b8cad056709764cf6 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
+++ b/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
@@ -125,9 +125,7 @@ public interface FormulaEvaluator {
      *      or one of {@link CellType#NUMERIC}, {@link CellType#STRING},
      *      {@link CellType#BOOLEAN}, {@link CellType#ERROR}
      *      Note: the cell's type remains as CellType.FORMULA however.
-     * @deprecated POI 3.15 beta 3. Will be deleted when we make the CellType enum transition. See bug 59791.
      */
-    @Internal(since="POI 3.15 beta 3")
     CellType evaluateFormulaCellEnum(Cell cell);
 
     /**