svn commit: r614877 - in /poi/branches/ooxml/src/ooxml: java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java

[ugo]

Author: ugo
Date: Thu Jan 24 06:09:34 2008
New Revision: 614877

URL: http://svn.apache.org/viewvc?rev=614877&view=rev
Log:
Implementation of XSSFWorkbook#getSheet(String name).
Implementation of XSSFWorkbook#removeSheet.

Modified:
    
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
    
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.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=614877&r1=614876&r2=614877&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
 Thu Jan 24 06:09:34 2008
@@ -250,7 +250,12 @@
     }
 
     public Sheet getSheet(String name) {
-        // TODO Auto-generated method stub
+        CTSheet[] sheets = this.workbook.getSheets().getSheetArray();  
+        for (int i = 0 ; i < sheets.length ; ++i) {
+            if (name.equals(sheets[i].getName())) {
+                return this.sheets.get(i);
+            }
+        }
         return null;
     }
 
@@ -297,8 +302,8 @@
     }
 
     public void removeSheetAt(int index) {
-        // TODO Auto-generated method stub
-
+        XSSFSheet sheet = this.sheets.remove(index);
+        this.workbook.getSheets().removeSheet(index);
     }
 
     public void setBackupFlag(boolean backupValue) {

Modified: 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL: 
http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=614877&r1=614876&r2=614877&view=diff
==============================================================================
--- 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
 (original)
+++ 
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
 Thu Jan 24 06:09:34 2008
@@ -90,4 +90,28 @@
         assertEquals(3, workbook.getNumberOfSheets());
         assertEquals("clonedsheet(1)", workbook.getSheetName(2));
     }
+    
+    public void testGetSheetByName() {
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        Sheet sheet1 = workbook.createSheet("sheet1");
+        Sheet sheet2 = workbook.createSheet("sheet2");
+        assertSame(sheet1, workbook.getSheet("sheet1"));
+        assertSame(sheet2, workbook.getSheet("sheet2"));
+        assertNull(workbook.getSheet("nosheet"));
+    }
+    
+    public void testRemoveSheetAt() throws Exception {
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        Sheet sheet1 = workbook.createSheet("sheet1");
+        Sheet sheet2 = workbook.createSheet("sheet2");
+        Sheet sheet3 = workbook.createSheet("sheet3");
+        workbook.removeSheetAt(1);
+        assertEquals(2, workbook.getNumberOfSheets());
+        assertEquals("sheet3", workbook.getSheetName(1));
+        workbook.removeSheetAt(0);
+        assertEquals(1, workbook.getNumberOfSheets());
+        assertEquals("sheet3", workbook.getSheetName(0));
+        workbook.removeSheetAt(0);
+        assertEquals(0, workbook.getNumberOfSheets());
+    }
 }



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