Refactor to reduce clutter

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

1 files changed, 9 insertions, 33 deletions

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
index 5136babe2d..aed26b66fb 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
@@ -30,7 +30,6 @@ import org.apache.poi.ss.formula.FormulaParseException;
 import org.apache.poi.ss.formula.FormulaParsingWorkbook;
 import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
 import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.NameIdentifier;
 import org.apache.poi.ss.formula.SheetIdentifier;
 import org.apache.poi.ss.formula.SheetRangeIdentifier;
 import org.apache.poi.ss.formula.ptg.Area3DPtg;
@@ -71,24 +70,6 @@ public final class HSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
     public int getExternalSheetIndex(String workbookName, String sheetName) {
         return _iBook.getExternalSheetIndex(workbookName, sheetName);
     }
-    public int getExternalSheetIndex(String workbookName, String firstSheetName, String lastSheetName) {
-        return _iBook.getExternalSheetIndex(workbookName, firstSheetName, lastSheetName);
-    }
-    
-    public int getExternalSheetIndex(String workbookName, NameIdentifier sheetName) {
-        return getExternalSheetIndex(workbookName, sheetName.getName());
-    }
-    public int getExternalSheetIndex(String workbookName, NameIdentifier firstSheetName, NameIdentifier lastSheetName) {
-        return getExternalSheetIndex(workbookName, firstSheetName.getName(), lastSheetName.getName());
-    }
-    public int getExternalSheetIndex(NameIdentifier sheetName) {
-        return getExternalSheetIndex(sheetName.getName());
-    }
-    public int getExternalSheetIndex(NameIdentifier firstSheetName, NameIdentifier lastSheetName) {
-        int firstSheetIndex = _uBook.getSheetIndex(firstSheetName.getName());
-        int lastSheetIndex = _uBook.getSheetIndex(lastSheetName.getName());
-        return _iBook.checkExternSheet(firstSheetIndex, lastSheetIndex);
-    }
     
     public Ptg get3DReferencePtg(CellReference cr, SheetIdentifier sheet) {
         int extIx = getSheetExtIx(sheet);
@@ -255,25 +236,20 @@ public final class HSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
         if (sheetIden == null) {
             extIx = -1;
         } else {
-            NameIdentifier sheetName = sheetIden.getSheetIdentifier();
-            NameIdentifier lastSheetName = null;
+            String workbookName = sheetIden.getBookName(); 
+            String firstSheetName = sheetIden.getSheetIdentifier().getName();
+            String lastSheetName = firstSheetName;
             
             if (sheetIden instanceof SheetRangeIdentifier) {
-                lastSheetName = ((SheetRangeIdentifier)sheetIden).getLastSheetIdentifier();
+                lastSheetName = ((SheetRangeIdentifier)sheetIden).getLastSheetIdentifier().getName();
             }
             
-            if (sheetIden.getBookName() == null) {
-                if (lastSheetName == null) {
-                    extIx = getExternalSheetIndex(sheetName);
-                } else {
-                    extIx = getExternalSheetIndex(sheetName, lastSheetName);
-                }
+            if (workbookName == null) {
+                int firstSheetIndex = _uBook.getSheetIndex(firstSheetName);
+                int lastSheetIndex = _uBook.getSheetIndex(lastSheetName);
+                extIx = _iBook.checkExternSheet(firstSheetIndex, lastSheetIndex);
             } else {
-                if (lastSheetName == null) {
-                    extIx = getExternalSheetIndex(sheetIden.getBookName(), sheetName);
-                } else {
-                    extIx = getExternalSheetIndex(sheetIden.getBookName(), sheetName, lastSheetName);
-                }
+                extIx = _iBook.getExternalSheetIndex(workbookName, firstSheetName, lastSheetName);
             }
         }
         return extIx;