Author: fanningpj
Date: Sat Jun 27 10:50:10 2020
New Revision: 1879259
URL: http://svn.apache.org/viewvc?rev=1879259&view=rev
Log:
remove some deprecated Font methods from Workbook
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1879259&r1=1879258&r2=1879259&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Sat Jun
27 10:50:10 2020
@@ -1196,20 +1196,14 @@ public final class HSSFWorkbook extends
}
@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
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java?rev=1879259&r1=1879258&r2=1879259&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java Sat Jun 27
10:50:10 2020
@@ -264,11 +264,9 @@ public interface Workbook extends Closea
/**
* Get the number of fonts in the font table
*
- * @return number of fonts
- * @deprecated use <code>getNumberOfFontsAsInt()</code> 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,20 +274,12 @@ public interface Workbook extends Closea
* @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 <code>getFontAt(int)</code>
- */
- @Removal(version = "4.2")
- Font getFontAt(short idx);
-
- /**
- * Get the font at the given index number
*
* @param idx index number (0-based)
* @return font at the index
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1879259&r1=1879258&r2=1879259&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
Sat Jun 27 10:50:10 2020
@@ -852,22 +852,16 @@ public class SXSSFWorkbook implements Wo
}
@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
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1879259&r1=1879258&r2=1879259&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Sat Jun 27 10:50:10 2020
@@ -978,11 +978,6 @@ public class XSSFWorkbook extends POIXML
}
@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 POIXML
}
@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();
}
/**
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java?rev=1879259&r1=1879258&r2=1879259&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java Sat
Jun 27 10:50:10 2020
@@ -244,25 +244,6 @@ public final class TestHSSFName extends
}
@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();
assertEquals(0, wb.getNumberOfNames());
Modified:
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java?rev=1879259&r1=1879258&r2=1879259&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
Sat Jun 27 10:50:10 2020
@@ -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;
@@ -117,6 +119,25 @@ public abstract class BaseTestNamedRange
}
@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();
assertEquals(0, wb.getNumberOfNames());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
