Remove old XSSFWorkbook wb.xssfSheetIterator method

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1800248 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index fe6bba6ea053744b08b71f01d222defce9683f6e..dcfeb5a61657faf8c4ff979bd5aba8310cabeffa 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -1238,74 +1238,6 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
         }
     }
     
-    /**
-     * 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>
-     *  &#64;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)?

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
index 8b0c33533097051f725e6bc40127abf5dd2359b3..365ca6a6f28204f2120d1a6004e30a27ade88b02 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
@@ -52,7 +52,6 @@ import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 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 extends BaseTestXWorkbook {
             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();

diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
index e9bd91b534e6b82a4bd717cf85468a77e0e71eaa..08b47964560f88855432effa8af75297dace94c6 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
@@ -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;

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
index 556e89b43a62cc0efc4991780547ba85978f387a..cf910d4620ca371aa142630280b87505475916c1 100644 (file)
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
@@ -36,7 +36,6 @@ import org.apache.poi.ss.ITestDataProvider;
 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;
 
 /**