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 2016/06/11 03:05:31 UTC
svn commit: r1747843 -
/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Author: onealj
Date: Sat Jun 11 03:05:31 2016
New Revision: 1747843
URL: http://svn.apache.org/viewvc?rev=1747843&view=rev
Log:
methods that return lists should return unmodifiable lists; use foreach sheet iterator when sheet index is not needed
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
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=1747843&r1=1747842&r2=1747843&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 Sat Jun 11 03:05:31 2016
@@ -38,6 +38,7 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.regex.Pattern;
+import java.util.Collections;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.poi.EncryptedDocumentException;
@@ -1475,7 +1476,7 @@ public final class HSSFWorkbook extends
}
}
- return nameList;
+ return Collections.unmodifiableList(nameList);
}
@Override
@@ -1721,8 +1722,8 @@ public final class HSSFWorkbook extends
void initDrawings(){
DrawingManager2 mgr = workbook.findDrawingGroup();
if(mgr != null) {
- for(int i=0; i < getNumberOfSheets(); i++) {
- getSheetAt(i).getDrawingPatriarch();
+ for(HSSFSheet sh : _sheets) {
+ sh.getDrawingPatriarch();
}
} else {
workbook.createDrawingGroup();
@@ -1840,7 +1841,7 @@ public final class HSSFWorkbook extends
searchForPictures(escherRecords, pictures);
}
}
- return pictures;
+ return Collections.unmodifiableList(pictures);
}
/**
@@ -1976,11 +1977,11 @@ public final class HSSFWorkbook extends
public List<HSSFObjectData> getAllEmbeddedObjects()
{
List<HSSFObjectData> objects = new ArrayList<HSSFObjectData>();
- for (int i = 0; i < getNumberOfSheets(); i++)
+ for (HSSFSheet sheet : _sheets)
{
- getAllEmbeddedObjects(getSheetAt(i), objects);
+ getAllEmbeddedObjects(sheet, objects);
}
- return objects;
+ return Collections.unmodifiableList(objects);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org