From a3f001b7ae88ac65f4d433195eeeb78ca0ae5f56 Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Wed, 2 Nov 2016 16:37:12 +0000 Subject: [PATCH] bug 60331: remove deprecated FormulaShifter.createForRowShift(). Require SpreadsheetVersion. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1767728 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/ss/formula/FormulaShifter.java | 15 --------------- .../apache/poi/ss/formula/TestFormulaShifter.java | 3 +-- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/java/org/apache/poi/ss/formula/FormulaShifter.java b/src/java/org/apache/poi/ss/formula/FormulaShifter.java index 1e79b1dfc..44e477f23 100644 --- 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 1f378ccd5..735368252 100644 --- 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