fix some Eclipse warnings, adjust some unit tests slightly

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

src/java/org/apache/poi/hssf/record/StyleRecord.java

@@ -138,6 +138,7 @@ public final class StyleRecord extends StandardRecord {
 		return field_4_name;
 	}
 
+	@Override
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
 
@@ -156,6 +157,7 @@ public final class StyleRecord extends StandardRecord {
 	}
 
 
+	@Override
 	protected int getDataSize() {
 		if (isBuiltin()) {
 			return 4; // short, byte, byte
@@ -165,6 +167,7 @@ public final class StyleRecord extends StandardRecord {
 			+ field_4_name.length() * (field_3_stringHasMultibyte ? 2 : 1);
 	}
 
+	@Override
 	public void serialize(LittleEndianOutput out) {
 		out.writeShort(field_1_xf_index);
 		if (isBuiltin()) {
@@ -181,6 +184,7 @@ public final class StyleRecord extends StandardRecord {
 		}
 	}
 
+	@Override
 	public short getSid() {
 		return sid;
 	}

src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java

@@ -229,9 +229,9 @@ public final class AnalysisToolPak implements UDFFinder {
             if(metaData != null) {
                 throw new IllegalArgumentException(name + " is a built-in Excel function. " +
                         "Use FunctoinEval.registerFunction(String name, Function func) instead.");
-            } else {
-                throw new IllegalArgumentException(name + " is not a function from the Excel Analysis Toolpack.");
             }
+
+            throw new IllegalArgumentException(name + " is not a function from the Excel Analysis Toolpack.");
         }
         FreeRefFunction f = inst.findFunction(name);
         if(f != null && !(f instanceof NotImplemented)) {

src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java

@@ -343,6 +343,7 @@ public class POIXMLDocumentPart {
      * @param noRelation if true, then no relationship is added.
      * @return the created child POIXMLDocumentPart
      */
+    @SuppressWarnings("null")
 	protected final POIXMLDocumentPart createRelationship(POIXMLRelation descriptor, POIXMLFactory factory, int idx, boolean noRelation){
         try {
             PackagePartName ppName = PackagingURIHelper.createPartName(descriptor.getFileName(idx));

src/testcases/org/apache/poi/POIDataSamples.java

@@ -16,7 +16,12 @@
 ==================================================================== */
 package org.apache.poi;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Centralises logic for finding/opening sample files
@@ -219,15 +224,19 @@ public final class POIDataSamples {
             _is = is;
         }
 
+        @Override
 		public int read() throws IOException {
             return _is.read();
         }
+        @Override
 		public int read(byte[] b, int off, int len) throws IOException {
             return _is.read(b, off, len);
         }
+        @Override
 		public boolean markSupported() {
             return false;
         }
+        @Override
 		public void close() throws IOException {
             _is.close();
         }

src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java

@@ -71,9 +71,8 @@ public class AllUserModelTests {
 		result.addTestSuite(TestRowStyle.class);
 		result.addTestSuite(TestSanityChecker.class);
 		result.addTestSuite(TestSheetHiding.class);
-		if (false) { // deliberately avoiding this one
-			result.addTestSuite(TestUnfixedBugs.class);
-		}
+		/* deliberately avoiding this one
+		result.addTestSuite(TestUnfixedBugs.class);*/
 		result.addTestSuite(TestUnicodeWorkbook.class);
 		result.addTestSuite(TestNonStandardWorkbookStreamNames.class);
 		result.addTestSuite(TestWorkbook.class);

src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java

@@ -89,6 +89,7 @@ public abstract class BaseTestRow extends TestCase {
 
     public void testRemoveCell() {
         Workbook workbook = _testDataProvider.createWorkbook();
+        {
             Sheet sheet = workbook.createSheet();
             Row row = sheet.createRow(0);
 
@@ -112,14 +113,18 @@ public abstract class BaseTestRow extends TestCase {
             assertEquals(-1, row.getLastCellNum());
             assertEquals(-1, row.getFirstCellNum());
             assertEquals(0, row.getPhysicalNumberOfCells());
+        }
 
         workbook = _testDataProvider.writeOutAndReadBack(workbook);
-        sheet = workbook.getSheetAt(0);
-        row = sheet.getRow(0);
+
+        {
+            Sheet sheet = workbook.getSheetAt(0);
+            Row row = sheet.getRow(0);
             assertEquals(-1, row.getLastCellNum());
             assertEquals(-1, row.getFirstCellNum());
             assertEquals(0, row.getPhysicalNumberOfCells());
         }
+    }
 
     public void baseTestRowBounds(int maxRowNum) {
         Workbook workbook = _testDataProvider.createWorkbook();