diff options
| author | Javen O'Neal <onealj@apache.org> | 2017-01-20 04:38:18 +0000 |
|---|---|---|
| committer | Javen O'Neal <onealj@apache.org> | 2017-01-20 04:38:18 +0000 |
| commit | 8237512ed74bdf70a0b8ab1dd125ec3a0b63654a (patch) | |
| tree | f06c47107945fff5a945dcbaaddb0ba483d056c4 /src | |
| parent | 586343e71ba3ec5fd79da500839190ee034f2260 (diff) | |
| download | poi-8237512ed74bdf70a0b8ab1dd125ec3a0b63654a.tar.gz poi-8237512ed74bdf70a0b8ab1dd125ec3a0b63654a.zip | |
pull out loop invariants, use List.indexOf to look up sheet index
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1779560 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/org/apache/poi/hssf/model/InternalWorkbook.java | 3 | ||||
| -rw-r--r-- | src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java | 7 | ||||
| -rw-r--r-- | src/java/org/apache/poi/ss/util/WorkbookUtil.java | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java index 023007d365..063830d327 100644 --- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java +++ b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java @@ -770,7 +770,8 @@ public final class InternalWorkbook { public int getSheetIndex(String name) { int retval = -1; - for (int k = 0; k < boundsheets.size(); k++) { + final int size = boundsheets.size(); + for (int k = 0; k < size; k++) { String sheet = getSheetName(k); if (sheet.equalsIgnoreCase(name)) { diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index 08504c3a6d..e8be284f19 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -806,12 +806,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss */ @Override public int getSheetIndex(org.apache.poi.ss.usermodel.Sheet sheet) { - for(int i=0; i<_sheets.size(); i++) { - if(_sheets.get(i) == sheet) { - return i; - } - } - return -1; + return _sheets.indexOf(sheet); } /** diff --git a/src/java/org/apache/poi/ss/util/WorkbookUtil.java b/src/java/org/apache/poi/ss/util/WorkbookUtil.java index e14b8e0c58..f5e5f40fe8 100644 --- a/src/java/org/apache/poi/ss/util/WorkbookUtil.java +++ b/src/java/org/apache/poi/ss/util/WorkbookUtil.java @@ -182,7 +182,7 @@ public class WorkbookUtil { case Workbook.SHEET_STATE_HIDDEN: break; case Workbook.SHEET_STATE_VERY_HIDDEN: break; default: throw new IllegalArgumentException("Invalid sheet state : " + state + "\n" + - "Sheet state must beone of the Workbook.SHEET_STATE_* constants"); + "Sheet state must be one of the Workbook.SHEET_STATE_* constants"); } } |