Apache/poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2025-02-08 02:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove some deprecated code

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1879911 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-07-15 22:49:32 +00:00
parent cdf5f3d1fe
commit 8900e397a4
9 changed files with 16 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
View File

@ -21,7 +21,6 @@ import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationSheet;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.Removal;
/**
* HSSF wrapper for a cell under evaluation
@ -59,16 +58,6 @@ final class HSSFEvaluationCell implements EvaluationCell {
public CellType getCellType() {
return _cell.getCellType();
}
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
*/
@Deprecated
@Removal(version = "4.2")
@Override
public CellType getCellTypeEnum() {
return getCellType();
}
@Override
public int getColumnIndex() {
return _cell.getColumnIndex();
@ -110,16 +99,4 @@ final class HSSFEvaluationCell implements EvaluationCell {
*/
@Override
public CellType getCachedFormulaResultType() { return _cell.getCachedFormulaResultType(); }
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
@Override
public CellType getCachedFormulaResultTypeEnum() {
return getCachedFormulaResultType();
}
}

16
src/java/org/apache/poi/ss/formula/EvaluationCell.java
View File

@ -19,7 +19,6 @@ package org.apache.poi.ss.formula;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.Removal;
/**
* Abstracts a cell for the purpose of formula evaluation. This interface represents both formula
@ -40,13 +39,6 @@ public interface EvaluationCell {
int getRowIndex();
int getColumnIndex();
CellType getCellType();
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
*/
@Deprecated
@Removal(version = "4.2")
CellType getCellTypeEnum();
double getNumericCellValue();
String getStringCellValue();
@ -59,12 +51,4 @@ public interface EvaluationCell {
* @return cell type of cached formula result
*/
CellType getCachedFormulaResultType();
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
CellType getCachedFormulaResultTypeEnum();
}

26
src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
View File

@ -28,8 +28,6 @@ import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.Removal;
/**
* Represents a cell being used for forked evaluation that has had a value set different from the
@ -110,17 +108,6 @@ final class ForkedEvaluationCell implements EvaluationCell {
public CellType getCellType() {
return _cellType;
}
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
@Override
public CellType getCellTypeEnum() {
return getCellType();
}
@Override
public boolean getBooleanCellValue() {
checkCellType(CellType.BOOLEAN);
@ -170,17 +157,4 @@ final class ForkedEvaluationCell implements EvaluationCell {
public CellType getCachedFormulaResultType() {
return _masterCell.getCachedFormulaResultType();
}
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
@Override
public CellType getCachedFormulaResultTypeEnum() {
return getCachedFormulaResultType();
}
}

1
src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java
View File

@ -34,7 +34,6 @@ import org.apache.poi.openxml4j.opc.PackageAccess;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
import org.apache.poi.util.Removal;
import org.apache.xmlbeans.impl.common.SystemCache;
/**

25
src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
View File

@ -40,7 +40,6 @@ import org.apache.poi.util.IOUtils;
import org.apache.poi.util.Internal;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.Removal;
import org.apache.poi.xddf.usermodel.chart.XDDFChart;
import org.apache.poi.xssf.usermodel.XSSFRelation;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -61,18 +60,6 @@ public class POIXMLDocumentPart {
private Map<String, RelationPart> relations = new LinkedHashMap<>();
private boolean isCommitted = false;
/**
* to check whether embedded part is already committed
*
* @return return true if embedded part is committed
* @deprecated use @link{#isCommitted()}
*/
@Removal(version = "5.0.0")
@Deprecated
public boolean isCommited() {
return isCommitted();
}
/**
* to check whether embedded part is already committed
*
@ -83,18 +70,6 @@ public class POIXMLDocumentPart {
return isCommitted;
}
/**
* setter method to set embedded part is committed
*
* @param isCommitted boolean value
* @deprecated use @link{#setCommitted(isCommitted)}
*/
@Removal(version = "5.0.0")
@Deprecated
public void setCommited(boolean isCommitted) {
this.isCommitted = isCommitted;
}
/**
* setter method to set embedded part is committed
*

1
src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java
View File

@ -50,7 +50,6 @@ import org.apache.poi.util.IOUtils;
import org.apache.poi.util.NotImplemented;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.Removal;
import org.apache.poi.xdgf.extractor.XDGFVisioExtractor;
import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
import org.apache.poi.xslf.usermodel.XMLSlideShow;

33
src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
View File

@ -27,9 +27,7 @@ import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.util.Internal;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.Removal;
import org.apache.poi.xssf.model.SharedStrings;
import org.apache.poi.xssf.usermodel.XSSFRichTextString;
import org.xml.sax.SAXException;
/**
@ -86,38 +84,9 @@ public class XSSFBSharedStringsTable implements SharedStrings {
reader.parse();
}
/**
* Return all the strings.
* Formatting is ignored.
*
* @return a list with all the shared strings.
* @deprecated use <code>getItemAt</code> instead
*/
@Removal(version = "4.2")
@Deprecated
public List<String> getItems() {
List<String> ret = new ArrayList<>(strings.size());
ret.addAll(strings);
return ret;
}
/**
* Return the string at a given index.
* Formatting is ignored.
*
* @param idx index of item to return.
* @return the item at the specified position in this Shared String table.
* @deprecated use <code>getItemAt</code> instead
*/
@Removal(version = "4.2")
@Deprecated
public String getEntryAt(int idx) {
return strings.get(idx);
}
@Override
public RichTextString getItemAt(int idx) {
return new XSSFRichTextString(getEntryAt(idx));
return getItemAt(idx);
}
/**

48
src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
View File

@ -21,8 +21,6 @@ import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationSheet;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.Internal;
import org.apache.poi.util.Removal;
/**
* SXSSF wrapper for a cell under evaluation
@ -50,10 +48,12 @@ final class SXSSFEvaluationCell implements EvaluationCell {
public SXSSFCell getSXSSFCell() {
return _cell;
}
@Override
public boolean getBooleanCellValue() {
return _cell.getBooleanCellValue();
}
/**
* @return cell type
*/
@ -61,52 +61,46 @@ final class SXSSFEvaluationCell implements EvaluationCell {
public CellType getCellType() {
return _cell.getCellType();
}
/**
* @since POI 3.15 beta 3
* @deprecated use <code>getCellType</code> instead
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
@Internal(since="POI 3.15 beta 3")
@Override
public CellType getCellTypeEnum() {
return _cell.getCellType();
}
@Override
public int getColumnIndex() {
return _cell.getColumnIndex();
}
@Override
public int getErrorCellValue() {
return _cell.getErrorCellValue();
}
@Override
public double getNumericCellValue() {
return _cell.getNumericCellValue();
}
@Override
public int getRowIndex() {
return _cell.getRowIndex();
}
@Override
public EvaluationSheet getSheet() {
return _evalSheet;
}
@Override
public String getStringCellValue() {
return _cell.getRichStringCellValue().getString();
}
@Override
public CellRangeAddress getArrayFormulaRange() {
return _cell.getArrayFormulaRange();
}
public CellRangeAddress getArrayFormulaRange() {
return _cell.getArrayFormulaRange();
}
@Override
public boolean isPartOfArrayFormulaGroup() {
return _cell.isPartOfArrayFormulaGroup();
}
@Override
public boolean isPartOfArrayFormulaGroup() {
return _cell.isPartOfArrayFormulaGroup();
}
/**
* @return cell type of cached formula result
@ -115,16 +109,4 @@ final class SXSSFEvaluationCell implements EvaluationCell {
public CellType getCachedFormulaResultType() {
return _cell.getCachedFormulaResultType();
}
/**
* @since POI 3.15 beta 3
* @deprecated POI 3.15 beta 3.
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
@Internal(since="POI 3.15 beta 3")
@Override
public CellType getCachedFormulaResultTypeEnum() {
return getCachedFormulaResultType();
}
}

24
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
View File

@ -21,8 +21,6 @@ import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationSheet;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.util.Internal;
import org.apache.poi.util.Removal;
/**
* XSSF wrapper for a cell under evaluation
@ -62,16 +60,6 @@ final class XSSFEvaluationCell implements EvaluationCell {
public CellType getCellType() {
return _cell.getCellType();
}
/**
* @since POI 3.15 beta 3
* @deprecated use <code>getCellType</code> instead
*/
@Deprecated
@Removal(version = "4.2")
@Override
public CellType getCellTypeEnum() {
return getCellType();
}
@Override
public int getColumnIndex() {
return _cell.getColumnIndex();
@ -114,16 +102,4 @@ final class XSSFEvaluationCell implements EvaluationCell {
public CellType getCachedFormulaResultType() {
return _cell.getCachedFormulaResultType();
}
/**
* @since POI 3.15 beta 3
* @deprecated use <code>getCachedFormulaResultType</code> instead
* Will be deleted when we make the CellType enum transition. See bug 59791.
*/
@Deprecated
@Removal(version = "4.2")
@Internal(since="POI 3.15 beta 3")
@Override
public CellType getCachedFormulaResultTypeEnum() {
return getCachedFormulaResultType();
}
}