remove some deprecated code

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

3 files changed, 0 insertions, 65 deletions

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java b/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
index c46ff73aab..4b90599e43 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
@@ -21,7 +21,6 @@ import org.apache.poi.ss.formula.EvaluationCell;
 import org.apache.poi.ss.formula.EvaluationSheet;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Removal;
 
 /**
  * HSSF wrapper for a cell under evaluation
@@ -59,16 +58,6 @@ final class HSSFEvaluationCell implements EvaluationCell {
 	public CellType getCellType() {
 		return _cell.getCellType();
 	}
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 */
-	@Deprecated
-	@Removal(version = "4.2")
-	@Override
-	public CellType getCellTypeEnum() {
-		return getCellType();
-	}
 	@Override
 	public int getColumnIndex() {
 		return _cell.getColumnIndex();
@@ -110,16 +99,4 @@ final class HSSFEvaluationCell implements EvaluationCell {
 	 */
 	@Override
 	public CellType getCachedFormulaResultType() { return _cell.getCachedFormulaResultType(); }
-
-	/**
-	 * @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.
-	 */
-	@Deprecated
-	@Removal(version = "4.2")
-	@Override
-	public CellType getCachedFormulaResultTypeEnum() {
-		return getCachedFormulaResultType();
-	}
 }
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationCell.java b/src/java/org/apache/poi/ss/formula/EvaluationCell.java
index 41563517c3..ae983d11d8 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationCell.java
+++ b/src/java/org/apache/poi/ss/formula/EvaluationCell.java
@@ -19,7 +19,6 @@ package org.apache.poi.ss.formula;
 
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Removal;
 
 /**
  * Abstracts a cell for the purpose of formula evaluation.  This interface represents both formula
@@ -40,13 +39,6 @@ public interface EvaluationCell {
 	int getRowIndex();
 	int getColumnIndex();
 	CellType getCellType();
-	/**
-	 * @since POI 3.15 beta 3
-	 * @deprecated POI 3.15 beta 3.
-	 */
-	@Deprecated
-	@Removal(version = "4.2")
-	CellType getCellTypeEnum();
 
 	double getNumericCellValue();
 	String getStringCellValue();
@@ -59,12 +51,4 @@ public interface EvaluationCell {
 	 * @return cell type of cached formula result
 	 */
 	CellType getCachedFormulaResultType();
-	/**
-	 * @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.
-	 */
-	@Deprecated
-	@Removal(version = "4.2")
-	CellType getCachedFormulaResultTypeEnum();
 }
diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java b/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
index 21897a98bf..7a25291325 100644
--- a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
+++ b/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
@@ -28,8 +28,6 @@ import org.apache.poi.ss.formula.eval.ValueEval;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.util.Removal;
-
 
 /**
  * Represents a cell being used for forked evaluation that has had a value set different from the
@@ -110,17 +108,6 @@ final class ForkedEvaluationCell implements EvaluationCell {
 	public CellType getCellType() {
 		return _cellType;
 	}
-	/**
-	 * @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.
-	 */
-	@Deprecated
-    @Removal(version = "4.2")
-	@Override
-	public CellType getCellTypeEnum() {
-		return getCellType();
-	}
 	@Override
 	public boolean getBooleanCellValue() {
 		checkCellType(CellType.BOOLEAN);
@@ -170,17 +157,4 @@ final class ForkedEvaluationCell implements EvaluationCell {
 	public CellType getCachedFormulaResultType() {
 		return _masterCell.getCachedFormulaResultType();
 	}
-
-	/**
-	 * @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.
-	 */
-	@Deprecated
-	@Removal(version = "4.2")
-	@Override
-	public CellType getCachedFormulaResultTypeEnum() {
-		return getCachedFormulaResultType();
-	}
-
 }