svn commit: r635021 - in /poi/branches/ooxml/src: ooxml/java/org/apache/poi/ ooxml/java/org/apache/poi/xssf/extractor/ ooxml/testcases/org/apache/poi/ ooxml/testcases/org/apache/poi/xssf/extractor/ scratchpad/ooxml-src/ scratchpad/ooxml-testcases/

[ni...@apache.org]

Author: nick
Date: Sat Mar  8 09:21:29 2008
New Revision: 635021

URL: http://svn.apache.org/viewvc?rev=635021&view=rev
Log:
More shuffling of things out of src/scratchpad/ooxml-*

Added:
    poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/extractor/
    poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
      - copied, changed from r634988, poi/branches/ooxml/src/scratchpad/ooxml-src/org/apache/poi/hssf/extractor/HXFExcelExtractor.java
    poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java
      - copied unchanged from r634988, poi/branches/ooxml/src/scratchpad/ooxml-testcases/org/apache/poi/hxf/TestDetectAsOOXML.java
    poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/extractor/
    poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/extractor/TextXSSFExcelExtractor.java
      - copied unchanged from r634988, poi/branches/ooxml/src/scratchpad/ooxml-testcases/org/apache/poi/hssf/extractor/TestHXFExcelExtractor.java
Removed:
    poi/branches/ooxml/src/scratchpad/ooxml-src/
    poi/branches/ooxml/src/scratchpad/ooxml-testcases/
Modified:
    poi/branches/ooxml/src/ooxml/java/org/apache/poi/POIXMLDocument.java

Modified: poi/branches/ooxml/src/ooxml/java/org/apache/poi/POIXMLDocument.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/java/org/apache/poi/POIXMLDocument.java?rev=635021&r1=635020&r2=635021&view=diff
==============================================================================
--- poi/branches/ooxml/src/ooxml/java/org/apache/poi/POIXMLDocument.java (original)
+++ poi/branches/ooxml/src/ooxml/java/org/apache/poi/POIXMLDocument.java Sat Mar  8 09:21:29 2008
@@ -17,7 +17,11 @@
 package org.apache.poi;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
 
+import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.IOUtils;
 import org.openxml4j.exceptions.InvalidFormatException;
 import org.openxml4j.exceptions.OpenXML4JException;
 import org.openxml4j.opc.Package;

Copied: poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java (from r634988, poi/branches/ooxml/src/scratchpad/ooxml-src/org/apache/poi/hssf/extractor/HXFExcelExtractor.java)
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java?p2=poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java&p1=poi/branches/ooxml/src/scratchpad/ooxml-src/org/apache/poi/hssf/extractor/HXFExcelExtractor.java&r1=634988&r2=635021&rev=635021&view=diff
==============================================================================
--- poi/branches/ooxml/src/scratchpad/ooxml-src/org/apache/poi/hssf/extractor/HXFExcelExtractor.java (original)
+++ poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java Sat Mar  8 09:21:29 2008
@@ -14,16 +14,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-package org.apache.poi.hssf.extractor;
+package org.apache.poi.xssf.extractor;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.hssf.HSSFXML;
-import org.apache.poi.hssf.usermodel.HSSFXMLCell;
-import org.apache.poi.hssf.usermodel.HSSFXMLWorkbook;
-import org.apache.poi.hxf.HXFDocument;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.xmlbeans.XmlException;
 import org.openxml4j.exceptions.OpenXML4JException;
 import org.openxml4j.opc.Package;
@@ -35,17 +32,15 @@
 /**
  * Helper class to extract text from an OOXML Excel file
  */
-public class HXFExcelExtractor extends POIXMLTextExtractor {
-	private HSSFXMLWorkbook workbook;
+public class XSSFExcelExtractor extends POIXMLTextExtractor {
+	private XSSFWorkbook workbook;
 	private boolean includeSheetNames = true;
 	private boolean formulasNotResults = false;
 	
-	public HXFExcelExtractor(Package container) throws XmlException, OpenXML4JException, IOException {
-		this(new HSSFXMLWorkbook(
-				new HSSFXML(container)
-		));
+	public XSSFExcelExtractor(Package container) throws XmlException, OpenXML4JException, IOException {
+		this(new XSSFWorkbook(container));
 	}
-	public HXFExcelExtractor(HSSFXMLWorkbook workbook) {
+	public XSSFExcelExtractor(XSSFWorkbook workbook) {
 		super(workbook);
 		this.workbook = workbook;
 	}



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org