Author: onealj
Date: Wed Sep 14 03:51:45 2016
New Revision: 1760624
URL: http://svn.apache.org/viewvc?rev=1760624&view=rev
Log:
bug 59790: add @Removal annotations to deprecated methods
Modified:
poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java?rev=1760624&r1=1760623&r2=1760624&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java Wed Sep
14 03:51:45 2016
@@ -17,8 +17,6 @@
package org.apache.poi.hssf.model;
-import org.apache.poi.ss.formula.ptg.Ptg;
-import org.apache.poi.util.Internal;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.FormulaParseException;
@@ -26,6 +24,9 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.formula.FormulaParsingWorkbook;
import org.apache.poi.ss.formula.FormulaRenderer;
import org.apache.poi.ss.formula.FormulaType;
+import org.apache.poi.ss.formula.ptg.Ptg;
+import org.apache.poi.util.Internal;
+import org.apache.poi.util.Removal;
/**
* HSSF wrapper for the {@link FormulaParser} and {@link FormulaRenderer}
@@ -61,6 +62,7 @@ public final class HSSFFormulaParser {
*
* @deprecated POI 3.15 beta 3. Use {@link #parse(String, HSSFWorkbook,
FormulaType)} instead.
*/
+ @Removal(version="3.17")
public static Ptg[] parse(String formula, HSSFWorkbook workbook, int
formulaType) throws FormulaParseException {
return parse(formula, workbook, FormulaType.forInt(formulaType));
}
@@ -87,6 +89,7 @@ public final class HSSFFormulaParser {
* @throws FormulaParseException if the formula has incorrect syntax or is
otherwise invalid
* @deprecated POI 3.15 beta 3. Use {@link #parse(String, HSSFWorkbook,
FormulaType, int)} instead.
*/
+ @Removal(version="3.17")
public static Ptg[] parse(String formula, HSSFWorkbook workbook, int
formulaType, int sheetIndex) throws FormulaParseException {
return parse(formula, workbook, FormulaType.forInt(formulaType),
sheetIndex);
}
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java?rev=1760624&r1=1760623&r2=1760624&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
Wed Sep 14 03:51:45 2016
@@ -35,6 +35,7 @@ import org.apache.poi.ss.usermodel.CellV
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.Internal;
+import org.apache.poi.util.Removal;
/**
* Evaluates formula cells.<p/>
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java?rev=1760624&r1=1760623&r2=1760624&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
Wed Sep 14 03:51:45 2016
@@ -28,6 +28,7 @@ import org.apache.poi.ss.formula.ptg.Ptg
import org.apache.poi.ss.formula.ptg.RangePtg;
import org.apache.poi.ss.formula.ptg.UnionPtg;
import org.apache.poi.ss.formula.ptg.ValueOperatorPtg;
+import org.apache.poi.util.Removal;
/**
* This class performs 'operand class' transformation. Non-base tokens are
classified into three
@@ -59,7 +60,10 @@ final class OperandClassTransformer {
private final FormulaType _formulaType;
- /** @deprecated POI 3.15 beta 3. */
+ /**
+ * @deprecated POI 3.15 beta 3. Use {@code
OperandClassTransformer(FormulaType)} instead.
+ */
+ @Removal(version="3.17")
public OperandClassTransformer(int formulaType) {
this(FormulaType.forInt(formulaType));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
