Various small Eclipse warning fixes,

also ensure close() of stream in Ant-Task, although WorkbookFactory usually takes care of this, however in exception-cases it could be missing

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

src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java

@@ -38,7 +38,8 @@ public class RubyOutputStream extends OutputStream {
 //        incRef();
     }
 
-    protected void finalize()
+    @Override
+	protected void finalize()
         throws Throwable
     {
 //        decRef();
@@ -47,13 +48,15 @@ public class RubyOutputStream extends OutputStream {
 //    protected native void incRef();
 //    protected native void decRef();
 
-    public native void close()
+    @Override
+	public native void close()
         throws IOException;
 
 
 	/* (non-Javadoc)
 	 * @see java.io.OutputStream#write(int)
 	 */
+	@Override
 	public native void write(int arg0) throws IOException;
 }
 

src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java

@@ -87,7 +87,11 @@ public class ExcelAntWorkbookUtil extends Typedef {
         File workbookFile = new File(excelFileName);
         try {
             FileInputStream fis = new FileInputStream(workbookFile);
-            workbook = WorkbookFactory.create(fis);
+            try {
+            	workbook = WorkbookFactory.create(fis);
+            } finally {
+            	fis.close();
+            }
         } catch(Exception e) {
             throw new BuildException("Cannot load file " + excelFileName
                     + ". Make sure the path and file permissions are correct.", e);
@@ -105,7 +109,7 @@ public class ExcelAntWorkbookUtil extends Typedef {
      * @throws IllegalAccessException
      */
     public void addFunction( String name, String clazzName ) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-        Class clazzInst = Class.forName( clazzName ) ;
+        Class<?> clazzInst = Class.forName( clazzName ) ;
         Object newInst = clazzInst.newInstance() ;
         if( newInst instanceof FreeRefFunction ) {
             addFunction( name, (FreeRefFunction)newInst ) ;
@@ -154,12 +158,12 @@ public class ExcelAntWorkbookUtil extends Typedef {
      * Returns a formula evaluator that is loaded with the functions that
      * have been supplied.
      *
-     * @param excelFileName
+     * @param fileName
      * @return
      */
-    protected FormulaEvaluator getEvaluator( String excelFileName ) {
+    protected FormulaEvaluator getEvaluator( String fileName ) {
         FormulaEvaluator evaluator ;
-        if (excelFileName.endsWith(".xlsx")) {
+        if (fileName.endsWith(".xlsx")) {
             if( xlsMacroList != null && xlsMacroList.size() > 0 ) {
                 evaluator = XSSFFormulaEvaluator.create( (XSSFWorkbook) workbook,
                                                          null,

src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java

@@ -53,11 +53,11 @@ public class ExcelAntWorkbookUtilFactory {
         if( workbookUtilMap != null &&
                 workbookUtilMap.containsKey( fileName ) ) {
             return workbookUtilMap.get( fileName ) ;
-        } else {
-            ExcelAntWorkbookUtil wbu = new ExcelAntWorkbookUtil( fileName ) ;
-            workbookUtilMap.put( fileName, wbu ) ;
-            return wbu ;
         }
+
+        ExcelAntWorkbookUtil wbu = new ExcelAntWorkbookUtil( fileName ) ;
+        workbookUtilMap.put( fileName, wbu ) ;
+        return wbu ;
     }
 
 }

src/java/org/apache/poi/hssf/model/CommentShape.java

@@ -99,7 +99,8 @@ public final class CommentShape extends TextboxShape {
      * @param opt     The escher records holding the proerties
      * @return number of escher options added
      */
-    protected int addStandardOptions( HSSFShape shape, EscherOptRecord opt )
+    @Override
+	protected int addStandardOptions( HSSFShape shape, EscherOptRecord opt )
     {
         super.addStandardOptions(shape, opt);
 

src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java

@@ -455,7 +455,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * deprecated May 2008
      * @deprecated use setSelectedTab(int)
      */
-    public void setSelectedTab(short index) {
+    @Deprecated
+	public void setSelectedTab(short index) {
         setSelectedTab((int)index);
     }
     public void setSelectedTabs(int[] indexes) {
@@ -506,7 +507,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * deprecated May 2008
      * @deprecated - Misleading name - use getActiveSheetIndex()
      */
-    public short getSelectedTab() {
+    @Deprecated
+	public short getSelectedTab() {
         return (short) getActiveSheetIndex();
     }
 
@@ -523,7 +525,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * deprecated May 2008
      * @deprecated - Misleading name - use setFirstVisibleTab()
      */
-    public void setDisplayedTab(short index) {
+    @Deprecated
+	public void setDisplayedTab(short index) {
        setFirstVisibleTab(index);
     }
 
@@ -537,7 +540,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * deprecated May 2008
      * @deprecated - Misleading name - use getFirstVisibleTab()
      */
-    public short getDisplayedTab() {
+    @Deprecated
+	public short getDisplayedTab() {
         return (short) getFirstVisibleTab();
     }
 
@@ -630,14 +634,16 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * @deprecated for POI internal use only (formula parsing).  This method is likely to
      * be removed in future versions of POI.
      */
-    public int getExternalSheetIndex(int internalSheetIndex) {
+    @Deprecated
+	public int getExternalSheetIndex(int internalSheetIndex) {
         return workbook.checkExternSheet(internalSheetIndex);
     }
     /**
      * @deprecated for POI internal use only (formula rendering).  This method is likely to
      * be removed in future versions of POI.
      */
-    public String findSheetNameFromExternSheet(int externSheetIndex){
+    @Deprecated
+	public String findSheetNameFromExternSheet(int externSheetIndex){
         // TODO - don't expose internal ugliness like externSheet indexes to the user model API
         return workbook.findSheetNameFromExternSheet(externSheetIndex);
     }
@@ -649,7 +655,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * @param definedNameIndex zero-based to DEFINEDNAME or EXTERNALNAME record
      * @return the string representation of the defined or external name
      */
-    public String resolveNameXText(int refIndex, int definedNameIndex) {
+    @Deprecated
+	public String resolveNameXText(int refIndex, int definedNameIndex) {
         // TODO - make this less cryptic / move elsewhere
         return workbook.resolveNameXText(refIndex, definedNameIndex);
     }
@@ -830,7 +837,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
     public HSSFSheet getSheetAt(int index)
     {
         validateSheetIndex(index);
-        return (HSSFSheet) _sheets.get(index);
+        return _sheets.get(index);
     }
 
     /**
@@ -849,7 +856,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
 
             if (sheetname.equalsIgnoreCase(name))
             {
-                retval = (HSSFSheet) _sheets.get(k);
+                retval = _sheets.get(k);
             }
         }
         return retval;
@@ -963,7 +970,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * @deprecated use {@link HSSFSheet#setRepeatingRows(CellRangeAddress)}
      *        or {@link HSSFSheet#setRepeatingColumns(CellRangeAddress)}
      */
-    public void setRepeatingRowsAndColumns(int sheetIndex,
+    @Deprecated
+	public void setRepeatingRowsAndColumns(int sheetIndex,
                                            int startColumn, int endColumn,
                                            int startRow, int endRow) {
       HSSFSheet sheet = getSheetAt(sheetIndex);
@@ -1168,7 +1176,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * @see org.apache.poi.poifs.filesystem.POIFSFileSystem
      */
 
-    public void write(OutputStream stream)
+    @Override
+	public void write(OutputStream stream)
             throws IOException
     {
         byte[] bytes = getBytes();
@@ -1294,7 +1303,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
     /** @deprecated Do not call this method from your applications. Use the methods
      *  available in the HSSFRow to add string HSSFCells
      */
-    public int addSSTString(String string)
+    @Deprecated
+	public int addSSTString(String string)
     {
         return workbook.addSSTString(new UnicodeString(string));
     }
@@ -1302,7 +1312,8 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
     /** @deprecated Do not call this method from your applications. Use the methods
      *  available in the HSSFRow to get string HSSFCells
      */
-    public String getSSTString(int index)
+    @Deprecated
+	public String getSSTString(int index)
     {
         return workbook.getSSTString(index).getString();
     }
@@ -1321,7 +1332,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
         if (nameIndex < 0) {
             return null;
         }
-        return (HSSFName) names.get(nameIndex);
+        return names.get(nameIndex);
     }
 
     public HSSFName getNameAt(int nameIndex) {
@@ -1333,7 +1344,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
             throw new IllegalArgumentException("Specified name index " + nameIndex
                     + " is outside the allowable range (0.." + (nNames-1) + ").");
         }
-        return (HSSFName) names.get(nameIndex);
+        return names.get(nameIndex);
     }
 
     public NameRecord getNameRecord(int nameIndex) {

src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java

@@ -50,7 +50,7 @@ final class FunctionMetadataReader {
 		// except in these cases
 		"LOG10", "ATAN2", "DAYS360", "SUMXMY2", "SUMX2MY2", "SUMX2PY2",
 	};
-	private static final Set DIGIT_ENDING_FUNCTION_NAMES_SET = new HashSet(Arrays.asList(DIGIT_ENDING_FUNCTION_NAMES));
+	private static final Set<String> DIGIT_ENDING_FUNCTION_NAMES_SET = new HashSet<String>(Arrays.asList(DIGIT_ENDING_FUNCTION_NAMES));
 
 	public static FunctionMetadataRegistry createRegistry() {
 		InputStream is = FunctionMetadataReader.class.getResourceAsStream(METADATA_FILE_NAME);

src/ooxml/java/org/apache/poi/util/OOXMLLite.java

@@ -17,6 +17,7 @@
 
 package org.apache.poi.util;
 
+import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
@@ -92,7 +93,8 @@ public final class OOXMLLite {
 
             String cls = arg.replace(".class", "");
             try {
-                Class test = Class.forName(cls);
+                @SuppressWarnings("unchecked")
+				Class<? extends TestCase> test = (Class<? extends TestCase>) Class.forName(cls);
                 suite.addTestSuite(test);
             } catch (ClassNotFoundException e) {
                 throw new RuntimeException(e);
@@ -115,7 +117,7 @@ public final class OOXMLLite {
                 /**
                  * Copy classes and interfaces declared as members of this class
                  */
-                for(Class fc : cls.getDeclaredClasses()){
+                for(Class<?> fc : cls.getDeclaredClasses()){
                     className = fc.getName();
                     classRef = className.replace('.', '/') + ".class";
                     destFile = new File(_destDest, classRef);

src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java

@@ -77,8 +77,10 @@ public final class XSSFFormulaUtils {
             }
 
             public String getSheetNameByExternSheet(int externSheetIndex) {
-                if (externSheetIndex == sheetIndex) return name;
+                if (externSheetIndex == sheetIndex)
-                else return _fpwb.getSheetNameByExternSheet(externSheetIndex);
+                	return name;
+
+                return _fpwb.getSheetNameByExternSheet(externSheetIndex);
             }
 
             public String resolveNameXText(NameXPtg nameXPtg) {