findbugs fix

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

diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java b/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
index 47ee3124a7cccc3f8870dd99a683d7b503f684a6..e9bb072e58005cf922cd854ad5a02a8094a3d4f8 100644 (file)
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
+++ b/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
@@ -17,27 +17,19 @@
 
 package org.apache.poi.ss.excelant;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.Locale;
+
 import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtil;
 import org.apache.poi.ss.excelant.util.ExcelAntWorkbookUtilFactory;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.Locale;
-
 /**
  * Ant task class for testing Excel workbook cells.
- * 
- * @author Jon Svede ( jon [at] loquatic [dot] com )
- * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov )
- *
  */
 public class ExcelAntTask extends Task {
     
@@ -98,70 +90,50 @@ public class ExcelAntTask extends Task {
                log( versionBffr.toString(), Project.MSG_INFO ) ;
                
                log( "Using input file: " + excelFileName, Project.MSG_INFO ) ;
-               
-               Workbook targetWorkbook = loadWorkbook() ;
-               if( targetWorkbook == null ) {
-                       log( "Unable to load " + excelFileName + 
-                                                   ".  Verify the file exists and can be read.",
-                                                   Project.MSG_ERR ) ;
-                       return ;
-               }
-               if( tests.size() > 0 ) {
 
-                       for (ExcelAntTest test : tests) {
-                               log("executing test: " + test.getName(), Project.MSG_DEBUG);
+        workbookUtil = ExcelAntWorkbookUtilFactory.getInstance(excelFileName);
+               
+               for (ExcelAntTest test : tests) {
+                       log("executing test: " + test.getName(), Project.MSG_DEBUG);
 
-                               workbookUtil = ExcelAntWorkbookUtilFactory.getInstance(excelFileName);
+                       if (workbookUtil == null) {
+                           workbookUtil = ExcelAntWorkbookUtilFactory.getInstance(excelFileName);
+                       }
 
-                               for (ExcelAntUserDefinedFunction eaUdf : functions) {
-                                       try {
-                                               workbookUtil.addFunction(eaUdf.getFunctionAlias(), eaUdf.getClassName());
-                                       } catch (Exception e) {
-                                               throw new BuildException(e.getMessage(), e);
-                                       }
+                       for (ExcelAntUserDefinedFunction eaUdf : functions) {
+                               try {
+                                       workbookUtil.addFunction(eaUdf.getFunctionAlias(), eaUdf.getClassName());
+                               } catch (Exception e) {
+                                       throw new BuildException(e.getMessage(), e);
                                }
-                               test.setWorkbookUtil(workbookUtil);
+                       }
+                       test.setWorkbookUtil(workbookUtil);
 
-                               if (precision != null && precision.getValue() > 0) {
-                                       log("setting precision for the test " + test.getName(), Project.MSG_VERBOSE);
-                                       test.setPrecision(precision.getValue());
-                               }
+                       if (precision != null && precision.getValue() > 0) {
+                               log("setting precision for the test " + test.getName(), Project.MSG_VERBOSE);
+                               test.setPrecision(precision.getValue());
+                       }
 
-                               test.execute();
+                       test.execute();
 
-                               if (test.didTestPass()) {
-                                       successCount++;
-                               } else {
-                                       if (failOnError) {
-                                               throw new BuildException("Test " + test.getName() + " failed.");
-                                       }
+                       if (test.didTestPass()) {
+                               successCount++;
+                       } else {
+                               if (failOnError) {
+                                       throw new BuildException("Test " + test.getName() + " failed.");
                                }
-                               totalCount++;
-
-                               workbookUtil = null;
                        }
-                       log( successCount + "/" + totalCount + " tests passed.", Project.MSG_INFO ) ;
-                       workbookUtil = null ;
-               }
-       }
-       
+                       totalCount++;
 
-    private Workbook loadWorkbook() {
-        if (excelFileName == null) {
-            throw new BuildException("fileName attribute must be set!",
-                                     getLocation());
-        }
+                       workbookUtil = null;
+               }
 
-               File workbookFile = new File( excelFileName ) ;
-        try {
-            FileInputStream fis = new FileInputStream( workbookFile ) ;
-            return WorkbookFactory.create( fis ) ;
-        } catch (Exception e) {
-            throw new BuildException("Cannot load file " + excelFileName
-                    + ". Make sure the path and file permissions are correct.", e, getLocation());
-        }
+               if( !tests.isEmpty() ) {
+                   log( successCount + "/" + totalCount + " tests passed.", Project.MSG_INFO );
+               }
+        workbookUtil = null;
        }
-
+       
 
     /**
      * ExcelAnt depends on external libraries not included in the Ant distribution.

diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java b/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
index 627493b291004e5c05e8b37256db34765ed785b2..dcb30a84c6caae6d769b98d499326ab113323a1b 100644 (file)
--- a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
+++ b/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
@@ -91,10 +91,12 @@ public class ExcelAntWorkbookUtil extends Typedef {
      * @throws BuildException If the workbook cannot be loaded.
      */
     private Workbook loadWorkbook() {
+        if (excelFileName == null) {
+            throw new BuildException("fileName attribute must be set!", getLocation());
+        }
 
-        File workbookFile = new File(excelFileName);
         try {
-            FileInputStream fis = new FileInputStream(workbookFile);
+            FileInputStream fis = new FileInputStream(excelFileName);
             try {
                workbook = WorkbookFactory.create(fis);
             } finally {