tidy up API for font index

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1825409 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java b/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
index f80b073a0ebd25810d437c7fbd98f3032d66634c..484df3b9e43c6e53baa4eea29191fc011ff47f67 100644 (file)
--- a/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
+++ b/src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java
@@ -138,7 +138,7 @@ public class SVTableCellEditor extends AbstractCellEditor implements TableCellEd
         HSSFCell cell = (HSSFCell) value;
         if (cell != null) {
             HSSFCellStyle style = cell.getCellStyle();
-            HSSFFont f = wb.getFontAt(style.getFontIntIndex());
+            HSSFFont f = wb.getFontAt(style.getFontIndexAsInt());
             boolean isbold = f.getBold();
             boolean isitalics = f.getItalic();
 

diff --git a/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java b/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java
index 1b9a62145815d4b799f5f4ae3ced67c197426dd8..b2bc4a6484a65c6f1937ce88a90bd148b0d0d503 100644 (file)
--- a/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java
+++ b/src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java
@@ -148,7 +148,7 @@ public class SVTableCellRenderer extends JLabel
 
         if (c != null) {
           HSSFCellStyle s = c.getCellStyle();
-          HSSFFont f = wb.getFontAt(s.getFontIntIndex());
+          HSSFFont f = wb.getFontAt(s.getFontIndexAsInt());
           setFont(SVTableUtils.makeFont(f));
 
           if (s.getFillPattern() == FillPatternType.SOLID_FOREGROUND) {

diff --git a/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java b/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java
index b2e7e0b94fc66a50275781792b191bb5cfd3de3b..e66e6b4c56a77c4450d3f6bf3691c13f9ff0a21d 100644 (file)
--- a/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java
+++ b/src/examples/src/org/apache/poi/ss/examples/CellStyleDetails.java
@@ -63,7 +63,7 @@ public class CellStyleDetails {
                         System.out.print("FG=" + renderColor(style.getFillForegroundColorColor()) + " ");
                         System.out.print("BG=" + renderColor(style.getFillBackgroundColorColor()) + " ");
 
-                        Font font = wb.getFontAt(style.getFontIntIndex());
+                        Font font = wb.getFontAt(style.getFontIndexAsInt());
                         System.out.print("Font=" + font.getFontName() + " ");
                         System.out.print("FontColor=");
                         if (font instanceof HSSFFont) {

diff --git a/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java b/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
index 8c97993f466c9a07ef96ebf2f5e076e64568bc81..4c11fcf445c72f2f1eb275e5c9d4e12d4129260a 100644 (file)
--- a/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
+++ b/src/examples/src/org/apache/poi/ss/examples/html/ToHtml.java
@@ -300,7 +300,7 @@ public class ToHtml {
     }
 
     private void fontStyle(CellStyle style) {
-        Font font = wb.getFontAt(style.getFontIntIndex());
+        Font font = wb.getFontAt(style.getFontIndexAsInt());
 
         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 fde539c6efe677559148e46fbd4b5c58a6305e13..a3879a91945ff2d7423b295e7c751f21c3a68e80 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
@@ -198,7 +198,7 @@ public final class HSSFCellStyle implements CellStyle {
      * @since 4.0.0
      */
     @Override
-    public int getFontIntIndex()
+    public int getFontIndexAsInt()
     {
         return _format.getFontIndex();
     }
@@ -206,11 +206,11 @@ public final class HSSFCellStyle implements CellStyle {
     /**
      * gets the font for this style
      * @param parentWorkbook The HSSFWorkbook that this style belongs to
-     * @see org.apache.poi.hssf.usermodel.HSSFCellStyle#getFontIntIndex()
+     * @see org.apache.poi.hssf.usermodel.HSSFCellStyle#getFontIndexAsInt()
      * @see org.apache.poi.hssf.usermodel.HSSFWorkbook#getFontAt(int)
      */
     public HSSFFont getFont(org.apache.poi.ss.usermodel.Workbook parentWorkbook) {
-        return ((HSSFWorkbook) parentWorkbook).getFontAt(getFontIntIndex());
+        return ((HSSFWorkbook) parentWorkbook).getFontAt(getFontIndexAsInt());
     }
 
     /**
@@ -849,7 +849,7 @@ public final class HSSFCellStyle implements CellStyle {
             FontRecord fr = _workbook.createNewFont();
             fr.cloneStyleFrom(
                     source._workbook.getFontRecordAt(
-                            source.getFontIntIndex()
+                            source.getFontIndexAsInt()
                     )
             );
 

diff --git a/src/java/org/apache/poi/ss/usermodel/CellStyle.java b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
index 3e9f37439667a86a3b0277f289e2b7e6e67d508e..a809458af05df54ebd12081191743f5dd94cffd2 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/CellStyle.java
+++ b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
@@ -56,7 +56,7 @@ public interface CellStyle {
     /**
      * gets the index of the font for this style
      * @see Workbook#getFontAt(short)
-     * @deprecated use <code>getFontIntIndex()</code> instead
+     * @deprecated use <code>getFontIndexAsInt()</code> instead
      */
     @Removal(version = "4.2")
     short getFontIndex();
@@ -66,7 +66,7 @@ public interface CellStyle {
      * @see Workbook#getFontAt(int)
      * @since 4.0.0
      */
-    int getFontIntIndex();
+    int getFontIndexAsInt();
 
     /**
      * set the cell's using this style to be hidden

diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java
index ce72bd88e7ae4c65815e304ae2c68959f9a4f016..70dcffc289910ab5ece7e8a6fa0e969e2baf9049 100644 (file)
--- a/src/java/org/apache/poi/ss/util/CellUtil.java
+++ b/src/java/org/apache/poi/ss/util/CellUtil.java
@@ -346,7 +346,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.getFontIntIndex());
+        put(properties, FONT, style.getFontIndexAsInt());
         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 2293ebcb1c602adf370fbfce3a988e105de1654a..e5c2a31ba940218eb442603e7f9ad543fd91f4da 100644 (file)
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/src/java/org/apache/poi/ss/util/SheetUtil.java
@@ -144,7 +144,7 @@ public class SheetUtil {
         if (cellType == CellType.FORMULA)
             cellType = cell.getCachedFormulaResultType();
 
-        Font font = wb.getFontAt(style.getFontIntIndex());
+        Font font = wb.getFontAt(style.getFontIndexAsInt());
 
         double width = -1;
         if (cellType == CellType.STRING) {

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index df64296033f87b8dfa12362c48576ada91b5baba..668079c3813024b7fba822d51d7a281c3a895faa 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
@@ -482,7 +482,7 @@ public class XSSFCellStyle implements CellStyle {
      * @since 4.0.0
      */
     @Override
-    public int getFontIntIndex() {
+    public int getFontIndexAsInt() {
         return getFontId();
     }
 

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 6afcdd8d95ec7a7121c340b1b1d19f2ecf675a4d..f3ba5196517053ba789a7d29a855cc9863eac085 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
@@ -210,7 +210,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().getFontIntIndex());
+        Font font = workbook.getFontAt(cell.getCellStyle().getFontIndexAsInt());
         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 04dd83ed57c7345edb16f62fc35897106ad1cc83..58d2f3772e0df05abd0309fd7b142f65dcff6011 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
@@ -350,7 +350,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().getFontIntIndex());
+        Font font = workbook.getFontAt(cell.getCellStyle().getFontIndexAsInt());
         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 b26d177df687180c51ad1154426b54a24a90abe6..ed22dd3ecd8a968ab62fe59a8063e58652ca46e2 100644 (file)
--- 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.getFontIntIndex());
+        assertEquals(1, cellStyle.getFontIndexAsInt());
 
         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 ca96f0d7c44739e1f7466d703da2a308f30a2adf..46a84b61a6c4e73a5f7ea29938a5479d14c8a16d 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -3130,12 +3130,12 @@ public final class TestBugs extends BaseTestBugzillaIssues {
 
             Cell cell = row.getCell(1);
             CellStyle style = cell.getCellStyle();
-            assertEquals(26, style.getFontIntIndex());
+            assertEquals(26, style.getFontIndexAsInt());
 
             row = sheet.getRow(3);
             cell = row.getCell(1);
             style = cell.getCellStyle();
-            assertEquals(28, style.getFontIntIndex());
+            assertEquals(28, style.getFontIndexAsInt());
 
             // check the two fonts
             HSSFFont font = wb.getFontAt(26);

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
index 889b72caf24fee2e958f432e7be2ac7143a224ea..bd8c74032bc845f24c5be8f417396e72756c3fdc 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
@@ -115,7 +115,7 @@ public abstract class BaseTestFont {
         s1 = wb2.getSheetAt(0);
 
         assertEquals(num0 + 1, wb2.getNumberOfFontsAsInt());
-        int idx = s1.getRow(0).getCell(0).getCellStyle().getFontIntIndex();
+        int idx = s1.getRow(0).getCell(0).getCellStyle().getFontIndexAsInt();
         Font fnt = wb2.getFontAt(idx);
         assertNotNull(fnt);
         assertEquals(IndexedColors.YELLOW.getIndex(), fnt.getColor());