From a420b9090603d46364051710ed74517ad11f5c27 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 30 Jun 2017 13:00:57 +0000 Subject: [PATCH] Remove more deprecated code (MissingCellPolicy) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1800400 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/ss/usermodel/Row.java | 44 ++----------------- .../apache/poi/xssf/usermodel/XSSFChart.java | 2 - .../apache/poi/xssf/usermodel/XSSFFont.java | 4 +- .../apache/poi/xssf/usermodel/XSSFRow.java | 2 +- .../apache/poi/xssf/usermodel/XSSFSheet.java | 14 ------ 5 files changed, 6 insertions(+), 60 deletions(-) diff --git a/src/java/org/apache/poi/ss/usermodel/Row.java b/src/java/org/apache/poi/ss/usermodel/Row.java index f58775704c..71defe2e7c 100644 --- a/src/java/org/apache/poi/ss/usermodel/Row.java +++ b/src/java/org/apache/poi/ss/usermodel/Row.java @@ -19,8 +19,6 @@ package org.apache.poi.ss.usermodel; import java.util.Iterator; -import org.apache.poi.util.Removal; - /** * High level representation of a row of a spreadsheet. */ @@ -237,46 +235,10 @@ public interface Row extends Iterable { * if for the case of null and blank cells */ public enum MissingCellPolicy { - RETURN_NULL_AND_BLANK(1), - RETURN_BLANK_AS_NULL(2), - CREATE_NULL_AS_BLANK(3); - - /** - * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - the id has no function and will be removed. - * The {@code id} is only kept only for backwards compatibility with applications that hard-coded the number - */ - @Removal(version="3.17") - @Deprecated - public final int id; - private MissingCellPolicy(int id) { - this.id = id; - } + RETURN_NULL_AND_BLANK, + RETURN_BLANK_AS_NULL, + CREATE_NULL_AS_BLANK; } - - /** - * Missing cells are returned as null, Blank cells are returned as normal - * - * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum - **/ - @Removal(version="3.17") - @Deprecated - public static final MissingCellPolicy RETURN_NULL_AND_BLANK = MissingCellPolicy.RETURN_NULL_AND_BLANK; - /** - * Missing cells and blank cells are returned as null - * - * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum - **/ - @Removal(version="3.17") - @Deprecated - public static final MissingCellPolicy RETURN_BLANK_AS_NULL = MissingCellPolicy.RETURN_BLANK_AS_NULL; - /** - * A new, blank cell is created for missing cells. Blank cells are returned as normal - * - * @deprecated as of POI 3.15-beta2, scheduled for removal in 3.17 - use the MissingCellPolicy enum - **/ - @Removal(version="3.17") - @Deprecated - public static final MissingCellPolicy CREATE_NULL_AS_BLANK = MissingCellPolicy.CREATE_NULL_AS_BLANK; /** * Returns the rows outline level. Increased as you diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java index d7f935e6b4..ed9a88b3ea 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java @@ -112,8 +112,6 @@ public final class XSSFChart extends POIXMLDocumentPart implements Chart, ChartA /** * Construct a new CTChartSpace bean. * By default, it's just an empty placeholder for chart objects. - * - * @return a new CTChartSpace bean */ private void createChart() { chartSpace = CTChartSpace.Factory.newInstance(); 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 d0144bd1d5..2bfef58175 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java @@ -408,7 +408,7 @@ public class XSSFFont implements Font { /** * set the font height in points. * - * @link #setFontHeight + * @see #setFontHeight */ public void setFontHeightInPoints(short height) { setFontHeight((double)height); @@ -608,7 +608,7 @@ public class XSSFFont implements Font { * A font family is a set of fonts having common stroke width and serif characteristics. * * @param family font family - * @link #setFamily(int value) + * @see #setFamily(int value) */ public void setFamily(FontFamily family) { setFamily(family.getValue()); diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java index e936ed554d..35ed242813 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java @@ -281,7 +281,7 @@ public class XSSFRow implements Row, Comparable { case CREATE_NULL_AS_BLANK: return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell; default: - throw new IllegalArgumentException("Illegal policy " + policy + " (" + policy.id + ")"); + throw new IllegalArgumentException("Illegal policy " + policy); } } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java index 0720d8d8b1..b5b4e42cfd 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java @@ -3980,20 +3980,6 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { } return new XSSFColor(pr.getTabColor(), getWorkbook().getStylesSource().getIndexedColors()); } - - /** - * Set background color of the sheet tab - * - * @param colorIndex the indexed color to set, must be a constant from {@link org.apache.poi.ss.usermodel.IndexedColors} - * @deprecated 3.15-beta2. Removed in 3.17. Use {@link #setTabColor(XSSFColor)}. - */ - @Deprecated - @Removal(version="3.17") - public void setTabColor(int colorIndex) { - IndexedColors indexedColor = IndexedColors.fromInt(colorIndex); - XSSFColor color = new XSSFColor(indexedColor, getWorkbook().getStylesSource().getIndexedColors()); - setTabColor(color); - } /** * Set background color of the sheet tab