bug 60331: remove deprecated FormulaShifter.createForRowShift(). Require SpreadsheetV...

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

diff --git a/src/java/org/apache/poi/ss/formula/FormulaShifter.java b/src/java/org/apache/poi/ss/formula/FormulaShifter.java
index 1e79b1dfc9364103f81c43d9c4b4035e6d8d9b30..44e477f230770a44fcb5ac42afc052081bf7886f 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/FormulaShifter.java
+++ b/src/java/org/apache/poi/ss/formula/FormulaShifter.java
@@ -105,21 +105,6 @@ public final class FormulaShifter {
         _dstSheetIndex = dstSheetIndex;
         _mode = ShiftMode.SheetMove;
     }
-
-    /**
-     * @deprecated As of 3.14 beta 1 (November 2015), replaced by {@link #createForRowShift(int, String, int, int, int, SpreadsheetVersion)}
-     *
-     * @param externSheetIndex
-     * @param sheetName
-     * @param firstMovedRowIndex
-     * @param lastMovedRowIndex
-     * @param numberOfRowsToMove
-     * @return FormulaShifter object that can be passed to a RowShifter to modify formulas.
-     */
-    @Deprecated
-    public static FormulaShifter createForRowShift(int externSheetIndex, String sheetName, int firstMovedRowIndex, int lastMovedRowIndex, int numberOfRowsToMove) {
-        return createForRowShift(externSheetIndex, sheetName, firstMovedRowIndex, lastMovedRowIndex, numberOfRowsToMove, SpreadsheetVersion.EXCEL97);
-    }
     
     public static FormulaShifter createForRowShift(int externSheetIndex, String sheetName, int firstMovedRowIndex, int lastMovedRowIndex, int numberOfRowsToMove,
             SpreadsheetVersion version) {

diff --git a/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java b/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
index 1f378ccd5490a86ac4531525da68e97b0c1045bd..73536825217bc6a10f96bfb2309bccc416d82fe4 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
+++ b/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
@@ -276,9 +276,8 @@ public final class TestFormulaShifter {
     }
     
     @Test
-    @SuppressWarnings("deprecation")
     public void testConstructor() {
-        assertNotNull(FormulaShifter.createForRowShift(1, "name", 1, 2, 2));
+        assertNotNull(FormulaShifter.createForRowShift(1, "name", 1, 2, 2, SpreadsheetVersion.EXCEL97));
     }
 
     @Test