[github-278] Resolve all SpotBugs P1 issues in Main and Test. Thanks to Andreas Reichel. This closes #278

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

2 files changed, 8 insertions, 7 deletions

diff --git a/poi-excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
index d6a3a74b7d..a75506f97b 100644
--- a/poi-excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
@@ -22,18 +22,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import org.apache.poi.ss.usermodel.Workbook;
 
 public class MockExcelAntWorkbookHandler implements IExcelAntWorkbookHandler {
-    public static boolean executed;
-    public static Workbook workbook;
+    public boolean executed = false;
+    public Workbook workbook = null;
 
+    public final static MockExcelAntWorkbookHandler instance = new MockExcelAntWorkbookHandler();
 
     @Override
     public void setWorkbook(Workbook workbook) {
-        MockExcelAntWorkbookHandler.workbook = workbook;
+        instance.workbook = workbook;
     }
 
     @Override
     public void execute() {
-        executed = true;
-        assertNotNull(workbook);
+        instance.executed = true;
+        assertNotNull(instance.workbook);
     }
 }
diff --git a/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
index b8f34fa30c..9e580bd48e 100644
--- a/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
@@ -312,8 +312,8 @@ public class TestBuildFile {
         assertLogContaining("Using input file: " + TestBuildFile.getDataDir() + "/spreadsheet/excelant.xls");
         assertLogContaining("Succeeded when evaluating 'MortgageCalculator'!$B$4.");
 
-        assertNotNull(MockExcelAntWorkbookHandler.workbook, "The workbook should have been passed to the handler");
-        assertTrue(MockExcelAntWorkbookHandler.executed, "The handler should have been executed");
+        assertNotNull(MockExcelAntWorkbookHandler.instance.workbook, "The workbook should have been passed to the handler");
+        assertTrue(MockExcelAntWorkbookHandler.instance.executed, "The handler should have been executed");
     }
 
     @Test