Author: fanningpj
Date: Fri Jun 30 13:00:57 2017
New Revision: 1800400
URL: http://svn.apache.org/viewvc?rev=1800400&view=rev
Log:
Remove more deprecated code (MissingCellPolicy)
Modified:
poi/trunk/src/java/org/apache/poi/ss/usermodel/Row.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Row.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Row.java?rev=1800400&r1=1800399&r2=1800400&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Row.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Row.java Fri Jun 30 13:00:57
2017
@@ -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<Ce
* 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
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java?rev=1800400&r1=1800399&r2=1800400&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java Fri
Jun 30 13:00:57 2017
@@ -112,8 +112,6 @@ public final class XSSFChart extends POI
/**
* 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();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java?rev=1800400&r1=1800399&r2=1800400&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java Fri
Jun 30 13:00:57 2017
@@ -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());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java?rev=1800400&r1=1800399&r2=1800400&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java Fri Jun
30 13:00:57 2017
@@ -281,7 +281,7 @@ public class XSSFRow implements Row, Com
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);
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1800400&r1=1800399&r2=1800400&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Fri
Jun 30 13:00:57 2017
@@ -3980,20 +3980,6 @@ public class XSSFSheet extends POIXMLDoc
}
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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
