more cleanup and refactoring of the ooxml code:1. removed deprecated methods from xssf and interfaces

2. minimized the accessibility of internal constructors
3. more javadocs


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

7 files changed, 53 insertions, 53 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
index 26ce623d24..fc16beaf77 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
@@ -118,8 +118,8 @@ public class TestStylesTable extends TestCase {
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(0, st._getNumberFormatSize());
 		
-		long nf1 = st.putNumberFormat("yyyy-mm-dd");
-		long nf2 = st.putNumberFormat("yyyy-mm-DD");
+		int nf1 = st.putNumberFormat("yyyy-mm-dd");
+		int nf2 = st.putNumberFormat("yyyy-mm-DD");
 		assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd"));
 		
 		st.putStyle(new XSSFCellStyle(st));
@@ -146,8 +146,8 @@ public class TestStylesTable extends TestCase {
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(8, st._getNumberFormatSize());
 		
-		long nf1 = st.putNumberFormat("YYYY-mm-dd");
-		long nf2 = st.putNumberFormat("YYYY-mm-DD");
+		int nf1 = st.putNumberFormat("YYYY-mm-dd");
+		int nf2 = st.putNumberFormat("YYYY-mm-DD");
 		assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd"));
 		
         st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource();
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
index 87454dba47..7850d6ddca 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
@@ -369,7 +369,7 @@ public final class TestXSSFCell extends TestCase {
     	Cell cell = sheet.createRow(0).createCell((short)0);
     	cell.setAsActiveCell();
     	
-    	assertEquals("A1", sheet.getWorksheet().getSheetViews().getSheetViewArray(0).getSelectionArray(0).getActiveCell());
+    	assertEquals("A1", sheet.getCTWorksheet().getSheetViews().getSheetViewArray(0).getSelectionArray(0).getActiveCell());
     }
     
     
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
index e57d8825e5..012b2bd67e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
@@ -22,7 +22,6 @@ import junit.framework.TestCase;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDialogsheet;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
 
 
 public class TestXSSFDialogSheet extends TestCase {
@@ -51,7 +50,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetSetAutoBreaks() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertTrue(sheet.getAutobreaks());
         sheet.setAutobreaks(false);
         assertFalse(sheet.getAutobreaks());
@@ -59,7 +58,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testIsSetFitToPage() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertFalse(sheet.getFitToPage());
         sheet.setFitToPage(true);
         assertTrue(sheet.getFitToPage());
@@ -69,7 +68,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetSetMargin() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertEquals((double) 0, sheet.getMargin((short) 0));
         sheet.setMargin((short) 0, 10);
         assertEquals((double) 10, sheet.getMargin((short) 0));
@@ -111,7 +110,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetFooter() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertNotNull(sheet.getFooter());
         sheet.getFooter().setCenter("test center footer");
         assertEquals("test center footer", sheet.getFooter().getCenter());
@@ -119,7 +118,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetAllHeadersFooters() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertNotNull(sheet);
         assertNotNull(sheet.getOddFooter());
         assertNotNull(sheet.getEvenFooter());
@@ -156,7 +155,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetSetHorizontallyCentered() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertFalse(sheet.getHorizontallyCenter());
         sheet.setHorizontallyCenter(true);
         assertTrue(sheet.getHorizontallyCenter());
@@ -166,7 +165,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetSetVerticallyCentered() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertFalse(sheet.getVerticallyCenter());
         sheet.setVerticallyCenter(true);
         assertTrue(sheet.getVerticallyCenter());
@@ -176,7 +175,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testIsSetPrintGridlines() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertFalse(sheet.isPrintGridlines());
         sheet.setPrintGridlines(true);
         assertTrue(sheet.isPrintGridlines());
@@ -184,7 +183,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testIsSetDisplayFormulas() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertFalse(sheet.isDisplayFormulas());
         sheet.setDisplayFormulas(true);
         assertTrue(sheet.isDisplayFormulas());
@@ -192,7 +191,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testIsSetDisplayGridLines() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertTrue(sheet.isDisplayGridlines());
         sheet.setDisplayGridlines(false);
         assertFalse(sheet.isDisplayGridlines());
@@ -200,7 +199,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testIsSetDisplayRowColHeadings() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertTrue(sheet.isDisplayRowColHeadings());
         sheet.setDisplayRowColHeadings(false);
         assertFalse(sheet.isDisplayRowColHeadings());
@@ -208,7 +207,7 @@ public class TestXSSFDialogSheet extends TestCase {
     
     public void testGetScenarioProtect() {
         XSSFWorkbook workbook = new XSSFWorkbook();
-        XSSFDialogsheet sheet = (XSSFDialogsheet) workbook.createDialogsheet("Dialogsheet 1", null);
+        XSSFDialogsheet sheet = workbook.createDialogsheet("Dialogsheet 1", null);
         assertFalse(sheet.getScenarioProtect());
     }
 	
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
index 430924c856..34d49cf924 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
@@ -42,8 +42,8 @@ public class TestXSSFDrawing extends TestCase {
         String drawingId = drawing.getPackageRelationship().getId();

 

         //there should be a relation to this drawing in the worksheet

-        assertTrue(sheet.getWorksheet().isSetDrawing());

-        assertEquals(drawingId, sheet.getWorksheet().getDrawing().getId());

+        assertTrue(sheet.getCTWorksheet().isSetDrawing());

+        assertEquals(drawingId, sheet.getCTWorksheet().getDrawing().getId());

 

     }

 

@@ -63,8 +63,8 @@ public class TestXSSFDrawing extends TestCase {
         String drawingId = drawing.getPackageRelationship().getId();

 

         //there should be a relation to this drawing in the worksheet

-        assertTrue(sheet.getWorksheet().isSetDrawing());

-        assertEquals(drawingId, sheet.getWorksheet().getDrawing().getId());

+        assertTrue(sheet.getCTWorksheet().isSetDrawing());

+        assertEquals(drawingId, sheet.getCTWorksheet().getDrawing().getId());

 

     }

     public void testMultipleDrawings(){

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
index 1e1ce24a69..49088df2c2 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
@@ -25,6 +25,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.Region;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.model.CommentsTable;
 import org.apache.poi.xssf.model.StylesTable;
 import org.apache.poi.xssf.usermodel.helpers.ColumnHelper;
@@ -404,7 +405,7 @@ public class TestXSSFSheet extends TestCase {
         // Now check the low level stuff, and check that's all
         //  been set correctly
         XSSFSheet xs = sheet;
-        CTWorksheet cts = xs.getWorksheet();
+        CTWorksheet cts = xs.getCTWorksheet();
 
         CTCols[] cols_s = cts.getColsArray();
         assertEquals(1, cols_s.length);
@@ -621,7 +622,7 @@ public class TestXSSFSheet extends TestCase {
         sheet.setCellComment("A1", comment);
         assertEquals("A1", ctComments.getCommentList().getCommentArray(0).getRef());
         comment.setAuthor("test A1 author");
-        assertEquals("test A1 author", comments.getAuthor(ctComments.getCommentList().getCommentArray(0).getAuthorId()));
+        assertEquals("test A1 author", comments.getAuthor((int)ctComments.getCommentList().getCommentArray(0).getAuthorId()));
     }
     
     public void testGetActiveCell() {
@@ -636,7 +637,7 @@ public class TestXSSFSheet extends TestCase {
     public void testCreateFreezePane() {
     	XSSFWorkbook workbook = new XSSFWorkbook();
     	XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getWorksheet();
+        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
 
     	sheet.createFreezePane(2, 4);
     	assertEquals((double)2, ctWorksheet.getSheetViews().getSheetViewArray(0).getPane().getXSplit());
@@ -653,17 +654,16 @@ public class TestXSSFSheet extends TestCase {
     public void testNewMergedRegionAt() {
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFSheet sheet = workbook.createSheet();
-    	Region region = new Region("B2:D4");
+    	CellRangeAddress region = CellRangeAddress.valueOf("B2:D4");
     	sheet.addMergedRegion(region);
-    	assertEquals("B2:D4", sheet.getMergedRegionAt(0).getRegionRef());
+    	assertEquals("B2:D4", sheet.getMergedRegion(0).formatAsString());
     }
     
     public void testGetNumMergedRegions() {
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getWorksheet();
     	assertEquals(0, sheet.getNumMergedRegions());
-    	Region region = new Region("B2:D4");
+    	CellRangeAddress region = CellRangeAddress.valueOf("B2:D4");
     	sheet.addMergedRegion(region);
     	assertEquals(1, sheet.getNumMergedRegions());
     }
@@ -671,10 +671,10 @@ public class TestXSSFSheet extends TestCase {
     public void testRemoveMergedRegion() {
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getWorksheet();
-    	Region region_1 = new Region("A1:B2");
-    	Region region_2 = new Region("C3:D4");
-    	Region region_3 = new Region("E5:F6");
+        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
+    	CellRangeAddress region_1 = CellRangeAddress.valueOf("A1:B2");
+    	CellRangeAddress region_2 = CellRangeAddress.valueOf("C3:D4");
+    	CellRangeAddress region_3 = CellRangeAddress.valueOf("E5:F6");
     	sheet.addMergedRegion(region_1);
     	sheet.addMergedRegion(region_2);
     	sheet.addMergedRegion(region_3);
@@ -691,7 +691,7 @@ public class TestXSSFSheet extends TestCase {
     public void testSetDefaultColumnStyle() {
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getWorksheet();
+        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
     	StylesTable stylesTable = workbook.getStylesSource();
     	XSSFFont font = new XSSFFont();
     	font.setFontName("Cambria");
@@ -750,7 +750,7 @@ public class TestXSSFSheet extends TestCase {
 	    	//one level
 	    	sheet.groupColumn((short)2,(short)7);
 	    	sheet.groupColumn((short)10,(short)11);
-	    	CTCols cols=sheet.getWorksheet().getColsArray(0);
+	    	CTCols cols=sheet.getCTWorksheet().getColsArray(0);
 	    	assertEquals(2,cols.sizeOfColArray());
 	    	CTCol[]colArray=cols.getColArray();
 	    	assertNotNull(colArray);
@@ -760,7 +760,7 @@ public class TestXSSFSheet extends TestCase {
 
 	    	//two level  
 	    	sheet.groupColumn((short)1,(short)2);
-	    	cols=sheet.getWorksheet().getColsArray(0);
+	    	cols=sheet.getCTWorksheet().getColsArray(0);
 	    	assertEquals(4,cols.sizeOfColArray());
 	    	colArray=cols.getColArray();
 	    	assertEquals(2, colArray[1].getOutlineLevel());
@@ -768,7 +768,7 @@ public class TestXSSFSheet extends TestCase {
 	    	//three level
 	    	sheet.groupColumn((short)6,(short)8);
 	    	sheet.groupColumn((short)2,(short)3);
-	    	cols=sheet.getWorksheet().getColsArray(0);
+	    	cols=sheet.getCTWorksheet().getColsArray(0);
 	    	assertEquals(7,cols.sizeOfColArray());
 	    	colArray=cols.getColArray();
 	    	assertEquals(3, colArray[1].getOutlineLevel());
@@ -792,7 +792,7 @@ public class TestXSSFSheet extends TestCase {
 
 	    	//one level
 	    	sheet.groupRow(9,10);
-	    	assertEquals(2,sheet.rows.size());
+	    	assertEquals(2,sheet.getPhysicalNumberOfRows());
 	    	CTRow ctrow = sheet.getRow(8).getCTRow();
 
 	    	assertNotNull(ctrow);
@@ -802,7 +802,7 @@ public class TestXSSFSheet extends TestCase {
 
 	    	//two level    	
 	    	sheet.groupRow(10,13);
-	    	assertEquals(5,sheet.rows.size());
+	    	assertEquals(5,sheet.getPhysicalNumberOfRows());
 	    	ctrow = sheet.getRow(9).getCTRow();
 	    	assertNotNull(ctrow);
 	    	assertEquals(10,ctrow.getR());
@@ -811,11 +811,11 @@ public class TestXSSFSheet extends TestCase {
 
 	    	
 	    	sheet.ungroupRow(8, 10);
-            assertEquals(4,sheet.rows.size());
+            assertEquals(4,sheet.getPhysicalNumberOfRows());
 	    	assertEquals(1,sheet.getSheetTypeSheetFormatPr().getOutlineLevelRow());
 
 	    	sheet.ungroupRow(10,10);
-            assertEquals(3,sheet.rows.size());
+            assertEquals(3,sheet.getPhysicalNumberOfRows());
 
 	    	assertEquals(1,sheet.getSheetTypeSheetFormatPr().getOutlineLevelRow());
 	    }
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 beaafb3e85..5d3c6ab35b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
@@ -54,6 +54,8 @@ public final class TestXSSFWorkbook extends TestCase {
 
 	public void testGetSetActiveSheet(){
 		XSSFWorkbook workbook = new XSSFWorkbook();
+        assertEquals(0, workbook.getActiveSheetIndex());
+
 		workbook.createSheet("sheet1");
 		workbook.createSheet("sheet2");
 		workbook.createSheet("sheet3");
@@ -84,7 +86,7 @@ public final class TestXSSFWorkbook extends TestCase {
 		assertSame(sheet2, workbook.getSheetAt(0));
 		assertSame(sheet1, workbook.getSheetAt(1));
 		// Test reordering of CTSheets
-		CTWorkbook ctwb = workbook.getWorkbook();
+		CTWorkbook ctwb = workbook.getCTWorkbook();
 		CTSheet[] ctsheets = ctwb.getSheets().getSheetArray();
 		assertEquals("sheet2", ctsheets[0].getName());
 		assertEquals("sheet1", ctsheets[1].getName());
@@ -334,19 +336,19 @@ public final class TestXSSFWorkbook extends TestCase {
 		assertNotNull(cellStyleAt);
 		
 		//get custom style
-		StylesSource styleSource = workbook.getStylesSource();
+		StylesTable styleSource = workbook.getStylesSource();
 		CellStyle customStyle = new XSSFCellStyle(styleSource);
 		Font font = new XSSFFont();
 		font.setFontName("Verdana");
 		customStyle.setFont(font);
-		Long x = styleSource.putStyle(customStyle);
-		cellStyleAt = workbook.getCellStyleAt(x.shortValue());
+		int x = styleSource.putStyle(customStyle);
+		cellStyleAt = workbook.getCellStyleAt((short)x);
 		assertNotNull(cellStyleAt);		
 	}
 	
 	public void testGetFontAt(){
 	 	XSSFWorkbook workbook = new XSSFWorkbook();
-		StylesSource styleSource = workbook.getStylesSource();
+		StylesTable styleSource = workbook.getStylesSource();
 		short i = 0;
 		//get default font
 		Font fontAt = workbook.getFontAt(i);
@@ -355,8 +357,8 @@ public final class TestXSSFWorkbook extends TestCase {
 		//get customized font
 		Font customFont = new XSSFFont();
 		customFont.setItalic(true);
-		Long x = styleSource.putFont(customFont);
-		fontAt = workbook.getFontAt(x.shortValue());
+		int x = styleSource.putFont(customFont);
+		fontAt = workbook.getFontAt((short)x);
 		assertNotNull(fontAt);
 	}
 	
@@ -432,7 +434,7 @@ public final class TestXSSFWorkbook extends TestCase {
 	public void testStyles() {
 		XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx");
 		
-		StylesSource ss = workbook.getStylesSource();
+		StylesTable ss = workbook.getStylesSource();
 		assertNotNull(ss);
 		assertTrue(ss instanceof StylesTable);
 		StylesTable st = (StylesTable)ss;
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
index 9e4fb761d0..089f258219 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
@@ -25,7 +25,6 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheet;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
 
@@ -64,7 +63,7 @@ public final class TestColumnHelper extends TestCase {
         // Remember - POI column 0 == OOXML column 1
         assertEquals((double) 88, helper.getColumn(0, false).getWidth());
         assertTrue(helper.getColumn(0, false).getHidden());
-        assertEquals((double) 00, helper.getColumn(1, false).getWidth());
+        assertEquals((double)0, helper.getColumn(1, false).getWidth());
         assertFalse(helper.getColumn(1, false).getHidden());
     }
 
@@ -260,7 +259,7 @@ public final class TestColumnHelper extends TestCase {
     public void testGetSetColDefaultStyle() {
         XSSFWorkbook workbook = new XSSFWorkbook();
         XSSFSheet sheet = workbook.createSheet();
-        CTWorksheet ctWorksheet = sheet.getWorksheet();
+        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
         ColumnHelper columnHelper = sheet.getColumnHelper();
         
         // POI column 3, OOXML column 4
@@ -271,7 +270,7 @@ public final class TestColumnHelper extends TestCase {
         columnHelper.setColDefaultStyle(3, 2);
         assertEquals(2, columnHelper.getColDefaultStyle(3));
         assertEquals(-1, columnHelper.getColDefaultStyle(4));
-        StylesTable stylesTable = (StylesTable) workbook.getStylesSource();
+        StylesTable stylesTable = workbook.getStylesSource();
         CTXf cellXf = CTXf.Factory.newInstance();
         cellXf.setFontId(0);
         cellXf.setFillId(0);