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 2017/06/29 08:15:50 UTC
svn commit: r1800248 - in /poi/trunk/src:
ooxml/java/org/apache/poi/xssf/usermodel/
ooxml/testcases/org/apache/poi/xssf/usermodel/
scratchpad/src/org/apache/poi/hssf/converter/
testcases/org/apache/poi/ss/usermodel/
Author: fanningpj
Date: Thu Jun 29 08:15:50 2017
New Revision: 1800248
URL: http://svn.apache.org/viewvc?rev=1800248&view=rev
Log:
Remove old XSSFWorkbook wb.xssfSheetIterator method
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1800248&r1=1800247&r2=1800248&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Thu Jun 29 08:15:50 2017
@@ -1239,74 +1239,6 @@ public class XSSFWorkbook extends POIXML
}
/**
- * xssfSheetIterator was added to make transitioning to the new Iterator<Sheet> iterator()
- * interface less painful for projects currently using POI.
- *
- * If your code was written using a for-each loop:
- * <pre><code>
- * for (XSSFSheet sh : wb) {
- * sh.createRow(0);
- * }
- * </code></pre>
- *
- * There are two ways to upgrade your code:
- * // Option A:
- * <pre><code>
- * for (XSSFSheet sh : (Iterable<XSSFSheet>) (Iterable<? extends Sheet>) wb) {
- * sh.createRow(0);
- * }
- * </code></pre>
- *
- * // Option B (preferred for new code):
- * <pre><code>
- * for (Sheet sh : wb) {
- * sh.createRow(0);
- * }
- * </code></pre>
- *
- *
- *
- * If your code was written using an iterator variable:
- * <pre><code>
- * Iterator<XSSFSheet> it = wb.iterator();
- * XSSFSheet sh = it.next();
- * sh.createRow(0);
- * </code></pre>
- *
- * There are three ways to upgrade your code:
- * // Option A:
- * <pre><code>
- * Iterator<XSSFSheet> it = (Iterator<XSSFSheet>) (Iterator<? extends Sheet>) wb.iterator();
- * XSSFSheet sh = it.next();
- * sh.createRow(0);
- * </code></pre>
- *
- * // Option B:
- * <pre><code>
- * @SuppressWarnings("deprecation")
- * Iterator<XSSFSheet> it = wb.xssfSheetIterator();
- * XSSFSheet sh = it.next();
- * sh.createRow(0);
- * </code></pre>
- *
- * // Option C (preferred for new code):
- * <pre><code>
- * Iterator<Sheet> it = wb.iterator();
- * Sheet sh = it.next();
- * sh.createRow(0);
- * </code></pre>
- *
- * @deprecated 3.13. New projects should use the preferred options. Note: XSSFWorkbook.xssfSheetIterator
- * is deprecated and will be removed in 3.15.
- *
- * @return an iterator of the sheets.
- */
- @Deprecated
- public Iterator<XSSFSheet> xssfSheetIterator() {
- return new SheetIterator<XSSFSheet>();
- }
-
- /**
* Are we a normal workbook (.xlsx), or a
* macro enabled workbook (.xlsm)?
*/
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1800248&r1=1800247&r2=1800248&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java Thu Jun 29 08:15:50 2017
@@ -52,7 +52,6 @@ import org.apache.poi.openxml4j.opc.Pack
import org.apache.poi.openxml4j.opc.internal.FileHelper;
import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;
import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
-import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestXWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -999,15 +998,7 @@ public final class TestXSSFWorkbook exte
sh.createRow(0);
}
- // Option B:
- {
- @SuppressWarnings("deprecation")
- Iterator<XSSFSheet> it = wb.xssfSheetIterator();
- XSSFSheet sh = it.next();
- sh.createRow(0);
- }
-
- // Option C (preferred for new code):
+ // Option B (preferred for new code):
{
Iterator<Sheet> it = wb.iterator();
Sheet sh = it.next();
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java?rev=1800248&r1=1800247&r2=1800248&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java Thu Jun 29 08:15:50 2017
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java?rev=1800248&r1=1800247&r2=1800248&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java Thu Jun 29 08:15:50 2017
@@ -36,7 +36,6 @@ import org.apache.poi.ss.ITestDataProvid
import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellReference;
-import org.junit.Ignore;
import org.junit.Test;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org