From a42127e15b941e250920d3c6b81e22fb89390ba1 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 9 Dec 2020 16:59:51 +0000 Subject: [PATCH] remove more deprecated code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884259 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/apache/poi/examples/ss/CellStyleDetails.java | 2 +- .../src/org/apache/poi/examples/ss/ExcelComparator.java | 4 ++-- .../src/org/apache/poi/examples/ss/html/ToHtml.java | 2 +- src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java | 6 +++--- src/java/org/apache/poi/ss/util/CellUtil.java | 2 +- src/java/org/apache/poi/ss/util/SheetUtil.java | 2 +- .../poi/xssf/streaming/TestAutoSizeColumnTracker.java | 2 +- .../poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java | 2 +- .../org/apache/poi/xssf/usermodel/TestXSSFSheet.java | 2 +- src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java | 4 ++-- .../apache/poi/ss/usermodel/BaseTestBugzillaIssues.java | 2 +- .../org/apache/poi/ss/usermodel/BaseTestCell.java | 4 ++-- .../org/apache/poi/ss/usermodel/BaseTestFont.java | 2 +- .../org/apache/poi/ss/util/BaseTestCellUtil.java | 8 ++++---- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java b/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java index 5081bfcd52..6997a9e8fa 100644 --- a/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java +++ b/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java @@ -66,7 +66,7 @@ public final class CellStyleDetails { System.out.print("FG=" + renderColor(style.getFillForegroundColorColor()) + " "); 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("FontColor="); if (font instanceof HSSFFont) { diff --git a/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java b/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java index c09efaec1b..eb80d9286f 100644 --- a/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java +++ b/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java @@ -545,9 +545,9 @@ public class ExcelComparator { } 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 fontIdx2 = loc2.cell.getCellStyle().getFontIndexAsInt(); + int fontIdx2 = loc2.cell.getCellStyle().getFontIndex(); int fontCount2 = ((XSSFWorkbook)loc2.workbook).getStylesSource().getFonts().size(); if(fontIdx1 >= fontCount1 || fontIdx2 >= fontCount2) { diff --git a/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java b/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java index f20604240f..65c8878916 100644 --- a/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java +++ b/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java @@ -299,7 +299,7 @@ public final class ToHtml { } private void fontStyle(CellStyle style) { - Font font = wb.getFontAt(style.getFontIndexAsInt()); + Font font = wb.getFontAt(style.getFontIndex()); if (font.getBold()) { out.format(" font-weight: bold;%n"); diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java index 894c194ba0..db18e0fc9b 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java @@ -214,11 +214,11 @@ public final class HSSFCellStyle implements CellStyle, Duplicatable { /** * gets the font for this style * @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) */ 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(); fr.cloneStyleFrom( source._workbook.getFontRecordAt( - source.getFontIndexAsInt() + source.getFontIndex() ) ); diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java index 24d9a5126a..dfbbf04481 100644 --- a/src/java/org/apache/poi/ss/util/CellUtil.java +++ b/src/java/org/apache/poi/ss/util/CellUtil.java @@ -348,7 +348,7 @@ public final class CellUtil { put(properties, FILL_PATTERN, style.getFillPattern()); put(properties, FILL_FOREGROUND_COLOR, style.getFillForegroundColor()); put(properties, FILL_BACKGROUND_COLOR, style.getFillBackgroundColor()); - put(properties, FONT, style.getFontIndexAsInt()); + put(properties, FONT, style.getFontIndex()); put(properties, HIDDEN, style.getHidden()); put(properties, INDENTION, style.getIndention()); put(properties, LEFT_BORDER_COLOR, style.getLeftBorderColor()); diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/src/java/org/apache/poi/ss/util/SheetUtil.java index 1fb06f98c1..d26e2c2a26 100644 --- a/src/java/org/apache/poi/ss/util/SheetUtil.java +++ b/src/java/org/apache/poi/ss/util/SheetUtil.java @@ -156,7 +156,7 @@ public class SheetUtil { if (cellType == CellType.FORMULA) cellType = cell.getCachedFormulaResultType(); - Font font = wb.getFontAt(style.getFontIndexAsInt()); + Font font = wb.getFontAt(style.getFontIndex()); double width = -1; if (cellType == CellType.STRING) { diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java index a38a5c9355..aac3e88324 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java @@ -211,7 +211,7 @@ public class TestAutoSizeColumnTracker { private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) { // 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, SheetUtil.canComputeColumnWidth(font)); } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java index 34e3a57e5e..97b11553d9 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java @@ -351,7 +351,7 @@ public class TestSXSSFSheetAutoSizeColumn { private static void assumeRequiredFontsAreInstalled(final Workbook workbook, final Cell cell) { // 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, SheetUtil.canComputeColumnWidth(font)); } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java index 28239f47b3..1ed0273e35 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java @@ -324,7 +324,7 @@ public final class TestXSSFSheet extends BaseTestXSheet { cellXf.setXfId(1); stylesTable.putCellXf(cellXf); XSSFCellStyle cellStyle = new XSSFCellStyle(1, 1, stylesTable, null); - assertEquals(1, cellStyle.getFontIndexAsInt()); + assertEquals(1, cellStyle.getFontIndex()); sheet.setDefaultColumnStyle(3, cellStyle); assertEquals(1, ctWorksheet.getColsArray(0).getColArray(0).getStyle()); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java index 66657a0fd9..24c5bf4c92 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java @@ -2850,12 +2850,12 @@ public final class TestBugs extends BaseTestBugzillaIssues { Cell cell = row.getCell(1); CellStyle style = cell.getCellStyle(); - assertEquals(26, style.getFontIndexAsInt()); + assertEquals(26, style.getFontIndex()); row = sheet.getRow(3); cell = row.getCell(1); style = cell.getCellStyle(); - assertEquals(28, style.getFontIndexAsInt()); + assertEquals(28, style.getFontIndex()); // check the two fonts HSSFFont font = wb.getFontAt(26); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java index 4579cefadd..1fa9580f55 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java @@ -395,7 +395,7 @@ public abstract class BaseTestBugzillaIssues { cell0.setCellValue(longValue); // 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, SheetUtil.canComputeColumnWidth(font)); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java index e2032de2df..43d33d3d3f 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java @@ -312,7 +312,7 @@ public abstract class BaseTestCell { cs = c.getCellStyle(); 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("Left Border", BorderStyle.THIN, cs.getBorderLeft()); assertEquals("Right Border", BorderStyle.THIN, cs.getBorderRight()); @@ -731,7 +731,7 @@ public abstract class BaseTestCell { assertTrue(style.getLocked()); assertFalse(style.getHidden()); assertEquals(0, style.getIndention()); - assertEquals(0, style.getFontIndexAsInt()); + assertEquals(0, style.getFontIndex()); assertEquals(HorizontalAlignment.GENERAL, style.getAlignment()); assertEquals(0, style.getDataFormat()); assertFalse(style.getWrapText()); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java index 30d80a73c7..92a566888f 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java @@ -121,7 +121,7 @@ public abstract class BaseTestFont { s1 = wb2.getSheetAt(0); 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); assertNotNull(fnt); assertEquals(IndexedColors.YELLOW.getIndex(), fnt.getColor()); diff --git a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java b/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java index 416dd4d55b..5523827cc5 100644 --- a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java +++ b/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java @@ -313,17 +313,17 @@ public abstract class BaseTestCellUtil { // should be assertSame, but a new HSSFCellStyle is returned for each getCellStyle() call. // HSSFCellStyle wraps an underlying style record, and the underlying // style record is the same between multiple getCellStyle() calls. - assertEquals(defaultFontIndex, A1.getCellStyle().getFontIndexAsInt()); - assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndexAsInt()); + assertEquals(defaultFontIndex, A1.getCellStyle().getFontIndex()); + assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndex()); // get/set alignment modifies the cell's style 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 // the same style prior to modifying the style assertNotEquals(A1.getCellStyle(), B1.getCellStyle()); - assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndexAsInt()); + assertEquals(defaultFontIndex, B1.getCellStyle().getFontIndex()); wb.close(); } -- 2.39.5