You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2020/07/15 22:49:32 UTC
svn commit: r1879911 - in /poi/trunk/src:
java/org/apache/poi/hssf/usermodel/ java/org/apache/poi/ss/formula/
java/org/apache/poi/ss/formula/eval/forked/
ooxml/java/org/apache/poi/ooxml/ ooxml/java/org/apache/poi/ooxml/extractor/
ooxml/java/org/apache/...
Author: fanningpj
Date: Wed Jul 15 22:49:32 2020
New Revision: 1879911
URL: http://svn.apache.org/viewvc?rev=1879911&view=rev
Log:
remove some deprecated code
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java Wed Jul 15 22:49:32 2020
@@ -21,7 +21,6 @@ import org.apache.poi.ss.formula.Evaluat
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 implement
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 implement
*/
@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();
- }
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationCell.java Wed Jul 15 22:49:32 2020
@@ -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();
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java Wed Jul 15 22:49:32 2020
@@ -28,8 +28,6 @@ import org.apache.poi.ss.formula.eval.Va
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 impleme
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 impleme
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();
- }
-
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java Wed Jul 15 22:49:32 2020
@@ -34,7 +34,6 @@ import org.apache.poi.openxml4j.opc.Pack
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;
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java Wed Jul 15 22:49:32 2020
@@ -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;
@@ -65,18 +64,6 @@ public class POIXMLDocumentPart {
* 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
- *
- * @return return true if embedded part is committed
* @since 4.1.2
*/
public boolean isCommitted() {
@@ -84,18 +71,6 @@ public class POIXMLDocumentPart {
}
/**
- * 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
*
* @param isCommitted boolean value
Modified: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/extractor/ExtractorFactory.java Wed Jul 15 22:49:32 2020
@@ -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;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java Wed Jul 15 22:49:32 2020
@@ -27,9 +27,7 @@ import org.apache.poi.openxml4j.opc.Pack
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 imp
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);
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java Wed Jul 15 22:49:32 2020
@@ -21,8 +21,6 @@ import org.apache.poi.ss.formula.Evaluat
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 implemen
public SXSSFCell getSXSSFCell() {
return _cell;
}
+
@Override
public boolean getBooleanCellValue() {
return _cell.getBooleanCellValue();
}
+
/**
* @return cell type
*/
@@ -61,52 +61,46 @@ final class SXSSFEvaluationCell implemen
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();
- }
-
- @Override
- public boolean isPartOfArrayFormulaGroup() {
- return _cell.isPartOfArrayFormulaGroup();
- }
+ public CellRangeAddress getArrayFormulaRange() {
+ return _cell.getArrayFormulaRange();
+ }
+
+ @Override
+ public boolean isPartOfArrayFormulaGroup() {
+ return _cell.isPartOfArrayFormulaGroup();
+ }
/**
* @return cell type of cached formula result
@@ -115,16 +109,4 @@ final class SXSSFEvaluationCell implemen
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();
- }
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java?rev=1879911&r1=1879910&r2=1879911&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java Wed Jul 15 22:49:32 2020
@@ -21,8 +21,6 @@ import org.apache.poi.ss.formula.Evaluat
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 implement
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 implement
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();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org