Fixed compiler warnings - unnecessary throws declaration

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

17 files changed, 435 insertions, 488 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java b/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
index e6644a5634..8843f60933 100755
--- a/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
+++ b/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,33 +14,30 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
 package org.apache.poi;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.FileOutputStream;
-import java.util.List;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+
+import junit.framework.TestCase;
 
-import org.apache.poi.util.TempFile;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-
-import junit.framework.TestCase;
+import org.apache.poi.util.TempFile;
 
 /**
  * Test recursive read and write of OPC packages
  */
-public class TestPOIXMLDocument extends TestCase
-{
+public final class TestPOIXMLDocument extends TestCase {
     private static class OPCParser extends POIXMLDocument {
 
-        public OPCParser(OPCPackage pkg) throws IOException {
+        public OPCParser(OPCPackage pkg) {
             super(pkg);
         }
 
@@ -49,13 +45,16 @@ public class TestPOIXMLDocument extends TestCase
             throw new RuntimeException("not supported");
         }
 
-        public void parse(POIXMLFactory factory) throws OpenXML4JException, IOException{
+        public void parse(POIXMLFactory factory) throws IOException{
             load(factory);
         }
     }
 
-    private static class TestFactory extends POIXMLFactory  {
+    private static final class TestFactory extends POIXMLFactory {
 
+        public TestFactory() {
+            //
+        }
         public POIXMLDocumentPart createDocumentPart(PackageRelationship rel, PackagePart part){
             return new POIXMLDocumentPart(part, rel);
         }
@@ -70,16 +69,16 @@ public class TestPOIXMLDocument extends TestCase
      * Recursively traverse a OOXML document and assert that same logical parts have the same physical instances
      */
     private static void traverse(POIXMLDocumentPart part, HashMap<String,POIXMLDocumentPart> context) throws IOException{
-    	context.put(part.getPackageRelationship().getTargetURI().toString(), part);
-    	for(POIXMLDocumentPart p : part.getRelations()){
+        context.put(part.getPackageRelationship().getTargetURI().toString(), part);
+        for(POIXMLDocumentPart p : part.getRelations()){
             String uri = p.getPackageRelationship().getTargetURI().toString();
             if (!context.containsKey(uri)) {
-    			traverse(p, context);
-    		} else {
+                traverse(p, context);
+            } else {
                 POIXMLDocumentPart prev = context.get(uri);
                 assertSame("Duplicate POIXMLDocumentPart instance for targetURI=" + uri, prev, p);
             }
-    	}
+        }
     }
 
     public void assertReadWrite(String path) throws Exception {
@@ -138,4 +137,4 @@ public class TestPOIXMLDocument extends TestCase
         File file = new File(System.getProperty("OOXML.testdata.path"), "WordWithAttachments.docx");
         assertReadWrite(file.getAbsolutePath());
     }
-}
\ No newline at end of file
+}
diff --git a/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java b/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
index 75d87105a6..7d0128618b 100755
--- a/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
+++ b/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
@@ -32,10 +32,10 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
 /**
  * Test setting extended and custom OOXML properties
  */
-public class TestPOIXMLProperties extends TestCase {
-	POIXMLProperties props;
-	CoreProperties coreProperties;
-	
+public final class TestPOIXMLProperties extends TestCase {
+	private POIXMLProperties _props;
+	private CoreProperties _coreProperties;
+
 	public void setUp() throws Exception{
 		File sampleFile = new File(
 				System.getProperty("HWPF.testdata.path") +
@@ -46,139 +46,139 @@ public class TestPOIXMLProperties extends TestCase {
 		sampleDoc = new XWPFDocument(
 				POIXMLDocument.openPackage(sampleFile.toString())
 		);
-		props = sampleDoc.getProperties();
-		coreProperties = props.getCoreProperties();
-		assertNotNull(props);
+		_props = sampleDoc.getProperties();
+		_coreProperties = _props.getCoreProperties();
+		assertNotNull(_props);
 	}
-	
-    public void testWorkbookExtendedProperties() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        POIXMLProperties props = workbook.getProperties();
-        assertNotNull(props);
 
-        org.apache.poi.POIXMLProperties.ExtendedProperties properties =
-                props.getExtendedProperties();
+	public void testWorkbookExtendedProperties() {
+		XSSFWorkbook workbook = new XSSFWorkbook();
+		POIXMLProperties props = workbook.getProperties();
+		assertNotNull(props);
+
+		org.apache.poi.POIXMLProperties.ExtendedProperties properties =
+				props.getExtendedProperties();
 
-        org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
-                ctProps = properties.getUnderlyingProperties();
+		org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
+				ctProps = properties.getUnderlyingProperties();
 
 
-        String appVersion = "3.5 beta";
-        String application = "POI";
+		String appVersion = "3.5 beta";
+		String application = "POI";
 
-        ctProps.setApplication(application);
-        ctProps.setAppVersion(appVersion);
+		ctProps.setApplication(application);
+		ctProps.setAppVersion(appVersion);
 
-        ctProps = null;
-        properties = null;
-        props = null;
+		ctProps = null;
+		properties = null;
+		props = null;
 
-        XSSFWorkbook newWorkbook =
-                XSSFTestDataSamples.writeOutAndReadBack(workbook);
+		XSSFWorkbook newWorkbook =
+				XSSFTestDataSamples.writeOutAndReadBack(workbook);
 
-        assertTrue(workbook != newWorkbook);
+		assertTrue(workbook != newWorkbook);
 
 
-        POIXMLProperties newProps = newWorkbook.getProperties();
-        assertNotNull(newProps);
-        org.apache.poi.POIXMLProperties.ExtendedProperties newProperties =
-                newProps.getExtendedProperties();
+		POIXMLProperties newProps = newWorkbook.getProperties();
+		assertNotNull(newProps);
+		org.apache.poi.POIXMLProperties.ExtendedProperties newProperties =
+				newProps.getExtendedProperties();
 
-        org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
-                newCtProps = newProperties.getUnderlyingProperties();
+		org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
+				newCtProps = newProperties.getUnderlyingProperties();
 
-        assertEquals(application, newCtProps.getApplication());
-        assertEquals(appVersion, newCtProps.getAppVersion());
+		assertEquals(application, newCtProps.getApplication());
+		assertEquals(appVersion, newCtProps.getAppVersion());
 
 
-    }
+	}
 
 
-    public void testWorkbookCustomProperties() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook();
-        POIXMLProperties props = workbook.getProperties();
-        assertNotNull(props);
+	public void testWorkbookCustomProperties() {
+		XSSFWorkbook workbook = new XSSFWorkbook();
+		POIXMLProperties props = workbook.getProperties();
+		assertNotNull(props);
 
-        org.apache.poi.POIXMLProperties.CustomProperties properties =
-                props.getCustomProperties();
+		org.apache.poi.POIXMLProperties.CustomProperties properties =
+				props.getCustomProperties();
 
-        org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
-                ctProps = properties.getUnderlyingProperties();
+		org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
+				ctProps = properties.getUnderlyingProperties();
 
 
-        org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty
-                property = ctProps.addNewProperty();
+		org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty
+				property = ctProps.addNewProperty();
 
 
-        String fmtid =
-                "{A1A1A1A1A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1A1A1A1A1}";
-        int pId = 1;
-        String name = "testProperty";
-        String stringValue = "testValue";
+		String fmtid =
+				"{A1A1A1A1A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1-A1A1A1A1A1A1A1A1}";
+		int pId = 1;
+		String name = "testProperty";
+		String stringValue = "testValue";
 
 
-        property.setFmtid(fmtid);
-        property.setPid(pId);
-        property.setName(name);
-        property.setBstr(stringValue);
+		property.setFmtid(fmtid);
+		property.setPid(pId);
+		property.setName(name);
+		property.setBstr(stringValue);
 
 
-        property = null;
-        ctProps = null;
-        properties = null;
-        props = null;
+		property = null;
+		ctProps = null;
+		properties = null;
+		props = null;
 
-        XSSFWorkbook newWorkbook =
-                XSSFTestDataSamples.writeOutAndReadBack(workbook);
+		XSSFWorkbook newWorkbook =
+				XSSFTestDataSamples.writeOutAndReadBack(workbook);
 
-        assertTrue(workbook != newWorkbook);
+		assertTrue(workbook != newWorkbook);
 
 
-        POIXMLProperties newProps = newWorkbook.getProperties();
-        assertNotNull(newProps);
-        org.apache.poi.POIXMLProperties.CustomProperties newProperties =
-                newProps.getCustomProperties();
+		POIXMLProperties newProps = newWorkbook.getProperties();
+		assertNotNull(newProps);
+		org.apache.poi.POIXMLProperties.CustomProperties newProperties =
+				newProps.getCustomProperties();
 
-        org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
-                newCtProps = newProperties.getUnderlyingProperties();
+		org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
+				newCtProps = newProperties.getUnderlyingProperties();
 
-        assertEquals(1, newCtProps.getPropertyArray().length);
+		assertEquals(1, newCtProps.getPropertyArray().length);
 
 
-        org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty
-                newpProperty = newCtProps.getPropertyArray()[0];
+		org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty
+				newpProperty = newCtProps.getPropertyArray()[0];
 
-        assertEquals(fmtid, newpProperty.getFmtid());
-        assertEquals(pId, newpProperty.getPid());
-        assertEquals(name, newpProperty.getName());
-        assertEquals(stringValue, newpProperty.getBstr());
+		assertEquals(fmtid, newpProperty.getFmtid());
+		assertEquals(pId, newpProperty.getPid());
+		assertEquals(name, newpProperty.getName());
+		assertEquals(stringValue, newpProperty.getBstr());
 
 
-    }
-    
-    public void testDocumentProperties() {
-		String category = coreProperties.getCategory();
+	}
+
+	public void testDocumentProperties() {
+		String category = _coreProperties.getCategory();
 		assertEquals("test", category);
 		String contentStatus = "Draft";
-		coreProperties.setContentStatus(contentStatus);
+		_coreProperties.setContentStatus(contentStatus);
 		assertEquals("Draft", contentStatus);
-		Date created = coreProperties.getCreated();
+		Date created = _coreProperties.getCreated();
 		SimpleDateFormat formatter = new SimpleDateFormat("EEE, MMM d, ''yy");
 		assertEquals("Mon, Jul 20, '09", formatter.format(created));
-		String creator = coreProperties.getCreator();
+		String creator = _coreProperties.getCreator();
 		assertEquals("Paolo Mottadelli", creator);
-		String subject = coreProperties.getSubject();
+		String subject = _coreProperties.getSubject();
 		assertEquals("Greetings", subject);
-		String title = coreProperties.getTitle();
+		String title = _coreProperties.getTitle();
 		assertEquals("Hello World", title);
-    }
-    
-    public void testGetSetRevision() {
-		String revision = coreProperties.getRevision();
-		assertTrue("Revision number is 1", new Integer(coreProperties.getRevision()).intValue() > 1);
-		coreProperties.setRevision("20");
-		assertEquals("20", coreProperties.getRevision());
-		coreProperties.setRevision("20xx");
-		assertEquals("20", coreProperties.getRevision());
-    }
-}
\ No newline at end of file
+	}
+
+	public void testGetSetRevision() {
+		String revision = _coreProperties.getRevision();
+		assertTrue("Revision number is 1", new Integer(_coreProperties.getRevision()).intValue() > 1);
+		_coreProperties.setRevision("20");
+		assertEquals("20", _coreProperties.getRevision());
+		_coreProperties.setRevision("20xx");
+		assertEquals("20", _coreProperties.getRevision());
+	}
+}
diff --git a/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java b/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
index aa85494491..2c0c5b5513 100644
--- a/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
@@ -24,14 +24,14 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 
 import junit.framework.TestCase;
 
-public class TestXMLPropertiesTextExtractor extends TestCase {
+public final class TestXMLPropertiesTextExtractor extends TestCase {
 	private String dirname;
-	
-	protected void setUp() throws Exception {
+
+	protected void setUp() {
 		dirname = System.getProperty("OOXML.testdata.path");
 		assertTrue( (new File(dirname)).exists() );
 	}
-	
+
 	public void testGetFromMainExtractor() throws Exception {
 		OPCPackage pkg = OPCPackage.open(
 				(new File(dirname, "ExcelWithAttachments.xlsm")).toString()
@@ -40,15 +40,15 @@ public class TestXMLPropertiesTextExtractor extends TestCase {
 
 		XSSFExcelExtractor ext = new XSSFExcelExtractor(wb);
 		POIXMLPropertiesTextExtractor textExt = ext.getMetadataTextExtractor();
-		
+
 		// Check basics
 		assertNotNull(textExt);
 		assertTrue(textExt.getText().length() > 0);
-		
+
 		// Check some of the content
 		String text = textExt.getText();
 		String cText = textExt.getCorePropertiesText();
-		
+
 		assertTrue(text.contains("LastModifiedBy = Yury Batrakov"));
 		assertTrue(cText.contains("LastModifiedBy = Yury Batrakov"));
 	}
@@ -58,38 +58,38 @@ public class TestXMLPropertiesTextExtractor extends TestCase {
 				(new File(dirname, "ExcelWithAttachments.xlsm")).toString()
 		);
 		XSSFWorkbook wb = new XSSFWorkbook(pkg);
-		
+
 		POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
 		ext.getText();
-		
+
 		// Now check
 		String text = ext.getText();
 		String cText = ext.getCorePropertiesText();
-		
+
 		assertTrue(text.contains("LastModifiedBy = Yury Batrakov"));
 		assertTrue(cText.contains("LastModifiedBy = Yury Batrakov"));
 	}
-	
+
 	public void testExtended() throws Exception {
 		OPCPackage pkg = OPCPackage.open(
 				(new File(dirname, "ExcelWithAttachments.xlsm")).toString()
 		);
 		XSSFWorkbook wb = new XSSFWorkbook(pkg);
-		
+
 		POIXMLPropertiesTextExtractor ext = new POIXMLPropertiesTextExtractor(wb);
 		ext.getText();
-		
+
 		// Now check
 		String text = ext.getText();
 		String eText = ext.getExtendedPropertiesText();
-		
+
 		assertTrue(text.contains("Application = Microsoft Excel"));
 		assertTrue(text.contains("Company = Mera"));
 		assertTrue(eText.contains("Application = Microsoft Excel"));
 		assertTrue(eText.contains("Company = Mera"));
 	}
-	
-	public void testCustom() throws Exception {
+
+	public void testCustom() {
 		// TODO!
 	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
index c43d951d88..955bf265c9 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
@@ -19,7 +19,13 @@ package org.apache.poi.openxml4j.opc.internal;
 
 import junit.framework.TestCase;
 
+import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.openxml4j.opc.PackageAccess;
+import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.openxml4j.opc.PackagePartName;
+import org.apache.poi.openxml4j.opc.PackageRelationship;
+import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 
 public final class TestContentTypeManager extends TestCase {
@@ -27,25 +33,21 @@ public final class TestContentTypeManager extends TestCase {
 	/**
 	 * Test the properties part content parsing.
 	 */
-	public void testContentType() throws Exception {
-		// File originalFile = new File(testCore.getTestRootPath() +
-		// File.separator +
-		// "sample.docx");
-		//
-		// // Retrieves core properties part
-		// Package p = Package.open(originalFile.getAbsolutePath(),
-		// PackageAccess.READ);
-		// PackageRelationship corePropertiesRelationship = p
-		// .getRelationshipsByType(
-		// PackageRelationshipTypes.CORE_PROPERTIES)
-		// .getRelationship(0);
-		// PackagePart coreDocument = p.getPart(corePropertiesRelationship);
-		//
-		// ContentTypeManager ctm = new ZipContentTypeManager(coreDocument
-		// .getInputStream());
-		//
-		// // TODO
-		//fail();
+	public void disabled_testContentType() throws Exception {
+		String filepath =  OpenXML4JTestDataSamples.getSampleFileName("sample.docx");
+
+		 // Retrieves core properties part
+		 OPCPackage p = OPCPackage.open(filepath, PackageAccess.READ);
+		 PackageRelationship corePropertiesRelationship = p
+		 .getRelationshipsByType(
+		 PackageRelationshipTypes.CORE_PROPERTIES)
+		 .getRelationship(0);
+		 PackagePart coreDocument = p.getPart(corePropertiesRelationship);
+
+		 ContentTypeManager ctm = new ZipContentTypeManager(coreDocument.getInputStream(), p);
+
+		 // TODO - finish writing this test
+		fail();
 	}
 
 	/**
@@ -54,14 +56,10 @@ public final class TestContentTypeManager extends TestCase {
 	public void testContentTypeAddition() throws Exception {
 		ContentTypeManager ctm = new ZipContentTypeManager(null, null);
 
-		PackagePartName name1 = PackagingURIHelper
-				.createPartName("/foo/foo.XML");
-		PackagePartName name2 = PackagingURIHelper
-				.createPartName("/foo/foo2.xml");
-		PackagePartName name3 = PackagingURIHelper
-				.createPartName("/foo/doc.rels");
-		PackagePartName name4 = PackagingURIHelper
-				.createPartName("/foo/doc.RELS");
+		PackagePartName name1 = PackagingURIHelper.createPartName("/foo/foo.XML");
+		PackagePartName name2 = PackagingURIHelper.createPartName("/foo/foo2.xml");
+		PackagePartName name3 = PackagingURIHelper.createPartName("/foo/doc.rels");
+		PackagePartName name4 = PackagingURIHelper.createPartName("/foo/doc.RELS");
 
 		// Add content types
 		ctm.addContentType(name1, "foo-type1");
@@ -81,14 +79,10 @@ public final class TestContentTypeManager extends TestCase {
 	public void testContentTypeRemoval() throws Exception {
 		ContentTypeManager ctm = new ZipContentTypeManager(null, null);
 
-		PackagePartName name1 = PackagingURIHelper
-				.createPartName("/foo/foo.xml");
-		PackagePartName name2 = PackagingURIHelper
-				.createPartName("/foo/foo2.xml");
-		PackagePartName name3 = PackagingURIHelper
-				.createPartName("/foo/doc.rels");
-		PackagePartName name4 = PackagingURIHelper
-				.createPartName("/foo/doc.RELS");
+		PackagePartName name1 = PackagingURIHelper.createPartName("/foo/foo.xml");
+		PackagePartName name2 = PackagingURIHelper.createPartName("/foo/foo2.xml");
+		PackagePartName name3 = PackagingURIHelper.createPartName("/foo/doc.rels");
+		PackagePartName name4 = PackagingURIHelper.createPartName("/foo/doc.RELS");
 
 		// Add content types
 		ctm.addContentType(name1, "foo-type1");
@@ -110,7 +104,7 @@ public final class TestContentTypeManager extends TestCase {
 	/**
 	 * Test the addition then removal of content types in a package.
 	 */
-	public void testContentTypeRemovalPackage() throws Exception {
+	public void testContentTypeRemovalPackage() {
 		// TODO
 	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java b/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
index af93ba9aa5..0cebd76410 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.ss;
 
 import java.io.File;
@@ -28,12 +29,12 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 
 import junit.framework.TestCase;
 
-public class TestWorkbookFactory extends TestCase {
+public final class TestWorkbookFactory extends TestCase {
 	private File xls;
 	private File xlsx;
 	private File txt;
 
-	protected void setUp() throws Exception {
+	protected void setUp() {
 		xls = new File(
 				System.getProperty("HSSF.testdata.path") +
 				File.separator + "SampleSS.xls"
@@ -50,17 +51,17 @@ public class TestWorkbookFactory extends TestCase {
 		assertTrue(xlsx.exists());
 		assertTrue(txt.exists());
 	}
-	
+
 	public void testCreateNative() throws Exception {
 		Workbook wb;
-		
+
 		// POIFS -> hssf
 		wb = WorkbookFactory.create(
 				new POIFSFileSystem(new FileInputStream(xls))
 		);
 		assertNotNull(wb);
 		assertTrue(wb instanceof HSSFWorkbook);
-		
+
 		// Package -> xssf
 		wb = WorkbookFactory.create(
 				OPCPackage.open(xlsx.toString())
@@ -68,7 +69,7 @@ public class TestWorkbookFactory extends TestCase {
 		assertNotNull(wb);
 		assertTrue(wb instanceof XSSFWorkbook);
 	}
-		
+
 	/**
 	 * Creates the appropriate kind of Workbook, but
 	 *  checking the mime magic at the start of the
@@ -76,20 +77,20 @@ public class TestWorkbookFactory extends TestCase {
 	 */
 	public void testCreateGeneric() throws Exception {
 		Workbook wb;
-		
+
 		// InputStream -> either
 		wb = WorkbookFactory.create(
 				new FileInputStream(xls)
 		);
 		assertNotNull(wb);
 		assertTrue(wb instanceof HSSFWorkbook);
-		
+
 		wb = WorkbookFactory.create(
 				new FileInputStream(xlsx)
 		);
 		assertNotNull(wb);
 		assertTrue(wb instanceof XSSFWorkbook);
-		
+
 		try {
 			wb = WorkbookFactory.create(
 					new FileInputStream(txt)
@@ -99,4 +100,4 @@ public class TestWorkbookFactory extends TestCase {
 			// Good
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
index ab74042927..3bbb861f42 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
@@ -30,191 +30,150 @@ import org.apache.poi.xssf.usermodel.XSSFMap;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 /**
- * 
  * @author Roberto Manicardi
- *
  */
-public class TestXSSFExportToXML extends TestCase{
-	
-	
-	
-	
-	
-	public void testExportToXML() throws Exception{
-	
-		
-		 XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
-		  
-		 
-		 
-		  MapInfo mapInfo = null;
-		  
-		  for(POIXMLDocumentPart p : wb.getRelations()){
-			  
-			  
-			  if(p instanceof MapInfo){
-				  mapInfo = (MapInfo) p;
-				  
-				  
-				  XSSFMap map = mapInfo.getXSSFMapById(1);
-				  XSSFExportToXml exporter = new XSSFExportToXml(map);
-				  ByteArrayOutputStream os = new ByteArrayOutputStream();
-				  exporter.exportToXML(os,true);
-				  String xml = os.toString("UTF-8");
-				  
-				  assertNotNull(xml);
-				  assertTrue(!xml.equals(""));
-				  
-				  
-				  String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
-				  String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
-				  String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
-				  String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
-				  String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
-				  String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
-				  String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
-				  String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
-				  
-				  assertEquals("ro",docente);
-				  assertEquals("ro",nome);
-				  assertEquals("ds",tutor);
-				  assertEquals("gs",cdl);
-				  assertEquals("g",durata);
-				  assertEquals("gvvv",argomento);
-				  assertEquals("aaaa",progetto);
-				  assertEquals("aa",crediti);
-				  
-			  }
-			 
-		  }
-		
-	}
-	
-	
-	public void testExportToXMLInverseOrder() throws Exception{
-		
-	
-		
-		 XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
-	 
-		  MapInfo mapInfo = null;
-		  
-		  for(POIXMLDocumentPart p : wb.getRelations()){
-			  
-			  
-			  if(p instanceof MapInfo){
-				  mapInfo = (MapInfo) p;
-				  
-				  
-				  XSSFMap map = mapInfo.getXSSFMapById(1);
-				  XSSFExportToXml exporter = new XSSFExportToXml(map);
-				  ByteArrayOutputStream os = new ByteArrayOutputStream();
-				  exporter.exportToXML(os,true);
-				  String xml = os.toString("UTF-8");
-				  
-				  assertNotNull(xml);
-				  assertTrue(!xml.equals(""));
-				  
-				  String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
-				  String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
-				  String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
-				  String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
-				  String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
-				  String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
-				  String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
-				  String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
-				  
-				  assertEquals("aa",nome);
-				  assertEquals("aaaa",docente);
-				  assertEquals("gvvv",tutor);
-				  assertEquals("g",cdl);
-				  assertEquals("gs",durata);
-				  assertEquals("ds",argomento);
-				  assertEquals("ro",progetto);
-				  assertEquals("ro",crediti);
-				  
-			  }
-			 
-		  }
-		  
-		
-		
-		
-		
+public final class TestXSSFExportToXML extends TestCase {
+
+	public void testExportToXML() throws Exception {
+
+		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
+
+		for (POIXMLDocumentPart p : wb.getRelations()) {
+
+			if (!(p instanceof MapInfo)) {
+				continue;
+			}
+			MapInfo mapInfo = (MapInfo) p;
+
+			XSSFMap map = mapInfo.getXSSFMapById(1);
+			XSSFExportToXml exporter = new XSSFExportToXml(map);
+			ByteArrayOutputStream os = new ByteArrayOutputStream();
+			exporter.exportToXML(os, true);
+			String xml = os.toString("UTF-8");
+
+			assertNotNull(xml);
+			assertTrue(!xml.equals(""));
+
+			String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
+			String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
+			String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
+			String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
+			String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
+			String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
+			String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
+			String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
+
+			assertEquals("ro", docente);
+			assertEquals("ro", nome);
+			assertEquals("ds", tutor);
+			assertEquals("gs", cdl);
+			assertEquals("g", durata);
+			assertEquals("gvvv", argomento);
+			assertEquals("aaaa", progetto);
+			assertEquals("aa", crediti);
+		}
 	}
-	
-	public void testXPathOrdering() throws Exception{
-		
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
-		
-		 MapInfo mapInfo = null;
-		  
-		  for(POIXMLDocumentPart p : wb.getRelations()){
-			  
-			  
-			  if(p instanceof MapInfo){
-				  mapInfo = (MapInfo) p;
-				  
-				  XSSFMap map = mapInfo.getXSSFMapById(1);
-				  XSSFExportToXml exporter = new XSSFExportToXml(map);
-				  
-				  assertEquals(1,exporter.compare("/CORSO/DOCENTE", "/CORSO/NOME"));
-				  
-				  assertEquals(-1,exporter.compare("/CORSO/NOME", "/CORSO/DOCENTE"));
-				  
-				  
-			  }
-		  }
+
+	public void testExportToXMLInverseOrder() throws Exception {
+
+		XSSFWorkbook wb = XSSFTestDataSamples
+				.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
+
+		MapInfo mapInfo = null;
+
+		for (POIXMLDocumentPart p : wb.getRelations()) {
+
+			if (!(p instanceof MapInfo)) {
+				continue;
+			}
+			mapInfo = (MapInfo) p;
+
+			XSSFMap map = mapInfo.getXSSFMapById(1);
+			XSSFExportToXml exporter = new XSSFExportToXml(map);
+			ByteArrayOutputStream os = new ByteArrayOutputStream();
+			exporter.exportToXML(os, true);
+			String xml = os.toString("UTF-8");
+
+			assertNotNull(xml);
+			assertTrue(!xml.equals(""));
+
+			String docente = xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
+			String nome = xml.split("<NOME>")[1].split("</NOME>")[0].trim();
+			String tutor = xml.split("<TUTOR>")[1].split("</TUTOR>")[0].trim();
+			String cdl = xml.split("<CDL>")[1].split("</CDL>")[0].trim();
+			String durata = xml.split("<DURATA>")[1].split("</DURATA>")[0].trim();
+			String argomento = xml.split("<ARGOMENTO>")[1].split("</ARGOMENTO>")[0].trim();
+			String progetto = xml.split("<PROGETTO>")[1].split("</PROGETTO>")[0].trim();
+			String crediti = xml.split("<CREDITI>")[1].split("</CREDITI>")[0].trim();
+
+			assertEquals("aa", nome);
+			assertEquals("aaaa", docente);
+			assertEquals("gvvv", tutor);
+			assertEquals("g", cdl);
+			assertEquals("gs", durata);
+			assertEquals("ds", argomento);
+			assertEquals("ro", progetto);
+			assertEquals("ro", crediti);
+		}
 	}
-	
-	
-
-	
-	public void testMultiTable() throws Exception{
-		
-		
-		XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx");	 
-		  
-		  for(POIXMLDocumentPart p : wb.getRelations()){
-			  
-			  
-			  if(p instanceof MapInfo){
-				  MapInfo mapInfo = (MapInfo) p;
-				  
-				  XSSFMap map = mapInfo.getXSSFMapById(2);
-				  
-				  assertNotNull(map);
-				  
-				  XSSFExportToXml exporter = new XSSFExportToXml(map);
-				  ByteArrayOutputStream os = new ByteArrayOutputStream();
-				  exporter.exportToXML(os,true);
-				  String xml = os.toString("UTF-8");
-				  
-				  assertNotNull(xml);
-				  
-				  String[] regexConditions = {  "<MapInfo",
-						  						"</MapInfo>",
-						  						"<Schema ID=\"1\" Namespace=\"\" SchemaRef=\"\"/>",
-						  						"<Schema ID=\"4\" Namespace=\"\" SchemaRef=\"\"/>",
-						  						"DataBinding",
-						  						"Map Append=\"false\" AutoFit=\"false\" ID=\"1\"",
-						  						"Map Append=\"false\" AutoFit=\"false\" ID=\"5\""
-						  						
-				  						     };
-				  
-				  for(String condition : regexConditions){
-					  Pattern pattern = Pattern.compile(condition);
-					  Matcher matcher = pattern.matcher(xml);
-					  assertTrue(matcher.find());
-				  }
-				  
-				  
-			  }
-		  }
-		
-		
+
+	public void testXPathOrdering() {
+
+		XSSFWorkbook wb = XSSFTestDataSamples
+				.openSampleWorkbook("CustomXmlMappings-inverse-order.xlsx");
+
+		MapInfo mapInfo = null;
+
+		for (POIXMLDocumentPart p : wb.getRelations()) {
+
+			if (p instanceof MapInfo) {
+				mapInfo = (MapInfo) p;
+
+				XSSFMap map = mapInfo.getXSSFMapById(1);
+				XSSFExportToXml exporter = new XSSFExportToXml(map);
+
+				assertEquals(1, exporter.compare("/CORSO/DOCENTE", "/CORSO/NOME"));
+				assertEquals(-1, exporter.compare("/CORSO/NOME", "/CORSO/DOCENTE"));
+			}
+		}
 	}
-	
-	
 
+	public void testMultiTable() throws Exception {
+
+		XSSFWorkbook wb = XSSFTestDataSamples
+				.openSampleWorkbook("CustomXMLMappings-complex-type.xlsx");
+
+		for (POIXMLDocumentPart p : wb.getRelations()) {
+
+			if (p instanceof MapInfo) {
+				MapInfo mapInfo = (MapInfo) p;
+
+				XSSFMap map = mapInfo.getXSSFMapById(2);
+
+				assertNotNull(map);
+
+				XSSFExportToXml exporter = new XSSFExportToXml(map);
+				ByteArrayOutputStream os = new ByteArrayOutputStream();
+				exporter.exportToXML(os, true);
+				String xml = os.toString("UTF-8");
+
+				assertNotNull(xml);
+
+				String[] regexConditions = {
+						"<MapInfo", "</MapInfo>",
+						"<Schema ID=\"1\" Namespace=\"\" SchemaRef=\"\"/>",
+						"<Schema ID=\"4\" Namespace=\"\" SchemaRef=\"\"/>",
+						"DataBinding",
+						"Map Append=\"false\" AutoFit=\"false\" ID=\"1\"",
+						"Map Append=\"false\" AutoFit=\"false\" ID=\"5\"",
+				};
+
+				for (String condition : regexConditions) {
+					Pattern pattern = Pattern.compile(condition);
+					Matcher matcher = pattern.matcher(xml);
+					assertTrue(matcher.find());
+				}
+			}
+		}
+	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
index 191b3283cb..32ff49c9f7 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
@@ -24,9 +24,9 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.*;
 import junit.framework.TestCase;
 
 
-public class TestCalculationChain extends TestCase {
+public final class TestCalculationChain extends TestCase {
 
-    public void test46535() throws Exception {
+    public void test46535() {
         XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("46535.xlsx");
 
         CalculationChain chain = wb.getCalculationChain();
@@ -42,7 +42,7 @@ public class TestCalculationChain extends TestCase {
         assertEquals(XSSFCell.CELL_TYPE_FORMULA, cell.getCellType());
         cell.setCellFormula(null);
 
-        //the count of items is less by one 
+        //the count of items is less by one
         c = chain.getCTCalcChain().getCArray(0);
         int cnt2 =  chain.getCTCalcChain().getCArray().length;
         assertEquals(cnt - 1, cnt2);
@@ -56,4 +56,4 @@ public class TestCalculationChain extends TestCase {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
index e10711e696..f4564e4d21 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
@@ -30,11 +30,10 @@ import junit.framework.TestCase;
 /**
  * @author Roberto Manicardi
  */
-public class TestMapInfo extends TestCase {
+public final class TestMapInfo extends TestCase {
 
 
-    public void testMapInfoExists() throws Exception {
-
+    public void testMapInfoExists() {
 
         XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
 
@@ -72,13 +71,7 @@ public class TestMapInfo extends TestCase {
             }
 
         }
-
-
         assertNotNull(mapInfo);
         assertNotNull(singleXMLCells);
-
-
     }
-
-
 }
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 7aebf26385..46b0fd802c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
@@ -25,10 +25,10 @@ import org.apache.poi.xssf.XSSFTestDataSamples;
 
 import junit.framework.TestCase;
 
-public class TestStylesTable extends TestCase {
+public final class TestStylesTable extends TestCase {
 	private File xml;
-	
-	protected void setUp() throws Exception {
+
+	protected void setUp() {
 		xml = new File(
 				System.getProperty("HSSF.testdata.path") +
 				File.separator + "Formatting.xlsx"
@@ -36,92 +36,92 @@ public class TestStylesTable extends TestCase {
 		assertTrue(xml.exists());
 	}
 
-	public void testCreateNew() throws Exception {
+	public void testCreateNew() {
 		StylesTable st = new StylesTable();
-		
+
 		// Check defaults
 		assertNotNull(st.getCTStylesheet());
 		assertEquals(1, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(0, st._getNumberFormatSize());
 	}
-	
-	public void testCreateSaveLoad() throws Exception {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        StylesTable st = wb.getStylesSource();
+
+	public void testCreateSaveLoad() {
+		XSSFWorkbook wb = new XSSFWorkbook();
+		StylesTable st = wb.getStylesSource();
 
 		assertNotNull(st.getCTStylesheet());
 		assertEquals(1, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(0, st._getNumberFormatSize());
-		
+
 		st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource();
 
-        assertNotNull(st.getCTStylesheet());
+		assertNotNull(st.getCTStylesheet());
 		assertEquals(1, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(0, st._getNumberFormatSize());
 	}
-	
+
 	public void testLoadExisting() throws Exception {
 		XSSFWorkbook workbook = new XSSFWorkbook(xml.toString());
 		assertNotNull(workbook.getStylesSource());
-		
+
 		StylesTable st = workbook.getStylesSource();
-		
+
 		doTestExisting(st);
 	}
 	public void testLoadSaveLoad() throws Exception {
 		XSSFWorkbook workbook = new XSSFWorkbook(xml.toString());
 		assertNotNull(workbook.getStylesSource());
-		
+
 		StylesTable st = workbook.getStylesSource();
 		doTestExisting(st);
-		
+
 		st = XSSFTestDataSamples.writeOutAndReadBack(workbook).getStylesSource();
 		doTestExisting(st);
 	}
-	public void doTestExisting(StylesTable st) throws Exception {
+	public void doTestExisting(StylesTable st) {
 		// Check contents
 		assertNotNull(st.getCTStylesheet());
 		assertEquals(11, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(8, st._getNumberFormatSize());
-		
+
 		assertEquals(2, st.getFonts().size());
 		assertEquals(2, st.getFills().size());
 		assertEquals(1, st.getBorders().size());
-		
+
 		assertEquals("yyyy/mm/dd", st.getNumberFormatAt(165));
 		assertEquals("yy/mm/dd", st.getNumberFormatAt(167));
-		
+
 		assertNotNull(st.getStyleAt(0));
 		assertNotNull(st.getStyleAt(1));
 		assertNotNull(st.getStyleAt(2));
-		
+
 		assertEquals(0, st.getStyleAt(0).getDataFormat());
 		assertEquals(14, st.getStyleAt(1).getDataFormat());
 		assertEquals(0, st.getStyleAt(2).getDataFormat());
 		assertEquals(165, st.getStyleAt(3).getDataFormat());
-		
+
 		assertEquals("yyyy/mm/dd", st.getStyleAt(3).getDataFormatString());
 	}
-	
-	public void testPopulateNew() throws Exception {
+
+	public void testPopulateNew() {
 		XSSFWorkbook wb = new XSSFWorkbook();
-        StylesTable st = wb.getStylesSource();
-		
+		StylesTable st = wb.getStylesSource();
+
 		assertNotNull(st.getCTStylesheet());
 		assertEquals(1, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(0, st._getNumberFormatSize());
-		
+
 		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));
-		
+
 		// Save and re-load
 		st = XSSFTestDataSamples.writeOutAndReadBack(wb).getStylesSource();
 
@@ -129,31 +129,31 @@ public class TestStylesTable extends TestCase {
 		assertEquals(2, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(2, st._getNumberFormatSize());
-		
+
 		assertEquals("yyyy-mm-dd", st.getNumberFormatAt(nf1));
 		assertEquals(nf1, st.putNumberFormat("yyyy-mm-dd"));
 		assertEquals(nf2, st.putNumberFormat("yyyy-mm-DD"));
 	}
-	
+
 	public void testPopulateExisting() throws Exception {
 		XSSFWorkbook workbook = new XSSFWorkbook(xml.toString());
 		assertNotNull(workbook.getStylesSource());
-		
+
 		StylesTable st = workbook.getStylesSource();
 		assertEquals(11, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(8, st._getNumberFormatSize());
-		
+
 		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();
 
 		assertEquals(11, st._getXfsSize());
 		assertEquals(1, st._getStyleXfsSize());
 		assertEquals(10, st._getNumberFormatSize());
-		
+
 		assertEquals("YYYY-mm-dd", st.getNumberFormatAt(nf1));
 		assertEquals(nf1, st.putNumberFormat("YYYY-mm-dd"));
 		assertEquals(nf2, st.putNumberFormat("YYYY-mm-DD"));
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
index 51b0d02af0..564f2dee8c 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
@@ -37,7 +37,7 @@ public final class TestSheetHiding extends TestCase {
      *  with the right text on them, no matter what
      *  the hidden flags are
      */
-    public void testTextSheets() throws Exception {
+    public void testTextSheets() {
         // Both should have two sheets
         assertEquals(2, wbH.getNumberOfSheets());
         assertEquals(2, wbU.getNumberOfSheets());
@@ -65,7 +65,7 @@ public final class TestSheetHiding extends TestCase {
      * Check that we can get and set the hidden flags
      *  as expected
      */
-    public void testHideUnHideFlags() throws Exception {
+    public void testHideUnHideFlags() {
         assertTrue(wbH.isSheetHidden(0));
         assertFalse(wbH.isSheetHidden(1));
         assertFalse(wbU.isSheetHidden(0));
@@ -76,7 +76,7 @@ public final class TestSheetHiding extends TestCase {
      * Turn the sheet with none hidden into the one with
      *  one hidden
      */
-    public void testHide() throws Exception {
+    public void testHide() {
         wbU.setSheetHidden(0, true);
         assertTrue(wbU.isSheetHidden(0));
         assertFalse(wbU.isSheetHidden(1));
@@ -89,7 +89,7 @@ public final class TestSheetHiding extends TestCase {
      * Turn the sheet with one hidden into the one with
      *  none hidden
      */
-    public void testUnHide() throws Exception {
+    public void testUnHide() {
         wbH.setSheetHidden(0, false);
         assertFalse(wbH.isSheetHidden(0));
         assertFalse(wbH.isSheetHidden(1));
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index ed4953b2cd..e98676114c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -45,7 +45,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
      * Named ranges had the right reference, but
      *  the wrong sheet name
      */
-    public void test45430() throws Exception {
+    public void test45430() {
         XSSFWorkbook wb = getTestDataProvider().openSampleWorkbook("45430.xlsx");
         assertFalse(wb.isMacroEnabled());
         assertEquals(3, wb.getNumberOfNames());
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 a5abde4adc..194a983e25 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
@@ -35,7 +35,7 @@ public final class TestXSSFCell extends BaseTestCell {
      * Bug 47026: trouble changing cell type when workbook doesn't contain
      * Shared String Table
      */
-    public void test47026_1() throws Exception {
+    public void test47026_1() {
         Workbook source = _testDataProvider.openSampleWorkbook("47026.xlsm");
         Sheet sheet = source.getSheetAt(0);
         Row row = sheet.getRow(0);
@@ -44,7 +44,7 @@ public final class TestXSSFCell extends BaseTestCell {
         cell.setCellValue("456");
     }
 
-    public void test47026_2() throws Exception {
+    public void test47026_2() {
         Workbook source = _testDataProvider.openSampleWorkbook("47026.xlsm");
         Sheet sheet = source.getSheetAt(0);
         Row row = sheet.getRow(0);
@@ -60,7 +60,7 @@ public final class TestXSSFCell extends BaseTestCell {
      * Some programs, for example, Microsoft Excel Driver for .xlsx insert inline string
      * instead of using the shared string table. See bug 47206
      */
-    public void testInlineString() throws Exception {
+    public void testInlineString() {
         XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.openSampleWorkbook("xlsx-jdbc.xlsx");
         XSSFSheet sheet = wb.getSheetAt(0);
         XSSFRow row = sheet.getRow(1);
@@ -84,7 +84,7 @@ public final class TestXSSFCell extends BaseTestCell {
     /**
      *  Bug 47278 -  xsi:nil attribute for <t> tag caused Excel 2007 to fail to open workbook
      */
-    public void test47278() throws Exception {
+    public void test47278() {
         XSSFWorkbook wb = (XSSFWorkbook)_testDataProvider.createWorkbook();
         XSSFSheet sheet = wb.createSheet();
         XSSFRow row = sheet.createRow(0);
@@ -105,5 +105,4 @@ public final class TestXSSFCell extends BaseTestCell {
         assertEquals(0, sst.getCount());
         assertEquals(XSSFCell.CELL_TYPE_BLANK, cell_1.getCellType());
     }
-    
-}
\ No newline at end of file
+}
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
index 0e7b8be807..d290b4e1ce 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
@@ -46,9 +46,9 @@ public class TestXSSFCellStyle extends TestCase {
 	@Override
 	protected void setUp() {
 		stylesTable = new StylesTable();
-		
+
 		ctStylesheet = stylesTable.getCTStylesheet();
-		
+
 		ctBorderA = CTBorder.Factory.newInstance();
 		XSSFCellBorder borderA = new XSSFCellBorder(ctBorderA);
 		long borderId = stylesTable.putBorder(borderA);
@@ -71,7 +71,7 @@ public class TestXSSFCellStyle extends TestCase {
 		cellStyleXf.setBorderId(1);
 		cellStyleXf.setFillId(1);
 		cellStyleXf.setFontId(1);
-		
+
 		cellXfs = ctStylesheet.addNewCellXfs();
 		cellXf = cellXfs.addNewXf();
 		cellXf.setXfId(1);
@@ -419,7 +419,7 @@ public class TestXSSFCellStyle extends TestCase {
         assertNull(cellStyle.getFillBackgroundXSSFColor());
         assertEquals(IndexedColors.AUTOMATIC.getIndex(), cellStyle.getFillBackgroundColor());
 	}
-	
+
 	public void testDefaultStyles() {
 
 		XSSFWorkbook wb1 = new XSSFWorkbook();
@@ -445,7 +445,7 @@ public class TestXSSFCellStyle extends TestCase {
         assertEquals(style2.getBorderRight(), style1.getBorderRight());
         assertEquals(style2.getBorderTop(), style1.getBorderTop());
 	}
-	
+
 
 	public void testGetFillForegroundColor() {
 
@@ -481,7 +481,7 @@ public class TestXSSFCellStyle extends TestCase {
             assertEquals(4, styles.getFills().size());
         }
 	}
-	
+
 	public void testGetFillPattern() {
 
         assertEquals(CellStyle.NO_FILL, cellStyle.getFillPattern());
@@ -585,13 +585,13 @@ public class TestXSSFCellStyle extends TestCase {
 	/**
 	 * Cloning one XSSFCellStyle onto Another, same XSSFWorkbook
 	 */
-	public void testCloneStyleSameWB() throws Exception {
+	public void testCloneStyleSameWB() {
 		// TODO
 	}
 	/**
 	 * Cloning one XSSFCellStyle onto Another, different XSSFWorkbooks
 	 */
-	public void testCloneStyleDiffWB() throws Exception {
+	public void testCloneStyleDiffWB() {
 		// TODO
 	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
index 7cf6e4a846..c64aa405e0 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
@@ -140,7 +140,7 @@ public class TestXSSFComment extends TestCase {
      *  file, save, load, and still see them
      * @throws Exception
      */
-    public void testCreateSave() throws Exception {
+    public void testCreateSave() {
         XSSFWorkbook wb = new XSSFWorkbook();
         XSSFSheet s1 = wb.createSheet();
         Row r1 = s1.createRow(0);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
index 95cc8ac066..6596edaf5a 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
@@ -27,14 +27,15 @@ import org.apache.poi.xssf.XSSFITestDataProvider;
  */
 public final class TestXSSFDataFormat extends BaseTestDataFormat {
 
-    @Override
-    protected ITestDataProvider getTestDataProvider(){
-        return XSSFITestDataProvider.getInstance();
-    }
+	@Override
+	protected ITestDataProvider getTestDataProvider() {
+		return XSSFITestDataProvider.getInstance();
+	}
+
 	/**
-     * Test setting and getting boolean values.
-     */
-    public void testBuiltinFormats() throws Exception {
-        baseBuiltinFormats();
-    }
+	 * Test setting and getting boolean values.
+	 */
+	public void testBuiltinFormats() {
+		baseBuiltinFormats();
+	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
index ada54b0d8e..e31e42f753 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
@@ -14,6 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
+
 package org.apache.poi.xwpf;
 
 import java.io.File;
@@ -27,13 +28,13 @@ import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFRelation;
 
-public class TestXWPFDocument extends TestCase {
+public final class TestXWPFDocument extends TestCase {
 	private File sampleFile;
 	private File complexFile;
 
 	protected void setUp() throws Exception {
 		super.setUp();
-		
+
 		sampleFile = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "sample.docx"
@@ -42,14 +43,14 @@ public class TestXWPFDocument extends TestCase {
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "IllustrativeCases.docx"
 		);
-		
+
 		assertTrue(sampleFile.exists());
 		assertTrue(complexFile.exists());
 	}
 
 	public void testContainsMainContentType() throws Exception {
 		OPCPackage pack = POIXMLDocument.openPackage(sampleFile.toString());
-		
+
 		boolean found = false;
 		for(PackagePart part : pack.getParts()) {
 			if(part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
@@ -63,16 +64,16 @@ public class TestXWPFDocument extends TestCase {
 	public void testOpen() throws Exception {
 		POIXMLDocument.openPackage(sampleFile.toString());
 		POIXMLDocument.openPackage(complexFile.toString());
-		
+
 		new XWPFDocument(
 				POIXMLDocument.openPackage(sampleFile.toString())
 		);
 		new XWPFDocument(
 				POIXMLDocument.openPackage(complexFile.toString())
 		);
-		
+
 		XWPFDocument xml;
-		
+
 		// Simple file
 		xml = new XWPFDocument(
 				POIXMLDocument.openPackage(sampleFile.toString())
@@ -81,7 +82,7 @@ public class TestXWPFDocument extends TestCase {
 		assertNotNull(xml.getDocument());
 		assertNotNull(xml.getDocument().getBody());
 		assertNotNull(xml.getStyle());
-		
+
 		// Complex file
 		xml = new XWPFDocument(
 				POIXMLDocument.openPackage(complexFile.toString())
@@ -90,42 +91,42 @@ public class TestXWPFDocument extends TestCase {
 		assertNotNull(xml.getDocument().getBody());
 		assertNotNull(xml.getStyle());
 	}
-	
+
 	public void testMetadataBasics() throws Exception {
 		XWPFDocument xml = new XWPFDocument(
 				POIXMLDocument.openPackage(sampleFile.toString())
 		);
 		assertNotNull(xml.getProperties().getCoreProperties());
 		assertNotNull(xml.getProperties().getExtendedProperties());
-		
+
 		assertEquals("Microsoft Office Word", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
 		assertEquals(1315, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
 		assertEquals(10, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
-		
+
 		assertEquals(null, xml.getProperties().getCoreProperties().getTitle());
 		assertEquals(null, xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
 	}
-	
+
 	public void testMetadataComplex() throws Exception {
 		XWPFDocument xml = new XWPFDocument(
 				POIXMLDocument.openPackage(complexFile.toString())
 		);
 		assertNotNull(xml.getProperties().getCoreProperties());
 		assertNotNull(xml.getProperties().getExtendedProperties());
-		
+
 		assertEquals("Microsoft Office Outlook", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication());
 		assertEquals(5184, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters());
 		assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines());
-		
+
 		assertEquals(" ", xml.getProperties().getCoreProperties().getTitle());
 		assertEquals(" ", xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue());
 	}
 
-    public void testWorkbookProperties() throws Exception {
-        XWPFDocument doc = new XWPFDocument();
-        POIXMLProperties props = doc.getProperties();
-        assertNotNull(props);
-        assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
-    }
+	public void testWorkbookProperties() {
+		XWPFDocument doc = new XWPFDocument();
+		POIXMLProperties props = doc.getProperties();
+		assertNotNull(props);
+		assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
+	}
 
 }
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
index b55b01951b..ef5d5868a0 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
@@ -33,46 +33,46 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
 	private XWPFDocument footer;
 	private XWPFDocument oddEven;
 	private XWPFDocument diffFirst;
-	
+
 	protected void setUp() throws Exception {
 		super.setUp();
 		File file;
-		
+
 		file = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "NoHeadFoot.docx"
 		);
 		assertTrue(file.exists());
 		noHeader = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
-		
+
 		file = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "ThreeColHead.docx"
 		);
 		assertTrue(file.exists());
 		header = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
-		
+
 		file = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "SimpleHeadThreeColFoot.docx"
 		);
 		assertTrue(file.exists());
 		headerFooter = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
-		
+
 		file = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "FancyFoot.docx"
 		);
 		assertTrue(file.exists());
 		footer = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
-		
+
 		file = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "PageSpecificHeadFoot.docx"
 		);
 		assertTrue(file.exists());
 		oddEven = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
-		
+
 		file = new File(
 				System.getProperty("HWPF.testdata.path") +
 				File.separator + "DiffFirstPageHeadFoot.docx"
@@ -80,72 +80,72 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
 		assertTrue(file.exists());
 		diffFirst = new XWPFDocument(POIXMLDocument.openPackage(file.toString()));
 	}
-	
-	public void testPolicy() throws Exception {
+
+	public void testPolicy() {
 		XWPFHeaderFooterPolicy policy;
-		
+
 		policy = noHeader.getHeaderFooterPolicy();
 		assertNull(policy.getDefaultHeader());
 		assertNull(policy.getDefaultFooter());
-		
+
 		assertNull(policy.getHeader(1));
 		assertNull(policy.getHeader(2));
 		assertNull(policy.getHeader(3));
 		assertNull(policy.getFooter(1));
 		assertNull(policy.getFooter(2));
 		assertNull(policy.getFooter(3));
-		
-		
+
+
 		policy = header.getHeaderFooterPolicy();
 		assertNotNull(policy.getDefaultHeader());
 		assertNull(policy.getDefaultFooter());
-		
+
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
 		assertNull(policy.getFooter(1));
 		assertNull(policy.getFooter(2));
 		assertNull(policy.getFooter(3));
-		
-		
+
+
 		policy = footer.getHeaderFooterPolicy();
 		assertNull(policy.getDefaultHeader());
 		assertNotNull(policy.getDefaultFooter());
-		
+
 		assertNull(policy.getHeader(1));
 		assertNull(policy.getHeader(2));
 		assertNull(policy.getHeader(3));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-		
-		
+
+
 		policy = headerFooter.getHeaderFooterPolicy();
 		assertNotNull(policy.getDefaultHeader());
 		assertNotNull(policy.getDefaultFooter());
-		
+
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-		
-		
+
+
 		policy = oddEven.getHeaderFooterPolicy();
 		assertNotNull(policy.getDefaultHeader());
 		assertNotNull(policy.getDefaultFooter());
 		assertNotNull(policy.getEvenPageHeader());
 		assertNotNull(policy.getEvenPageFooter());
-		
+
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
 		assertEquals(policy.getEvenPageHeader(), policy.getHeader(2));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
 		assertEquals(policy.getEvenPageFooter(), policy.getFooter(2));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-		
-		
+
+
 		policy = diffFirst.getHeaderFooterPolicy();
 		assertNotNull(policy.getDefaultHeader());
 		assertNotNull(policy.getDefaultFooter());
@@ -153,7 +153,7 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
 		assertNotNull(policy.getFirstPageFooter());
 		assertNull(policy.getEvenPageHeader());
 		assertNull(policy.getEvenPageFooter());
-		
+
 		assertEquals(policy.getFirstPageHeader(), policy.getHeader(1));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
 		assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
@@ -161,32 +161,32 @@ public class TestXWPFHeaderFooterPolicy extends TestCase {
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
 		assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
 	}
-	
-	public void testContents() throws Exception {
+
+	public void testContents() {
 		XWPFHeaderFooterPolicy policy;
-		
+
 		// Test a few simple bits off a simple header
 		policy = diffFirst.getHeaderFooterPolicy();
-		
+
 		assertEquals(
 			"I am the header on the first page, and I" + '\u2019' + "m nice and simple\n",
 			policy.getFirstPageHeader().getText()
 		);
 		assertEquals(
-				"First header column!\tMid header\tRight header!\n", 
+				"First header column!\tMid header\tRight header!\n",
 				policy.getDefaultHeader().getText()
 		);
-		
-		
+
+
 		// And a few bits off a more complex header
 		policy = oddEven.getHeaderFooterPolicy();
-		
+
 		assertEquals(
 			"[]ODD Page Header text\n\n",
 			policy.getDefaultHeader().getText()
 		);
 		assertEquals(
-			"[This is an Even Page, with a Header]\n\n", 
+			"[This is an Even Page, with a Header]\n\n",
 			policy.getEvenPageHeader().getText()
 		);
 	}