You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2016/12/19 15:03:59 UTC
svn commit: r1775118 - in /poi/trunk/src:
java/org/apache/poi/hssf/usermodel/HSSFSheet.java
ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
Author: centic
Date: Mon Dec 19 15:03:58 2016
New Revision: 1775118
URL: http://svn.apache.org/viewvc?rev=1775118&view=rev
Log:
Comments, Javadoc and make close() only log instead of throw an exception to not have catch inside catch
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1775118&r1=1775117&r2=1775118&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Mon Dec 19 15:03:58 2016
@@ -1686,6 +1686,7 @@ public final class HSSFSheet implements
}
if (endRow == _lastrow) {
// Need to walk backward to find the last non-blank row
+ // NOTE: n is always negative here
_lastrow = Math.min(endRow + n, SpreadsheetVersion.EXCEL97.getLastRowIndex());
for (int i = endRow - 1; i > endRow + n; i++) {
if (getRow(i) != null) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1775118&r1=1775117&r2=1775118&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Mon Dec 19 15:03:58 2016
@@ -39,7 +39,6 @@ import java.util.regex.Pattern;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
-import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
import org.apache.poi.openxml4j.opc.internal.ContentType;
@@ -241,7 +240,8 @@ public abstract class OPCPackage impleme
* @throws InvalidFormatException
* If the specified file doesn't exist, and a parsing error
* occur.
- * @throws InvalidOperationException
+ * @throws InvalidOperationException If the zip file cannot be opened.
+ * @throws InvalidFormatException if the package is not valid.
*/
public static OPCPackage open(String path, PackageAccess access)
throws InvalidFormatException, InvalidOperationException {
@@ -262,11 +262,7 @@ public abstract class OPCPackage impleme
success = true;
} finally {
if (! success) {
- try {
- pack.close();
- } catch (final IOException e) {
- throw new InvalidOperationException("Could not close OPCPackage while cleaning up", e);
- }
+ IOUtils.closeQuietly(pack);
}
}
}
@@ -403,11 +399,6 @@ public abstract class OPCPackage impleme
return pkg;
}
- /**
- * Configure the package.
- *
- * @param pkg
- */
private static void configurePackage(OPCPackage pkg) {
try {
// Content type manager
@@ -598,8 +589,7 @@ public abstract class OPCPackage impleme
* (PackageAccess.Write). This method is call when other methods need write
* right.
*
- * @throws InvalidOperationException
- * Throws if a read operation is done on a write only package.
+ * @throws InvalidOperationException if a read operation is done on a write only package.
* @see org.apache.poi.openxml4j.opc.PackageAccess
*/
void throwExceptionIfWriteOnly() throws InvalidOperationException {
@@ -750,6 +740,7 @@ public abstract class OPCPackage impleme
* Compliance with Rule M4.1, and ignore all others silently too.
*
* @return All this package's parts.
+ * @throws InvalidFormatException if the package is not valid.
*/
public ArrayList<PackagePart> getParts() throws InvalidFormatException {
throwExceptionIfWriteOnly();
@@ -960,7 +951,7 @@ public abstract class OPCPackage impleme
* @param part
* The part to add (or replace).
* @return The part added to the package, the same as the one specified.
- * @throws InvalidFormatException
+ * @throws InvalidOperationException
* If rule M1.12 is not verified : Packages shall not contain
* equivalent part names and package implementers shall neither
* create nor recognize packages with equivalent part names.
@@ -1327,7 +1318,7 @@ public abstract class OPCPackage impleme
* Retrieves all package relationships.
*
* @return All package relationships of this package.
- * @throws OpenXML4JException
+ * @throws InvalidOperationException if a read operation is done on a write only package.
* @see #getRelationshipsHelper(String)
*/
@Override
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java?rev=1775118&r1=1775117&r2=1775118&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java Mon Dec 19 15:03:58 2016
@@ -114,7 +114,7 @@ public final class ZipPackage extends OP
* The path of the file to open or create.
* @param access
* The package access mode.
- * @throws InvalidOperationException
+ * @throws InvalidOperationException If the zip file cannot be opened.
*/
ZipPackage(String path, PackageAccess access) throws InvalidOperationException {
this(new File(path), access);
@@ -127,7 +127,7 @@ public final class ZipPackage extends OP
* The file to open or create.
* @param access
* The package access mode.
- * @throws InvalidOperationException
+ * @throws InvalidOperationException If the zip file cannot be opened.
*/
ZipPackage(File file, PackageAccess access) throws InvalidOperationException {
super(access);
@@ -231,8 +231,7 @@ public final class ZipPackage extends OP
* list is not empty, it will be emptied.
*
* @return All parts contain in this package.
- * @throws InvalidFormatException
- * Throws if the package is not valid.
+ * @throws InvalidFormatException if the package is not valid.
*/
@Override
protected PackagePart[] getPartsImpl() throws InvalidFormatException {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org