From b12e13a041244de1511bb9c9878cae6eee285895 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 27 Jun 2020 10:50:10 +0000 Subject: [PATCH] remove some deprecated Font methods from Workbook git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1879259 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/usermodel/HSSFWorkbook.java | 12 +++-------- .../org/apache/poi/ss/usermodel/Workbook.java | 18 ++++------------ .../poi/xssf/streaming/SXSSFWorkbook.java | 16 +++++--------- .../poi/xssf/usermodel/XSSFWorkbook.java | 13 +++++------- .../poi/hssf/usermodel/TestHSSFName.java | 19 ----------------- .../poi/ss/usermodel/BaseTestNamedRange.java | 21 +++++++++++++++++++ 6 files changed, 38 insertions(+), 61 deletions(-) diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index 31fc8d045e..db4fa77a0e 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -1196,20 +1196,14 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss } @Override - @Deprecated - public short getNumberOfFonts() { - return (short) getNumberOfFontsAsInt(); - } - - @Override - public int getNumberOfFontsAsInt() { + public int getNumberOfFonts() { return workbook.getNumberOfFontRecords(); } @Override @Deprecated - public HSSFFont getFontAt(short idx) { - return getFontAt((int) idx); + public int getNumberOfFontsAsInt() { + return getNumberOfFonts(); } @Override diff --git a/src/java/org/apache/poi/ss/usermodel/Workbook.java b/src/java/org/apache/poi/ss/usermodel/Workbook.java index 31c6896471..77cce0b226 100644 --- a/src/java/org/apache/poi/ss/usermodel/Workbook.java +++ b/src/java/org/apache/poi/ss/usermodel/Workbook.java @@ -264,11 +264,9 @@ public interface Workbook extends Closeable, Iterable { /** * Get the number of fonts in the font table * - * @return number of fonts - * @deprecated use getNumberOfFontsAsInt() instead + * @return number of fonts (as int since POI 5.0.0) */ - @Removal(version = "4.2") - short getNumberOfFonts(); + int getNumberOfFonts(); /** * Get the number of fonts in the font table @@ -276,18 +274,10 @@ public interface Workbook extends Closeable, Iterable { * @return number of fonts * @since 4.0.0 */ + @Deprecated + @Removal(version = "6.0.0") int getNumberOfFontsAsInt(); - /** - * Get the font at the given index number - * - * @param idx index number (0-based) - * @return font at the index - * @deprecated use getFontAt(int) - */ - @Removal(version = "4.2") - Font getFontAt(short idx); - /** * Get the font at the given index number * diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java index dfcbb454f5..2074a70b4a 100644 --- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java +++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java @@ -852,22 +852,16 @@ public class SXSSFWorkbook implements Workbook { } @Override - @Deprecated - public short getNumberOfFonts() { - return (short)getNumberOfFontsAsInt(); - } - - @Override - public int getNumberOfFontsAsInt() - { - return _wb.getNumberOfFontsAsInt(); + public int getNumberOfFonts() { + return _wb.getNumberOfFonts(); } @Override @Deprecated - public Font getFontAt(short idx) + @Removal(version = "6.0.0") + public int getNumberOfFontsAsInt() { - return getFontAt((int)idx); + return getNumberOfFonts(); } @Override diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java index 9a53d24d1e..e0f5c7fc08 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java @@ -977,11 +977,6 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su return stylesSource.getStyleAt(idx); } - @Override - public XSSFFont getFontAt(short idx) { - return stylesSource.getFontAt(idx); - } - @Override public XSSFFont getFontAt(int idx) { return stylesSource.getFontAt(idx); @@ -1076,13 +1071,15 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook, Date1904Su } @Override - public short getNumberOfFonts() { - return (short)getNumberOfFontsAsInt(); + public int getNumberOfFonts() { + return stylesSource.getFonts().size(); } @Override + @Deprecated + @Removal(version = "6.0.0") public int getNumberOfFontsAsInt() { - return (short)stylesSource.getFonts().size(); + return getNumberOfFonts(); } /** diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java index 5290e17ec4..566e2f57c5 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java @@ -243,25 +243,6 @@ public final class TestHSSFName extends BaseTestNamedRange { wb.close(); } - @Test - public final void testUnicodeNamedRange() throws Exception { - HSSFWorkbook wb1 = new HSSFWorkbook(); - wb1.createSheet("Test"); - Name name = wb1.createName(); - name.setNameName("\u03B1"); - name.setRefersToFormula("Test!$D$3:$E$8"); - - - HSSFWorkbook wb2 = HSSFITestDataProvider.instance.writeOutAndReadBack(wb1); - Name name2 = wb2.getNameAt(0); - - assertEquals("\u03B1", name2.getNameName()); - assertEquals("Test!$D$3:$E$8", name2.getRefersToFormula()); - - wb2.close(); - wb1.close(); - } - @Test public final void testHSSFAddRemove() throws Exception { HSSFWorkbook wb = HSSFITestDataProvider.instance.createWorkbook(); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java index db090b1782..e458a3e778 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java @@ -28,6 +28,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import org.apache.poi.hssf.HSSFITestDataProvider; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.util.AreaReference; import org.apache.poi.ss.util.CellReference; @@ -116,6 +118,25 @@ public abstract class BaseTestNamedRange { wb.close(); } + @Test + public final void testUnicodeNamedRange() throws Exception { + HSSFWorkbook wb1 = new HSSFWorkbook(); + wb1.createSheet("Test"); + Name name = wb1.createName(); + name.setNameName("\u03B1"); + name.setRefersToFormula("Test!$D$3:$E$8"); + + + HSSFWorkbook wb2 = HSSFITestDataProvider.instance.writeOutAndReadBack(wb1); + Name name2 = wb2.getName("\u03B1"); + + assertEquals("\u03B1", name2.getNameName()); + assertEquals("Test!$D$3:$E$8", name2.getRefersToFormula()); + + wb2.close(); + wb1.close(); + } + @Test public final void testAddRemove() throws Exception { Workbook wb = _testDataProvider.createWorkbook(); -- 2.39.5