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 (MissingCellPolicy) 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1800400 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2017-06-30 13:00:57 +00:00
parent 0dff17384f
commit a420b90906
5 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/java/org/apache/poi/ss/usermodel/Row.java
View File

@ -19,8 +19,6 @@ package org.apache.poi.ss.usermodel;
import java.util.Iterator; import java.util.Iterator;
import org.apache.poi.util.Removal;
/** /**
* High level representation of a row of a spreadsheet. * High level representation of a row of a spreadsheet.
*/ */
@ -237,46 +235,10 @@ public interface Row extends Iterable<Cell> {
* if for the case of null and blank cells * if for the case of null and blank cells
*/ */
public enum MissingCellPolicy { public enum MissingCellPolicy {
RETURN_NULL_AND_BLANK(1), RETURN_NULL_AND_BLANK,
RETURN_BLANK_AS_NULL(2), RETURN_BLANK_AS_NULL,
CREATE_NULL_AS_BLANK(3); CREATE_NULL_AS_BLANK;
/**
* @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;
} }
}
/**
* 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 * Returns the rows outline level. Increased as you

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

@ -112,8 +112,6 @@ public final class XSSFChart extends POIXMLDocumentPart implements Chart, ChartA
/** /**
* Construct a new CTChartSpace bean. * Construct a new CTChartSpace bean.
* By default, it's just an empty placeholder for chart objects. * By default, it's just an empty placeholder for chart objects.
*
* @return a new CTChartSpace bean
*/ */
private void createChart() { private void createChart() {
chartSpace = CTChartSpace.Factory.newInstance(); chartSpace = CTChartSpace.Factory.newInstance();

4
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
View File

@ -408,7 +408,7 @@ public class XSSFFont implements Font {
/** /**
* set the font height in points. * set the font height in points.
* *
* @link #setFontHeight * @see #setFontHeight
*/ */
public void setFontHeightInPoints(short height) { public void setFontHeightInPoints(short height) {
setFontHeight((double)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. * A font family is a set of fonts having common stroke width and serif characteristics.
* *
* @param family font family * @param family font family
* @link #setFamily(int value) * @see #setFamily(int value)
*/ */
public void setFamily(FontFamily family) { public void setFamily(FontFamily family) {
setFamily(family.getValue()); setFamily(family.getValue());

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

@ -281,7 +281,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
case CREATE_NULL_AS_BLANK: case CREATE_NULL_AS_BLANK:
return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell; return (cell == null) ? createCell(cellnum, CellType.BLANK) : cell;
default: default:
throw new IllegalArgumentException("Illegal policy " + policy + " (" + policy.id + ")"); throw new IllegalArgumentException("Illegal policy " + policy);
} }
} }

14
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -3981,20 +3981,6 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
return new XSSFColor(pr.getTabColor(), getWorkbook().getStylesSource().getIndexedColors()); 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 * Set background color of the sheet tab
* *