Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove more deprecated code 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884259 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-12-09 16:59:51 +00:00
parent bc1569e786
commit a42127e15b
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java
View File

@ -66,7 +66,7 @@ public final class CellStyleDetails {
System.out.print("FG=" + renderColor(style.getFillForegroundColorColor()) + " "); System.out.print("FG=" + renderColor(style.getFillForegroundColorColor()) + " ");
System.out.print("BG=" + renderColor(style.getFillBackgroundColorColor()) + " "); System.out.print("BG=" + renderColor(style.getFillBackgroundColorColor()) + " ");
Font font = wb.getFontAt(style.getFontIndexAsInt()); Font font = wb.getFontAt(style.getFontIndex());
System.out.print("Font=" + font.getFontName() + " "); System.out.print("Font=" + font.getFontName() + " ");
System.out.print("FontColor="); System.out.print("FontColor=");
if (font instanceof HSSFFont) { if (font instanceof HSSFFont) {

4
src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java
View File

@ -545,9 +545,9 @@ public class ExcelComparator {
} }
private boolean hasInvalidFontIndex(Locator loc1, Locator loc2) { private boolean hasInvalidFontIndex(Locator loc1, Locator loc2) {
int fontIdx1 = loc1.cell.getCellStyle().getFontIndexAsInt(); int fontIdx1 = loc1.cell.getCellStyle().getFontIndex();
int fontCount1 = ((XSSFWorkbook)loc1.workbook).getStylesSource().getFonts().size(); int fontCount1 = ((XSSFWorkbook)loc1.workbook).getStylesSource().getFonts().size();
int fontIdx2 = loc2.cell.getCellStyle().getFontIndexAsInt(); int fontIdx2 = loc2.cell.getCellStyle().getFontIndex();
int fontCount2 = ((XSSFWorkbook)loc2.workbook).getStylesSource().getFonts().size(); int fontCount2 = ((XSSFWorkbook)loc2.workbook).getStylesSource().getFonts().size();
if(fontIdx1 >= fontCount1 || fontIdx2 >= fontCount2) { if(fontIdx1 >= fontCount1 || fontIdx2 >= fontCount2) {

2
src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java
View File

@ -299,7 +299,7 @@ public final class ToHtml {
} }
private void fontStyle(CellStyle style) { private void fontStyle(CellStyle style) {
Font font = wb.getFontAt(style.getFontIndexAsInt()); Font font = wb.getFontAt(style.getFontIndex());
if (font.getBold()) { if (font.getBold()) {
out.format(" font-weight: bold;%n"); out.format(" font-weight: bold;%n");

6
src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
View File

@ -214,11 +214,11 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
/** /**
* gets the font for this style * gets the font for this style
* @param parentWorkbook The HSSFWorkbook that this style belongs to * @param parentWorkbook The HSSFWorkbook that this style belongs to
* @see org.apache.poi.hssf.usermodel.HSSFCellStyle#getFontIndexAsInt() * @see org.apache.poi.hssf.usermodel.HSSFCellStyle#getFontIndex()
* @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(int) * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(int)
*/ */
public HSSFFont getFont(org.apache.poi.ss.usermodel.Workbook parentWorkbook) { public HSSFFont getFont(org.apache.poi.ss.usermodel.Workbook parentWorkbook) {
return ((HSSFWorkbook) parentWorkbook).getFontAt(getFontIndexAsInt()); return ((HSSFWorkbook) parentWorkbook).getFontAt(getFontIndex());
} }
/** /**
@ -831,7 +831,7 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable {
FontRecord fr = _workbook.createNewFont(); FontRecord fr = _workbook.createNewFont();
fr.cloneStyleFrom( fr.cloneStyleFrom(
source._workbook.getFontRecordAt( source._workbook.getFontRecordAt(
source.getFontIndexAsInt() source.getFontIndex()
) )
); );

2
src/java/org/apache/poi/ss/util/CellUtil.java
View File

@ -348,7 +348,7 @@ public final class CellUtil {
put(properties, FILL_PATTERN, style.getFillPattern()); put(properties, FILL_PATTERN, style.getFillPattern());
put(properties, FILL_FOREGROUND_COLOR, style.getFillForegroundColor()); put(properties, FILL_FOREGROUND_COLOR, style.getFillForegroundColor());
put(properties, FILL_BACKGROUND_COLOR, style.getFillBackgroundColor()); put(properties, FILL_BACKGROUND_COLOR, style.getFillBackgroundColor());
put(properties, FONT, style.getFontIndexAsInt()); put(properties, FONT, style.getFontIndex());
put(properties, HIDDEN, style.getHidden()); put(properties, HIDDEN, style.getHidden());
put(properties, INDENTION, style.getIndention()); put(properties, INDENTION, style.getIndention());
put(properties, LEFT_BORDER_COLOR, style.getLeftBorderColor()); put(properties, LEFT_BORDER_COLOR, style.getLeftBorderColor());

2
src/java/org/apache/poi/ss/util/SheetUtil.java
View File

@ -156,7 +156,7 @@ public class SheetUtil {
if (cellType == CellType.FORMULA) if (cellType == CellType.FORMULA)
cellType = cell.getCachedFormulaResultType(); cellType = cell.getCachedFormulaResultType();
Font font = wb.getFontAt(style.getFontIndexAsInt()); Font font = wb.getFontAt(style.getFontIndex());
double width = -1; double width = -1;
if (cellType == CellType.STRING) { if (cellType == CellType.STRING) {

2
src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
View File

@ -211,7 +211,7 @@ public class TestAutoSizeColumnTracker {
private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) { private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) {
// autoSize will fail if required fonts are not installed, skip this test then // autoSize will fail if required fonts are not installed, skip this test then
Font font = workbook.getFontAt(cell.getCellStyle().getFontIndexAsInt()); Font font = workbook.getFontAt(cell.getCellStyle().getFontIndex());
Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font, Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font,
SheetUtil.canComputeColumnWidth(font)); SheetUtil.canComputeColumnWidth(font));
} }

2
src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
View File

@ -351,7 +351,7 @@ public class TestSXSSFSheetAutoSizeColumn {
private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) { private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) {
// autoSize will fail if required fonts are not installed, skip this test then // autoSize will fail if required fonts are not installed, skip this test then
Font font = workbook.getFontAt(cell.getCellStyle().getFontIndexAsInt()); Font font = workbook.getFontAt(cell.getCellStyle().getFontIndex());
Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font, Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font,
SheetUtil.canComputeColumnWidth(font)); SheetUtil.canComputeColumnWidth(font));
} }

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
View File

@ -324,7 +324,7 @@ public final class TestXSSFSheet extends BaseTestXSheet {
cellXf.setXfId(1); cellXf.setXfId(1);
stylesTable.putCellXf(cellXf); stylesTable.putCellXf(cellXf);
XSSFCellStyle cellStyle = new XSSFCellStyle(1, 1, stylesTable, null); XSSFCellStyle cellStyle = new XSSFCellStyle(1, 1, stylesTable, null);
assertEquals(1, cellStyle.getFontIndexAsInt()); assertEquals(1, cellStyle.getFontIndex());
sheet.setDefaultColumnStyle(3, cellStyle); sheet.setDefaultColumnStyle(3, cellStyle);
assertEquals(1, ctWorksheet.getColsArray(0).getColArray(0).getStyle()); assertEquals(1, ctWorksheet.getColsArray(0).getColArray(0).getStyle());

4
src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
View File

@ -2850,12 +2850,12 @@ public final class TestBugs extends BaseTestBugzillaIssues {
Cell cell = row.getCell(1); Cell cell = row.getCell(1);
CellStyle style = cell.getCellStyle(); CellStyle style = cell.getCellStyle();
assertEquals(26, style.getFontIndexAsInt()); assertEquals(26, style.getFontIndex());
row = sheet.getRow(3); row = sheet.getRow(3);
cell = row.getCell(1); cell = row.getCell(1);
style = cell.getCellStyle(); style = cell.getCellStyle();
assertEquals(28, style.getFontIndexAsInt()); assertEquals(28, style.getFontIndex());
// check the two fonts // check the two fonts
HSSFFont font = wb.getFontAt(26); HSSFFont font = wb.getFontAt(26);

2
src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
View File

@ -395,7 +395,7 @@ public abstract class BaseTestBugzillaIssues {
cell0.setCellValue(longValue); cell0.setCellValue(longValue);
// autoSize will fail if required fonts are not installed, skip this test then // autoSize will fail if required fonts are not installed, skip this test then
Font font = wb.getFontAt(cell0.getCellStyle().getFontIndexAsInt()); Font font = wb.getFontAt(cell0.getCellStyle().getFontIndex());
Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font, Assume.assumeTrue("Cannot verify autoSizeColumn() because the necessary Fonts are not installed on this machine: " + font,
SheetUtil.canComputeColumnWidth(font)); SheetUtil.canComputeColumnWidth(font));

4
src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
View File

@ -312,7 +312,7 @@ public abstract class BaseTestCell {
cs = c.getCellStyle(); cs = c.getCellStyle();
assertNotNull("Formula Cell Style", cs); assertNotNull("Formula Cell Style", cs);
assertEquals("Font Index Matches", f.getIndexAsInt(), cs.getFontIndexAsInt()); assertEquals("Font Index Matches", f.getIndexAsInt(), cs.getFontIndex());
assertEquals("Top Border", BorderStyle.THIN, cs.getBorderTop()); assertEquals("Top Border", BorderStyle.THIN, cs.getBorderTop());
assertEquals("Left Border", BorderStyle.THIN, cs.getBorderLeft()); assertEquals("Left Border", BorderStyle.THIN, cs.getBorderLeft());
assertEquals("Right Border", BorderStyle.THIN, cs.getBorderRight()); assertEquals("Right Border", BorderStyle.THIN, cs.getBorderRight());
@ -731,7 +731,7 @@ public abstract class BaseTestCell {
assertTrue(style.getLocked()); assertTrue(style.getLocked());
assertFalse(style.getHidden()); assertFalse(style.getHidden());
assertEquals(0, style.getIndention()); assertEquals(0, style.getIndention());
assertEquals(0, style.getFontIndexAsInt()); assertEquals(0, style.getFontIndex());
assertEquals(HorizontalAlignment.GENERAL, style.getAlignment()); assertEquals(HorizontalAlignment.GENERAL, style.getAlignment());
assertEquals(0, style.getDataFormat()); assertEquals(0, style.getDataFormat());
assertFalse(style.getWrapText()); assertFalse(style.getWrapText());

2
src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
View File

@ -121,7 +121,7 @@ public abstract class BaseTestFont {
s1 = wb2.getSheetAt(0); s1 = wb2.getSheetAt(0);
assertEquals(num0 + 1, wb2.getNumberOfFonts()); assertEquals(num0 + 1, wb2.getNumberOfFonts());
int idx = s1.getRow(0).getCell(0).getCellStyle().getFontIndexAsInt(); int idx = s1.getRow(0).getCell(0).getCellStyle().getFontIndex();
Font fnt = wb2.getFontAt(idx); Font fnt = wb2.getFontAt(idx);
assertNotNull(fnt); assertNotNull(fnt);
assertEquals(IndexedColors.YELLOW.getIndex(), fnt.getColor()); assertEquals(IndexedColors.YELLOW.getIndex(), fnt.getColor());

8
src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
View File

@ -313,17 +313,17 @@ public abstract class BaseTestCellUtil {
// should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call. // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call.
// HSSFCellStyle wraps an underlying style record, and the underlying // HSSFCellStyle wraps an underlying style record, and the underlying
// style record is the same between multiple getCellStyle() calls. // style record is the same between multiple getCellStyle() calls.
assertEquals(defaultFontIndex, A1.getCellStyle().getFontIndexAsInt()); assertEquals(defaultFontIndex, A1.getCellStyle().getFontIndex());
assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndexAsInt()); assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndex());
// get/set alignment modifies the cell's style // get/set alignment modifies the cell's style
CellUtil.setFont(A1, font); CellUtil.setFont(A1, font);
assertEquals(customFontIndex, A1.getCellStyle().getFontIndexAsInt()); assertEquals(customFontIndex, A1.getCellStyle().getFontIndex());
// get/set alignment doesn't affect the style of cells with // get/set alignment doesn't affect the style of cells with
// the same style prior to modifying the style // the same style prior to modifying the style
assertNotEquals(A1.getCellStyle(), B1.getCellStyle()); assertNotEquals(A1.getCellStyle(), B1.getCellStyle());
assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndexAsInt()); assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndex());
wb.close(); wb.close();
} }