You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2017/01/20 04:38:18 UTC
svn commit: r1779560 - in /poi/trunk/src/java/org/apache/poi:
hssf/model/InternalWorkbook.java hssf/usermodel/HSSFWorkbook.java
ss/util/WorkbookUtil.java
Author: onealj
Date: Fri Jan 20 04:38:18 2017
New Revision: 1779560
URL: http://svn.apache.org/viewvc?rev=1779560&view=rev
Log:
pull out loop invariants, use List.indexOf to look up sheet index
Modified:
poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java?rev=1779560&r1=1779559&r2=1779560&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java Fri Jan 20 04:38:18 2017
@@ -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)) {
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1779560&r1=1779559&r2=1779560&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Fri Jan 20 04:38:18 2017
@@ -806,12 +806,7 @@ public final class HSSFWorkbook extends
*/
@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);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java?rev=1779560&r1=1779559&r2=1779560&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/WorkbookUtil.java Fri Jan 20 04:38:18 2017
@@ -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");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org