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/10/19 08:38:20 UTC
svn commit: r1765556 -
/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
Author: onealj
Date: Wed Oct 19 08:38:19 2016
New Revision: 1765556
URL: http://svn.apache.org/viewvc?rev=1765556&view=rev
Log:
add @Override decorators to SheetIterator, move code outside of for-loop
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=1765556&r1=1765555&r2=1765556&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java Wed Oct 19 08:38:19 2016
@@ -186,7 +186,7 @@ public class XSSFReader {
/**
* Maps relId and the corresponding PackagePart
*/
- private Map<String, PackagePart> sheetMap;
+ private final Map<String, PackagePart> sheetMap;
/**
* Current CTSheet bean
@@ -198,7 +198,7 @@ public class XSSFReader {
* We can't rely on the Ooxml4J's relationship iterator because it returns objects in physical order,
* i.e. as they are stored in the underlying package
*/
- private Iterator<CTSheet> sheetIterator;
+ private final Iterator<CTSheet> sheetIterator;
/**
* Construct a new SheetIterator
@@ -213,11 +213,14 @@ public class XSSFReader {
try {
//step 1. Map sheet's relationship Id and the corresponding PackagePart
sheetMap = new HashMap<String, PackagePart>();
+ OPCPackage pkg = wb.getPackage();
+ String REL_WORKSHEET = XSSFRelation.WORKSHEET.getRelation();
+ String REL_CHARTSHEET = XSSFRelation.CHARTSHEET.getRelation();
for(PackageRelationship rel : wb.getRelationships()){
- if(rel.getRelationshipType().equals(XSSFRelation.WORKSHEET.getRelation()) ||
- rel.getRelationshipType().equals(XSSFRelation.CHARTSHEET.getRelation())){
+ String relType = rel.getRelationshipType();
+ if (relType.equals(REL_WORKSHEET) || relType.equals(REL_CHARTSHEET)) {
PackagePartName relName = PackagingURIHelper.createPartName(rel.getTargetURI());
- sheetMap.put(rel.getId(), wb.getPackage().getPart(relName));
+ sheetMap.put(rel.getId(), pkg.getPart(relName));
}
}
//step 2. Read array of CTSheet elements, wrap it in a ArayList and construct an iterator
@@ -236,6 +239,7 @@ public class XSSFReader {
*
* @return <tt>true</tt> if the iterator has more elements.
*/
+ @Override
public boolean hasNext() {
return sheetIterator.hasNext();
}
@@ -245,6 +249,7 @@ public class XSSFReader {
*
* @return input stream of the next sheet in the iteration
*/
+ @Override
public InputStream next() {
ctSheet = sheetIterator.next();
@@ -328,6 +333,7 @@ public class XSSFReader {
/**
* We're read only, so remove isn't supported
*/
+ @Override
public void remove() {
throw new IllegalStateException("Not supported");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org