Author: ugo
Date: Fri Jan 25 09:16:14 2008
New Revision: 615275

URL: http://svn.apache.org/viewvc?rev=615275&view=rev
Log:
Initial support for loading workbooks off files.

Added:
    poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/
    
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
   (with props)
    poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/sample.xlsx   
(with props)
Modified:
    
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java

Modified: 
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: 
http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=615275&r1=615274&r2=615275&view=diff
==============================================================================
--- 
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
 (original)
+++ 
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
 Fri Jan 25 09:16:14 2008
@@ -17,6 +17,7 @@
 
 package org.apache.poi.xssf.usermodel;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.LinkedList;
@@ -31,12 +32,15 @@
 import org.apache.poi.ss.usermodel.Palette;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
 import org.openxml4j.exceptions.InvalidFormatException;
+import org.openxml4j.exceptions.OpenXML4JException;
 import org.openxml4j.opc.Package;
 import org.openxml4j.opc.PackagePart;
 import org.openxml4j.opc.PackagePartName;
+import org.openxml4j.opc.PackageRelationship;
 import org.openxml4j.opc.PackageRelationshipTypes;
 import org.openxml4j.opc.PackagingURIHelper;
 import org.openxml4j.opc.TargetMode;
@@ -45,6 +49,7 @@
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorkbook;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.WorkbookDocument;
 
 
 public class XSSFWorkbook implements Workbook {
@@ -52,6 +57,9 @@
     private CTWorkbook workbook;
     
     private List<XSSFSheet> sheets = new LinkedList<XSSFSheet>();
+    
+    /** The OPC Package */
+    private Package pkg;
 
     public XSSFWorkbook() {
         this.workbook = CTWorkbook.Factory.newInstance();
@@ -61,6 +69,26 @@
         this.workbook.addNewSheets();
     }
     
+    public XSSFWorkbook(String path) throws IOException {
+        try {
+            this.pkg = Package.open(path);
+            PackageRelationship coreDocRelationship = 
this.pkg.getRelationshipsByType(
+                    PackageRelationshipTypes.CORE_DOCUMENT).getRelationship(0);
+        
+            // Get core part
+            PackagePart corePart = this.pkg.getPart(coreDocRelationship);
+            WorkbookDocument doc = 
WorkbookDocument.Factory.parse(corePart.getInputStream());
+            this.workbook = doc.getWorkbook();
+            
+        } catch (InvalidFormatException e) {
+            throw new IOException(e.toString());
+        } catch (OpenXML4JException e) {
+            throw new IOException(e.toString());
+        } catch (XmlException e) {
+            throw new IOException(e.toString());
+        }
+    }
+
     protected CTWorkbook getWorkbook() {
         return this.workbook;
     }

Added: 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
URL: 
http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java?rev=615275&view=auto
==============================================================================
--- 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
 (added)
+++ 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
 Fri Jan 25 09:16:14 2008
@@ -0,0 +1,36 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xssf.io;
+
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+
+public class TestLoadSaveXSSF extends TestCase {
+    
+    public void testLoadSample() throws Exception {
+        URL url = this.getClass().getResource("sample.xlsx");
+        XSSFWorkbook workbook = new XSSFWorkbook(url.getFile());
+        assertEquals(3, workbook.getNumberOfSheets());
+        assertEquals("Sheet1", workbook.getSheetName(0));
+    }
+
+}

Propchange: 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/sample.xlsx
URL: 
http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/sample.xlsx?rev=615275&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/io/sample.xlsx
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to