Remove use of deprecated methods

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

diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
index 04475e0bc8e037a2cd569b486c867423356b3295..cce48c53a04e8438146e1fce930a71ad3ffc9624 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
@@ -55,7 +55,7 @@ public final class SXSSFPicture implements Picture {
      * numbers 0, 1, 2, ..., 9 as rendered in the normal style's font. There are 4 pixels of margin
      * padding (two on each side), plus 1 pixel padding for the gridlines.
      *
-     * This value is the same for default font in Office 2007 (Calibry) and Office 2003 and earlier (Arial)
+     * This value is the same for default font in Office 2007 (Calibri) and Office 2003 and earlier (Arial)
      */
     private static float DEFAULT_COLUMN_WIDTH = 9.140625f;
 

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
index 3a23be04b906c96c37f4fcc02686ef05490b83ac..1c16ebc4be9ec408c5267b5d664b82bfaeaf1577 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
@@ -47,11 +47,11 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.STVerticalAlignRun;
 public class XSSFFont implements Font {
 
     /**
-     * By default, Microsoft Office Excel 2007 uses the Calibry font in font size 11
+     * By default, Microsoft Office Excel 2007 uses the Calibri font in font size 11
      */
     public static final String DEFAULT_FONT_NAME = "Calibri";
     /**
-     * By default, Microsoft Office Excel 2007 uses the Calibry font in font size 11
+     * By default, Microsoft Office Excel 2007 uses the Calibri font in font size 11
      */
     public static final short DEFAULT_FONT_SIZE = 11;
     /**

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
index 85eb35a6e92c444b8c99782499a999aeb848290b..b488f1a6ba982dc85ff6e695e6c75c90caf06d01 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
@@ -53,7 +53,7 @@ public final class XSSFPicture extends XSSFShape implements Picture {
      * numbers 0, 1, 2, ..., 9 as rendered in the normal style's font. There are 4 pixels of margin
      * padding (two on each side), plus 1 pixel padding for the gridlines.
      *
-     * This value is the same for default font in Office 2007 (Calibry) and Office 2003 and earlier (Arial)
+     * This value is the same for default font in Office 2007 (Calibri) and Office 2003 and earlier (Arial)
      */
     // private static float DEFAULT_COLUMN_WIDTH = 9.140625f;
 

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 dc6890ecafe5230d740286a010f103a746380e04..9298781d68bfe2ae8c9772d80daa5ff53edc471b 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -123,7 +123,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
     private static final Pattern COMMA_PATTERN = Pattern.compile(",");
 
     /**
-     * Width of one character of the default font in pixels. Same for Calibry and Arial.
+     * Width of one character of the default font in pixels. Same for Calibri and Arial.
      * @deprecated POI 3.17 beta 1
      * @see Units#DEFAULT_CHARACTER_WIDTH
      */

diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
index 614b749358ccd6eb57da8a9c7eb4a9d1cb271d9e..ece9b46831f1aaed8a194fdf5ec4772c9c797014 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
@@ -43,16 +43,7 @@ public class AbstractExcelUtils
     /*package*/ static final String EMPTY = "";
     private static final short EXCEL_COLUMN_WIDTH_FACTOR = 256;
     private static final int UNIT_OFFSET_LENGTH = 7;
-    
-    /**
-     * @param alignment The horizontal alignment. See {@link HorizontalAlignment}.
-     * @return a friendly string representation of the alignment code
-     * @deprecated POI 3.15 beta 3. Use {@link #getAlign(HorizontalAlignment)} instead.
-     */
-    public static String getAlign( short alignment )
-    {
-        return getAlign(HorizontalAlignment.forInt(alignment));
-    }
+
     public static String getAlign( HorizontalAlignment alignment )
     {
         switch ( alignment )

diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
index b19aca9cd87dd87a0715c13c3f85f9d2a69526dd..7666cccbb1a38864140606a67b8096a5a54dfd9c 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
@@ -40,6 +40,7 @@ import org.apache.poi.hwpf.converter.FontReplacer.Triplet;
 import org.apache.poi.ss.formula.eval.ErrorEval;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.Beta;
 import org.apache.poi.util.POILogFactory;
@@ -335,17 +336,16 @@ public class ExcelToFoConverter extends AbstractExcelConverter
     {
         blockTarget.setAttribute( "white-space-collapse", "false" );
         {
-            String textAlign = ExcelToFoUtils.getAlign( cellStyle
-                    .getAlignment() );
+            String textAlign = ExcelToFoUtils.getAlign( cellStyle.getAlignmentEnum() );
             if ( ExcelToFoUtils.isNotEmpty( textAlign ) )
                 blockTarget.setAttribute( "text-align", textAlign );
         }
 
-        if ( cellStyle.getFillPattern() == 0 )
+        if ( cellStyle.getFillPatternEnum() == FillPatternType.NO_FILL )
         {
             // no fill
         }
-        else if ( cellStyle.getFillPattern() == 1 )
+        else if ( cellStyle.getFillPatternEnum() == FillPatternType.SOLID_FOREGROUND )
         {
             final HSSFColor foregroundColor = cellStyle
                     .getFillForegroundColorColor();

diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
index 87c92734a80c60d81afb1687615cac3c96d223e7..1befb72e4659e190232de0df86717359d2366bca 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
@@ -190,12 +190,12 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
         StringBuilder style = new StringBuilder();
 
         style.append( "white-space:pre-wrap;" );
-        ExcelToHtmlUtils.appendAlign( style, cellStyle.getAlignment() );
+        ExcelToHtmlUtils.appendAlign( style, cellStyle.getAlignmentEnum() );
 
-        switch (cellStyle.getFillPattern()) {
+        switch (cellStyle.getFillPatternEnum()) {
             // no fill
-            case 0: break;
-            case 1:
+            case NO_FILL: break;
+            case SOLID_FOREGROUND:
                 final HSSFColor foregroundColor = cellStyle.getFillForegroundColorColor();
                 if ( foregroundColor == null ) break;
                 String fgCol = ExcelToHtmlUtils.getColor( foregroundColor );
@@ -444,7 +444,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter
             innerDivStyle.append( "overflow:hidden;max-height:" );
             innerDivStyle.append( normalHeightPt );
             innerDivStyle.append( "pt;white-space:nowrap;" );
-            ExcelToHtmlUtils.appendAlign( innerDivStyle, cellStyle.getAlignment() );
+            ExcelToHtmlUtils.appendAlign( innerDivStyle, cellStyle.getAlignmentEnum() );
             htmlDocumentFacade.addStyleClass( outerDiv, cssClassPrefixDiv,
                     innerDivStyle.toString() );
 

diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
index f19023f0479ad207b1e44494a801b27ffae1ec7b..fbc20e1e095dba4fca78275e33d98095f1d0a4ee 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
@@ -19,13 +19,14 @@ package org.apache.poi.hssf.converter;
 import java.util.Arrays;
 
 import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.Beta;
 
 @Beta
 public class ExcelToHtmlUtils extends AbstractExcelUtils
 {
-    public static void appendAlign( StringBuilder style, short alignment )
+    public static void appendAlign( StringBuilder style, HorizontalAlignment alignment )
     {
         String cssAlign = getAlign( alignment );
         if ( isEmpty( cssAlign ) )